smartfarm
/
mobile-app
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

update logo change api to smartfarm

smf
daivp 4 years ago
parent
a54ae06266
commit
fcab8e84e9
6 changed files with 28 additions and 27 deletions
Split View Show Diff Stats
  1. +8
    -8
      android/app/google-services.json
  2. +7
    -7
      ios/Runner.xcodeproj/project.pbxproj
  3. +8
    -8
      ios/Runner/GoogleService-Info.plist
  4. +1
    -1
      lib/data/api/rest_client.g.dart
  5. +2
    -1
      lib/presentation/screens/profile/sc_update_profile.dart
  6. +2
    -2
      lib/utils/const_common.dart

+ 8
- 8
android/app/google-services.json View File

@@ -1,34 +1,34 @@
{
"project_info": {
"project_number": "133633341213",
"firebase_url": "https://farm-demo-71aca.firebaseio.com",
"project_id": "farm-demo-71aca",
"storage_bucket": "farm-demo-71aca.appspot.com"
"project_number": "145264060024",
"firebase_url": "https://smartfarm-73071-default-rtdb.firebaseio.com",
"project_id": "smartfarm-73071",
"storage_bucket": "smartfarm-73071.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:133633341213:android:0b36de8098b76572cb53f4",
"mobilesdk_app_id": "1:145264060024:android:5d973afbfdac70c8802f8d",
"android_client_info": {
"package_name": "vn.azteam.farmdemo"
}
},
"oauth_client": [
{
"client_id": "133633341213-kn4dgpqmfrtc1sd4a24v5ptdgnokj6vi.apps.googleusercontent.com",
"client_id": "145264060024-fpp54hk2mhfpk5nj1m23124p0nkr72l6.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyAnFlBYZNtXUVMFwOqf0d6eY2AyQMqgaSY"
"current_key": "AIzaSyAVC0ArwKauoiTms8VUpn7Y9_hY0MX5V3Y"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "133633341213-kn4dgpqmfrtc1sd4a24v5ptdgnokj6vi.apps.googleusercontent.com",
"client_id": "145264060024-fpp54hk2mhfpk5nj1m23124p0nkr72l6.apps.googleusercontent.com",
"client_type": 3
}
]

+ 7
- 7
ios/Runner.xcodeproj/project.pbxproj View File

@@ -9,7 +9,7 @@
/* Begin PBXBuildFile section */
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
57CB5601257E19220029CFCB /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 57CB5600257E19220029CFCB /* GoogleService-Info.plist */; };
572C33A325FB79E100842D5E /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 572C33A225FB79E100842D5E /* GoogleService-Info.plist */; };
5A19B8D253A88BC5E5EDE8D2 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9DCE1C984F2603EE87603F8E /* Pods_Runner.framework */; };
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -34,7 +34,7 @@
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
57CB5600257E19220029CFCB /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
572C33A225FB79E100842D5E /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
57CB5602257E19450029CFCB /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -97,8 +97,8 @@
97C146F01CF9000F007C117D /* Runner */ = {
isa = PBXGroup;
children = (
572C33A225FB79E100842D5E /* GoogleService-Info.plist */,
57CB5602257E19450029CFCB /* Runner.entitlements */,
57CB5600257E19220029CFCB /* GoogleService-Info.plist */,
97C146FA1CF9000F007C117D /* Main.storyboard */,
97C146FD1CF9000F007C117D /* Assets.xcassets */,
97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
@@ -194,7 +194,7 @@
files = (
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
57CB5601257E19220029CFCB /* GoogleService-Info.plist in Resources */,
572C33A325FB79E100842D5E /* GoogleService-Info.plist in Resources */,
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
);
@@ -361,7 +361,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 11;
CURRENT_PROJECT_VERSION = 13;
DEVELOPMENT_TEAM = C3DTD2JH94;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -500,7 +500,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 11;
CURRENT_PROJECT_VERSION = 13;
DEVELOPMENT_TEAM = C3DTD2JH94;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -533,7 +533,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 11;
CURRENT_PROJECT_VERSION = 13;
DEVELOPMENT_TEAM = C3DTD2JH94;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (

+ 8
- 8
ios/Runner/GoogleService-Info.plist View File

@@ -3,21 +3,21 @@
<plist version="1.0">
<dict>
<key>CLIENT_ID</key>
<string>133633341213-onmfpr1862a89392av68uhn5sql5pt7h.apps.googleusercontent.com</string>
<string>145264060024-ut48ah57979rug9fti17nothlm2ckiij.apps.googleusercontent.com</string>
<key>REVERSED_CLIENT_ID</key>
<string>com.googleusercontent.apps.133633341213-onmfpr1862a89392av68uhn5sql5pt7h</string>
<string>com.googleusercontent.apps.145264060024-ut48ah57979rug9fti17nothlm2ckiij</string>
<key>API_KEY</key>
<string>AIzaSyDdd_1yFjpcN9vy4KeN2rMFUQgegfSSRT0</string>
<string>AIzaSyBWyE0r0AvSlfSZUlPGxwXT49qYX8fX7eo</string>
<key>GCM_SENDER_ID</key>
<string>133633341213</string>
<string>145264060024</string>
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>vn.azteam.farmdemo</string>
<key>PROJECT_ID</key>
<string>farm-demo-71aca</string>
<string>smartfarm-73071</string>
<key>STORAGE_BUCKET</key>
<string>farm-demo-71aca.appspot.com</string>
<string>smartfarm-73071.appspot.com</string>
<key>IS_ADS_ENABLED</key>
<false></false>
<key>IS_ANALYTICS_ENABLED</key>
@@ -29,8 +29,8 @@
<key>IS_SIGNIN_ENABLED</key>
<true></true>
<key>GOOGLE_APP_ID</key>
<string>1:133633341213:ios:3eb489a175c1c673cb53f4</string>
<string>1:145264060024:ios:537b6f9f805f96ea802f8d</string>
<key>DATABASE_URL</key>
<string>https://farm-demo-71aca.firebaseio.com</string>
<string>https://smartfarm-73071-default-rtdb.firebaseio.com</string>
</dict>
</plist>

+ 1
- 1
lib/data/api/rest_client.g.dart View File

@@ -9,7 +9,7 @@ part of 'rest_client.dart';
class _RestClient implements RestClient {
_RestClient(this._dio, {this.baseUrl}) {
ArgumentError.checkNotNull(_dio, '_dio');
baseUrl ??= 'https://smf.aztrace.vn';
baseUrl ??= 'https://smartfarm.aztrace.vn';
}

final Dio _dio;

+ 2
- 1
lib/presentation/screens/profile/sc_update_profile.dart View File

@@ -79,8 +79,9 @@ class _UpdateProfileScreenState extends State<UpdateProfileScreen> {
LoadingDialog.hideLoadingDialog(_scaffoldKey.currentContext);
Utils.showSnackBarSuccess(message: 'Cập nhật thành công.');
}).catchError((onError) {
Utils.showSnackBarError(message: 'Cập nhật không thành công.');
LoadingDialog.hideLoadingDialog(_scaffoldKey.currentContext);
Utils.showSnackBarError(message: 'Cập nhật không thành công.');

print("error");
});
} else {

+ 2
- 2
lib/utils/const_common.dart View File

@@ -2,8 +2,8 @@ class ConstCommon {
static int kExpiredTime = 518400000; //6* 24 * 60 * 60 * 1000; 6days
static int kFileSize = 1000000; //1M = 1000.000 bytes
static int kMaxAgeCache = 7; // 7days
static const String baseUrl = "https://smf.aztrace.vn";
static const String baseImageUrl = "https://smf.aztrace.vn/upload/";
static const String baseUrl = "https://smartfarm.aztrace.vn";
static const String baseImageUrl = "https://smartfarm.aztrace.vn/upload/";
static RegExp regExpDecimal = RegExp("[0-9.]");

static const String supplyTypeSeed = "GIONG";

Write Preview
Loading…
Cancel
Save