diff --git a/android/app/build.gradle b/android/app/build.gradle index 84b9b089..cd368efc 100755 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -184,12 +184,6 @@ android { OPPO_APPKEY : "OP-47f668c9943248118502aa58d066393b", OPPO_APPID : "OP-31726001", OPPO_APPSECRET: "OP-05723986bba64183a71530b496922450", - // VIVO_APPKEY : "vivo的APPKEY", - // VIVO_APPID : "vivo的APPID", - HONOR_APPID : "110798531", - OPPO_APPKEY : "OP-47f668c9943248118502aa58d066393b", - OPPO_APPID : "OP-31726001", - OPPO_APPSECRET: "OP-05723986bba64183a71530b496922450", VIVO_APPKEY : "75fe8e570425b714e08d0390b14797cb", VIVO_APPID : "105752244", HONOR_APPID : "104458196", diff --git a/android/app/libs/HiPushSDK-7.0.61.303.aar b/android/app/libs/HiPushSDK-7.0.61.303.aar new file mode 100644 index 00000000..2b7d2e6b Binary files /dev/null and b/android/app/libs/HiPushSDK-7.0.61.303.aar differ diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 07c09ea3..7cea66a7 100755 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -56,6 +56,8 @@ android:name="android.permission.QUERY_ALL_PACKAGES" tools:node="remove" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index a7b5e0e6..4ebc047a 100755 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -9,7 +9,6 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 25B2A1422F9A2CCCBBCBBB97 /* skyRelease.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 35F02D170492750B437D6AB6 /* skyRelease.xcconfig */; }; - 3364C3F42B0C902100AA5ABC /* lcokStarMain.png in Resources */ = {isa = PBXBuildFile; fileRef = 3364C3F32B0C902100AA5ABC /* lcokStarMain.png */; }; 370C09E26790814FD1F6465F /* xhjLaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6A6F5C86239927252C06A16A /* xhjLaunchScreen.storyboard */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 44827AC367F1EAB110A97660 /* preRelease.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = D501929EA2295683612A3AD8 /* preRelease.xcconfig */; }; @@ -17,73 +16,12 @@ 805C745A7C79091E65665B96 /* devDebug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0D02C18E16914A687A4A1AC2 /* devDebug.xcconfig */; }; 8297E4102AE75AC500E886FA /* XSFlutterManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8297E40E2AE75AC500E886FA /* XSFlutterManager.m */; }; 8297E49B2AE7974700E886FA /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8297E49A2AE7974700E886FA /* AppDelegate.m */; }; + 82B657622C91665F0079121C /* Info_sky.plist in Resources */ = {isa = PBXBuildFile; fileRef = 82B657602C91665E0079121C /* Info_sky.plist */; }; + 82B657632C91665F0079121C /* Info_xhj.plist in Resources */ = {isa = PBXBuildFile; fileRef = 82B657612C91665E0079121C /* Info_xhj.plist */; }; + 82B657652C917F950079121C /* Info_pre.plist in Resources */ = {isa = PBXBuildFile; fileRef = 82B657642C917F950079121C /* Info_pre.plist */; }; + 82B657672C919BDF0079121C /* launchImage_xhj.png in Resources */ = {isa = PBXBuildFile; fileRef = 82B657662C919BDF0079121C /* launchImage_xhj.png */; }; + 82B657692C919DA70079121C /* launchImage_sky.png in Resources */ = {isa = PBXBuildFile; fileRef = 82B657682C919DA60079121C /* launchImage_sky.png */; }; 82C026542AE8AC6D0011FE6A /* AliyunEmasServices-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 82C026532AE8AC6D0011FE6A /* AliyunEmasServices-Info.plist */; }; - 82C026982AEB6C050011FE6A /* add.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026562AEB6C050011FE6A /* add.png */; }; - 82C026992AEB6C050011FE6A /* ic_vd_mic_on.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026572AEB6C050011FE6A /* ic_vd_mic_on.png */; }; - 82C0269A2AEB6C050011FE6A /* watch.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026582AEB6C050011FE6A /* watch.png */; }; - 82C0269B2AEB6C050011FE6A /* call_menu.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026592AEB6C050011FE6A /* call_menu.png */; }; - 82C0269C2AEB6C050011FE6A /* call_del_on.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C0265A2AEB6C050011FE6A /* call_del_on.png */; }; - 82C0269D2AEB6C050011FE6A /* hangup.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C0265B2AEB6C050011FE6A /* hangup.png */; }; - 82C0269E2AEB6C050011FE6A /* save_photo.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C0265C2AEB6C050011FE6A /* save_photo.png */; }; - 82C0269F2AEB6C050011FE6A /* show_head_toast_bg.9.PNG in Resources */ = {isa = PBXBuildFile; fileRef = 82C0265D2AEB6C050011FE6A /* show_head_toast_bg.9.PNG */; }; - 82C026A02AEB6C050011FE6A /* search_bar_edit_normal.9.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C0265E2AEB6C050011FE6A /* search_bar_edit_normal.9.png */; }; - 82C026A12AEB6C050011FE6A /* icon_close.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C0265F2AEB6C050011FE6A /* icon_close.png */; }; - 82C026A22AEB6C050011FE6A /* swicth_minus_off.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026602AEB6C050011FE6A /* swicth_minus_off.png */; }; - 82C026A32AEB6C050011FE6A /* sidebar_background.xml in Resources */ = {isa = PBXBuildFile; fileRef = 82C026612AEB6C050011FE6A /* sidebar_background.xml */; }; - 82C026A42AEB6C050011FE6A /* hf_on.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026622AEB6C050011FE6A /* hf_on.png */; }; - 82C026A52AEB6C050011FE6A /* unlock_on2.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026632AEB6C050011FE6A /* unlock_on2.png */; }; - 82C026A62AEB6C050011FE6A /* vcontacts.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026642AEB6C050011FE6A /* vcontacts.png */; }; - 82C026A72AEB6C050011FE6A /* zoom.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026652AEB6C050011FE6A /* zoom.png */; }; - 82C026A82AEB6C050011FE6A /* key.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026662AEB6C050011FE6A /* key.png */; }; - 82C026A92AEB6C050011FE6A /* lock2.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026672AEB6C050011FE6A /* lock2.png */; }; - 82C026AA2AEB6C050011FE6A /* lock.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026682AEB6C050011FE6A /* lock.png */; }; - 82C026AB2AEB6C050011FE6A /* vcall.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026692AEB6C050011FE6A /* vcall.png */; }; - 82C026AC2AEB6C050011FE6A /* spk.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C0266A2AEB6C050011FE6A /* spk.png */; }; - 82C026AD2AEB6C050011FE6A /* blank.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C0266B2AEB6C050011FE6A /* blank.png */; }; - 82C026AE2AEB6C050011FE6A /* clear.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C0266C2AEB6C050011FE6A /* clear.png */; }; - 82C026AF2AEB6C050011FE6A /* rotate.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C0266D2AEB6C050011FE6A /* rotate.png */; }; - 82C026B02AEB6C050011FE6A /* call_call_on.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C0266E2AEB6C050011FE6A /* call_call_on.png */; }; - 82C026B12AEB6C050011FE6A /* call_del.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C0266F2AEB6C050011FE6A /* call_del.png */; }; - 82C026B22AEB6C050011FE6A /* swicth_minus_on.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026702AEB6C050011FE6A /* swicth_minus_on.png */; }; - 82C026B32AEB6C050011FE6A /* lock_on.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026712AEB6C050011FE6A /* lock_on.png */; }; - 82C026B42AEB6C050011FE6A /* vrecord_on.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026722AEB6C050011FE6A /* vrecord_on.png */; }; - 82C026B52AEB6C050011FE6A /* search_bar_icon_normal.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026732AEB6C050011FE6A /* search_bar_icon_normal.png */; }; - 82C026B62AEB6C050011FE6A /* vrecord.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026742AEB6C050011FE6A /* vrecord.png */; }; - 82C026B72AEB6C050011FE6A /* swicth_off.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026752AEB6C050011FE6A /* swicth_off.png */; }; - 82C026B82AEB6C050011FE6A /* test.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 82C026762AEB6C050011FE6A /* test.jpg */; }; - 82C026B92AEB6C050011FE6A /* back3.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026772AEB6C050011FE6A /* back3.png */; }; - 82C026BA2AEB6C050011FE6A /* logo3.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026782AEB6C050011FE6A /* logo3.png */; }; - 82C026BB2AEB6C050011FE6A /* menu.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026792AEB6C050011FE6A /* menu.png */; }; - 82C026BC2AEB6C050011FE6A /* logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C0267A2AEB6C050011FE6A /* logo.png */; }; - 82C026BD2AEB6C050011FE6A /* logo2.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C0267B2AEB6C050011FE6A /* logo2.png */; }; - 82C026BE2AEB6C050011FE6A /* vcontacts2.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C0267C2AEB6C050011FE6A /* vcontacts2.png */; }; - 82C026BF2AEB6C050011FE6A /* swicth_add_on.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C0267D2AEB6C050011FE6A /* swicth_add_on.png */; }; - 82C026C02AEB6C050011FE6A /* add2.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C0267E2AEB6C050011FE6A /* add2.png */; }; - 82C026C12AEB6C050011FE6A /* swicth_on.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C0267F2AEB6C050011FE6A /* swicth_on.png */; }; - 82C026C22AEB6C050011FE6A /* shop_loading.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026802AEB6C050011FE6A /* shop_loading.png */; }; - 82C026C32AEB6C050011FE6A /* call_menu_on.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026812AEB6C050011FE6A /* call_menu_on.png */; }; - 82C026C42AEB6C050011FE6A /* vcall_on.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026822AEB6C050011FE6A /* vcall_on.png */; }; - 82C026C52AEB6C050011FE6A /* wave1.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026832AEB6C050011FE6A /* wave1.png */; }; - 82C026C62AEB6C050011FE6A /* ic_launcher.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026842AEB6C050011FE6A /* ic_launcher.png */; }; - 82C026C72AEB6C050011FE6A /* key_on.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026852AEB6C050011FE6A /* key_on.png */; }; - 82C026C82AEB6C050011FE6A /* hf.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026862AEB6C050011FE6A /* hf.png */; }; - 82C026C92AEB6C050011FE6A /* wave3.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026872AEB6C050011FE6A /* wave3.png */; }; - 82C026CA2AEB6C050011FE6A /* wave2.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026882AEB6C050011FE6A /* wave2.png */; }; - 82C026CB2AEB6C050011FE6A /* ic_vd_mic_off.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026892AEB6C050011FE6A /* ic_vd_mic_off.png */; }; - 82C026CC2AEB6C050011FE6A /* split3.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C0268A2AEB6C050011FE6A /* split3.png */; }; - 82C026CD2AEB6C050011FE6A /* emotionstore_progresscancelbtn.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C0268B2AEB6C050011FE6A /* emotionstore_progresscancelbtn.png */; }; - 82C026CE2AEB6C050011FE6A /* split.JPG in Resources */ = {isa = PBXBuildFile; fileRef = 82C0268C2AEB6C050011FE6A /* split.JPG */; }; - 82C026CF2AEB6C050011FE6A /* swicth_add_off.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C0268D2AEB6C050011FE6A /* swicth_add_off.png */; }; - 82C026D02AEB6C050011FE6A /* search_bar_edit_pressed.9.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C0268E2AEB6C050011FE6A /* search_bar_edit_pressed.9.png */; }; - 82C026D12AEB6C050011FE6A /* setting.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C0268F2AEB6C050011FE6A /* setting.png */; }; - 82C026D22AEB6C050011FE6A /* back.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026902AEB6C050011FE6A /* back.png */; }; - 82C026D32AEB6C050011FE6A /* thumb_on.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026912AEB6C050011FE6A /* thumb_on.png */; }; - 82C026D42AEB6C050011FE6A /* split4.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026922AEB6C050011FE6A /* split4.png */; }; - 82C026D52AEB6C050011FE6A /* thumb.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026932AEB6C050011FE6A /* thumb.png */; }; - 82C026D62AEB6C050011FE6A /* vcontacts_on.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026942AEB6C050011FE6A /* vcontacts_on.png */; }; - 82C026D72AEB6C050011FE6A /* mic.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026952AEB6C050011FE6A /* mic.png */; }; - 82C026D82AEB6C050011FE6A /* icon_key.png in Resources */ = {isa = PBXBuildFile; fileRef = 82C026962AEB6C050011FE6A /* icon_key.png */; }; - 82C026D92AEB6C050011FE6A /* bg.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 82C026972AEB6C050011FE6A /* bg.jpg */; }; 82F1ECDB2BE8B7B500265D59 /* DTFIdentityManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82F1ECD12BE8B7B400265D59 /* DTFIdentityManager.framework */; }; 82F1ECDC2BE8B7B500265D59 /* deviceiOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82F1ECD22BE8B7B500265D59 /* deviceiOS.framework */; }; 82F1ECDD2BE8B7B500265D59 /* DTFUtility.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82F1ECD32BE8B7B500265D59 /* DTFUtility.framework */; }; @@ -126,7 +64,6 @@ 97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; - 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; 99FEBCD8A8244C3EE22C5A18 /* preLaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7EA577AFEEE10224BA96C569 /* preLaunchScreen.storyboard */; }; 9C453CBFAB0703DFA762337C /* preProfile.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = B7AA7A6DD927B38E32E2C889 /* preProfile.xcconfig */; }; ADF948FD9EE8BD1AE71F0984 /* xhjDebug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 853610C00A55CC450C2FF839 /* xhjDebug.xcconfig */; }; @@ -154,7 +91,6 @@ /* Begin PBXFileReference section */ 0420903B2C0EEAA50073E654 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Main.strings"; sourceTree = ""; }; - 0420903C2C0EEAA60073E654 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/LaunchScreen.strings"; sourceTree = ""; }; 04BFC4482BCFE05100688FCA /* RunnerRelease-xhj.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "RunnerRelease-xhj.entitlements"; sourceTree = ""; }; 0BEB3ADCCEC961E2916B9004 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 0D02C18E16914A687A4A1AC2 /* devDebug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = devDebug.xcconfig; path = Flutter/devDebug.xcconfig; sourceTree = ""; }; @@ -165,7 +101,6 @@ 22D858E988707FF26E068457 /* Pods-Runner.debug-xhj.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug-xhj.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug-xhj.xcconfig"; sourceTree = ""; }; 265F8968B3CDB02494B21491 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 295A8AFEEC4806105FAA13B5 /* Pods-Runner.release-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release-dev.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release-dev.xcconfig"; sourceTree = ""; }; - 3364C3F32B0C902100AA5ABC /* lcokStarMain.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = lcokStarMain.png; sourceTree = ""; }; 33BF41252A96174D009D92E2 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = ""; }; 35F02D170492750B437D6AB6 /* skyRelease.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = skyRelease.xcconfig; path = Flutter/skyRelease.xcconfig; sourceTree = ""; }; 383F65C3166F78B1A1470A4E /* preDebug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = preDebug.xcconfig; path = Flutter/preDebug.xcconfig; sourceTree = ""; }; @@ -182,74 +117,13 @@ 8297E40F2AE75AC500E886FA /* XSFlutterManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XSFlutterManager.h; sourceTree = ""; }; 8297E4992AE7974700E886FA /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; 8297E49A2AE7974700E886FA /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; + 82B657602C91665E0079121C /* Info_sky.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info_sky.plist; sourceTree = ""; }; + 82B657612C91665E0079121C /* Info_xhj.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info_xhj.plist; sourceTree = ""; }; + 82B657642C917F950079121C /* Info_pre.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info_pre.plist; sourceTree = ""; }; + 82B657662C919BDF0079121C /* launchImage_xhj.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = launchImage_xhj.png; sourceTree = ""; }; + 82B657682C919DA60079121C /* launchImage_sky.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = launchImage_sky.png; sourceTree = ""; }; 82BD91212ADA72360018E523 /* CommonDefine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommonDefine.h; sourceTree = ""; }; 82C026532AE8AC6D0011FE6A /* AliyunEmasServices-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "AliyunEmasServices-Info.plist"; sourceTree = ""; }; - 82C026562AEB6C050011FE6A /* add.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = add.png; sourceTree = ""; }; - 82C026572AEB6C050011FE6A /* ic_vd_mic_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_vd_mic_on.png; sourceTree = ""; }; - 82C026582AEB6C050011FE6A /* watch.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = watch.png; sourceTree = ""; }; - 82C026592AEB6C050011FE6A /* call_menu.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = call_menu.png; sourceTree = ""; }; - 82C0265A2AEB6C050011FE6A /* call_del_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = call_del_on.png; sourceTree = ""; }; - 82C0265B2AEB6C050011FE6A /* hangup.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = hangup.png; sourceTree = ""; }; - 82C0265C2AEB6C050011FE6A /* save_photo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = save_photo.png; sourceTree = ""; }; - 82C0265D2AEB6C050011FE6A /* show_head_toast_bg.9.PNG */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = show_head_toast_bg.9.PNG; sourceTree = ""; }; - 82C0265E2AEB6C050011FE6A /* search_bar_edit_normal.9.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = search_bar_edit_normal.9.png; sourceTree = ""; }; - 82C0265F2AEB6C050011FE6A /* icon_close.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_close.png; sourceTree = ""; }; - 82C026602AEB6C050011FE6A /* swicth_minus_off.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = swicth_minus_off.png; sourceTree = ""; }; - 82C026612AEB6C050011FE6A /* sidebar_background.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = sidebar_background.xml; sourceTree = ""; }; - 82C026622AEB6C050011FE6A /* hf_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = hf_on.png; sourceTree = ""; }; - 82C026632AEB6C050011FE6A /* unlock_on2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = unlock_on2.png; sourceTree = ""; }; - 82C026642AEB6C050011FE6A /* vcontacts.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = vcontacts.png; sourceTree = ""; }; - 82C026652AEB6C050011FE6A /* zoom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = zoom.png; sourceTree = ""; }; - 82C026662AEB6C050011FE6A /* key.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = key.png; sourceTree = ""; }; - 82C026672AEB6C050011FE6A /* lock2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = lock2.png; sourceTree = ""; }; - 82C026682AEB6C050011FE6A /* lock.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = lock.png; sourceTree = ""; }; - 82C026692AEB6C050011FE6A /* vcall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = vcall.png; sourceTree = ""; }; - 82C0266A2AEB6C050011FE6A /* spk.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = spk.png; sourceTree = ""; }; - 82C0266B2AEB6C050011FE6A /* blank.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = blank.png; sourceTree = ""; }; - 82C0266C2AEB6C050011FE6A /* clear.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = clear.png; sourceTree = ""; }; - 82C0266D2AEB6C050011FE6A /* rotate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = rotate.png; sourceTree = ""; }; - 82C0266E2AEB6C050011FE6A /* call_call_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = call_call_on.png; sourceTree = ""; }; - 82C0266F2AEB6C050011FE6A /* call_del.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = call_del.png; sourceTree = ""; }; - 82C026702AEB6C050011FE6A /* swicth_minus_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = swicth_minus_on.png; sourceTree = ""; }; - 82C026712AEB6C050011FE6A /* lock_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = lock_on.png; sourceTree = ""; }; - 82C026722AEB6C050011FE6A /* vrecord_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = vrecord_on.png; sourceTree = ""; }; - 82C026732AEB6C050011FE6A /* search_bar_icon_normal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = search_bar_icon_normal.png; sourceTree = ""; }; - 82C026742AEB6C050011FE6A /* vrecord.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = vrecord.png; sourceTree = ""; }; - 82C026752AEB6C050011FE6A /* swicth_off.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = swicth_off.png; sourceTree = ""; }; - 82C026762AEB6C050011FE6A /* test.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = test.jpg; sourceTree = ""; }; - 82C026772AEB6C050011FE6A /* back3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = back3.png; sourceTree = ""; }; - 82C026782AEB6C050011FE6A /* logo3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo3.png; sourceTree = ""; }; - 82C026792AEB6C050011FE6A /* menu.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu.png; sourceTree = ""; }; - 82C0267A2AEB6C050011FE6A /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = ""; }; - 82C0267B2AEB6C050011FE6A /* logo2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo2.png; sourceTree = ""; }; - 82C0267C2AEB6C050011FE6A /* vcontacts2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = vcontacts2.png; sourceTree = ""; }; - 82C0267D2AEB6C050011FE6A /* swicth_add_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = swicth_add_on.png; sourceTree = ""; }; - 82C0267E2AEB6C050011FE6A /* add2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = add2.png; sourceTree = ""; }; - 82C0267F2AEB6C050011FE6A /* swicth_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = swicth_on.png; sourceTree = ""; }; - 82C026802AEB6C050011FE6A /* shop_loading.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = shop_loading.png; sourceTree = ""; }; - 82C026812AEB6C050011FE6A /* call_menu_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = call_menu_on.png; sourceTree = ""; }; - 82C026822AEB6C050011FE6A /* vcall_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = vcall_on.png; sourceTree = ""; }; - 82C026832AEB6C050011FE6A /* wave1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = wave1.png; sourceTree = ""; }; - 82C026842AEB6C050011FE6A /* ic_launcher.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_launcher.png; sourceTree = ""; }; - 82C026852AEB6C050011FE6A /* key_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = key_on.png; sourceTree = ""; }; - 82C026862AEB6C050011FE6A /* hf.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = hf.png; sourceTree = ""; }; - 82C026872AEB6C050011FE6A /* wave3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = wave3.png; sourceTree = ""; }; - 82C026882AEB6C050011FE6A /* wave2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = wave2.png; sourceTree = ""; }; - 82C026892AEB6C050011FE6A /* ic_vd_mic_off.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_vd_mic_off.png; sourceTree = ""; }; - 82C0268A2AEB6C050011FE6A /* split3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = split3.png; sourceTree = ""; }; - 82C0268B2AEB6C050011FE6A /* emotionstore_progresscancelbtn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = emotionstore_progresscancelbtn.png; sourceTree = ""; }; - 82C0268C2AEB6C050011FE6A /* split.JPG */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = split.JPG; sourceTree = ""; }; - 82C0268D2AEB6C050011FE6A /* swicth_add_off.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = swicth_add_off.png; sourceTree = ""; }; - 82C0268E2AEB6C050011FE6A /* search_bar_edit_pressed.9.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = search_bar_edit_pressed.9.png; sourceTree = ""; }; - 82C0268F2AEB6C050011FE6A /* setting.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = setting.png; sourceTree = ""; }; - 82C026902AEB6C050011FE6A /* back.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = back.png; sourceTree = ""; }; - 82C026912AEB6C050011FE6A /* thumb_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = thumb_on.png; sourceTree = ""; }; - 82C026922AEB6C050011FE6A /* split4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = split4.png; sourceTree = ""; }; - 82C026932AEB6C050011FE6A /* thumb.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = thumb.png; sourceTree = ""; }; - 82C026942AEB6C050011FE6A /* vcontacts_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = vcontacts_on.png; sourceTree = ""; }; - 82C026952AEB6C050011FE6A /* mic.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = mic.png; sourceTree = ""; }; - 82C026962AEB6C050011FE6A /* icon_key.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_key.png; sourceTree = ""; }; - 82C026972AEB6C050011FE6A /* bg.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = bg.jpg; sourceTree = ""; }; 82F1ECD12BE8B7B400265D59 /* DTFIdentityManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DTFIdentityManager.framework; path = ../aliyun_face_plugin/ios/Products/DTFIdentityManager.framework; sourceTree = ""; }; 82F1ECD22BE8B7B500265D59 /* deviceiOS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = deviceiOS.framework; path = ../aliyun_face_plugin/ios/Products/deviceiOS.framework; sourceTree = ""; }; 82F1ECD32BE8B7B500265D59 /* DTFUtility.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DTFUtility.framework; path = ../aliyun_face_plugin/ios/Products/DTFUtility.framework; sourceTree = ""; }; @@ -297,8 +171,7 @@ 97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 97C147021CF9000F007C117D /* Info_dev.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info_dev.plist; sourceTree = ""; }; 9A03C622761920C324D80733 /* skyLaunchScreen.storyboard */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = file.storyboard; name = skyLaunchScreen.storyboard; path = Runner/skyLaunchScreen.storyboard; sourceTree = ""; }; 9AA145F8B894E5E4F14249DB /* devProfile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = devProfile.xcconfig; path = Flutter/devProfile.xcconfig; sourceTree = ""; }; B7AA7A6DD927B38E32E2C889 /* preProfile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = preProfile.xcconfig; path = Flutter/preProfile.xcconfig; sourceTree = ""; }; @@ -381,79 +254,6 @@ path = Pods; sourceTree = ""; }; - 82C026552AEB6C050011FE6A /* img */ = { - isa = PBXGroup; - children = ( - 82C026562AEB6C050011FE6A /* add.png */, - 82C026572AEB6C050011FE6A /* ic_vd_mic_on.png */, - 82C026582AEB6C050011FE6A /* watch.png */, - 82C026592AEB6C050011FE6A /* call_menu.png */, - 82C0265A2AEB6C050011FE6A /* call_del_on.png */, - 82C0265B2AEB6C050011FE6A /* hangup.png */, - 82C0265C2AEB6C050011FE6A /* save_photo.png */, - 82C0265D2AEB6C050011FE6A /* show_head_toast_bg.9.PNG */, - 82C0265E2AEB6C050011FE6A /* search_bar_edit_normal.9.png */, - 82C0265F2AEB6C050011FE6A /* icon_close.png */, - 82C026602AEB6C050011FE6A /* swicth_minus_off.png */, - 82C026612AEB6C050011FE6A /* sidebar_background.xml */, - 82C026622AEB6C050011FE6A /* hf_on.png */, - 82C026632AEB6C050011FE6A /* unlock_on2.png */, - 82C026642AEB6C050011FE6A /* vcontacts.png */, - 82C026652AEB6C050011FE6A /* zoom.png */, - 82C026662AEB6C050011FE6A /* key.png */, - 82C026672AEB6C050011FE6A /* lock2.png */, - 82C026682AEB6C050011FE6A /* lock.png */, - 82C026692AEB6C050011FE6A /* vcall.png */, - 82C0266A2AEB6C050011FE6A /* spk.png */, - 82C0266B2AEB6C050011FE6A /* blank.png */, - 82C0266C2AEB6C050011FE6A /* clear.png */, - 82C0266D2AEB6C050011FE6A /* rotate.png */, - 82C0266E2AEB6C050011FE6A /* call_call_on.png */, - 82C0266F2AEB6C050011FE6A /* call_del.png */, - 82C026702AEB6C050011FE6A /* swicth_minus_on.png */, - 82C026712AEB6C050011FE6A /* lock_on.png */, - 82C026722AEB6C050011FE6A /* vrecord_on.png */, - 82C026732AEB6C050011FE6A /* search_bar_icon_normal.png */, - 82C026742AEB6C050011FE6A /* vrecord.png */, - 82C026752AEB6C050011FE6A /* swicth_off.png */, - 82C026762AEB6C050011FE6A /* test.jpg */, - 82C026772AEB6C050011FE6A /* back3.png */, - 82C026782AEB6C050011FE6A /* logo3.png */, - 82C026792AEB6C050011FE6A /* menu.png */, - 82C0267A2AEB6C050011FE6A /* logo.png */, - 82C0267B2AEB6C050011FE6A /* logo2.png */, - 82C0267C2AEB6C050011FE6A /* vcontacts2.png */, - 82C0267D2AEB6C050011FE6A /* swicth_add_on.png */, - 82C0267E2AEB6C050011FE6A /* add2.png */, - 82C0267F2AEB6C050011FE6A /* swicth_on.png */, - 82C026802AEB6C050011FE6A /* shop_loading.png */, - 82C026812AEB6C050011FE6A /* call_menu_on.png */, - 82C026822AEB6C050011FE6A /* vcall_on.png */, - 82C026832AEB6C050011FE6A /* wave1.png */, - 82C026842AEB6C050011FE6A /* ic_launcher.png */, - 82C026852AEB6C050011FE6A /* key_on.png */, - 82C026862AEB6C050011FE6A /* hf.png */, - 82C026872AEB6C050011FE6A /* wave3.png */, - 82C026882AEB6C050011FE6A /* wave2.png */, - 82C026892AEB6C050011FE6A /* ic_vd_mic_off.png */, - 82C0268A2AEB6C050011FE6A /* split3.png */, - 82C0268B2AEB6C050011FE6A /* emotionstore_progresscancelbtn.png */, - 82C0268C2AEB6C050011FE6A /* split.JPG */, - 82C0268D2AEB6C050011FE6A /* swicth_add_off.png */, - 82C0268E2AEB6C050011FE6A /* search_bar_edit_pressed.9.png */, - 82C0268F2AEB6C050011FE6A /* setting.png */, - 82C026902AEB6C050011FE6A /* back.png */, - 82C026912AEB6C050011FE6A /* thumb_on.png */, - 82C026922AEB6C050011FE6A /* split4.png */, - 82C026932AEB6C050011FE6A /* thumb.png */, - 82C026942AEB6C050011FE6A /* vcontacts_on.png */, - 82C026952AEB6C050011FE6A /* mic.png */, - 82C026962AEB6C050011FE6A /* icon_key.png */, - 82C026972AEB6C050011FE6A /* bg.jpg */, - ); - path = img; - sourceTree = ""; - }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -508,9 +308,12 @@ 97C146F01CF9000F007C117D /* Runner */ = { isa = PBXGroup; children = ( + 82B657682C919DA60079121C /* launchImage_sky.png */, + 82B657662C919BDF0079121C /* launchImage_xhj.png */, + 82B657642C917F950079121C /* Info_pre.plist */, + 82B657602C91665E0079121C /* Info_sky.plist */, + 82B657612C91665E0079121C /* Info_xhj.plist */, 04BFC4482BCFE05100688FCA /* RunnerRelease-xhj.entitlements */, - 3364C3F32B0C902100AA5ABC /* lcokStarMain.png */, - 82C026552AEB6C050011FE6A /* img */, 82C026532AE8AC6D0011FE6A /* AliyunEmasServices-Info.plist */, 8297E4992AE7974700E886FA /* AppDelegate.h */, 8297E49A2AE7974700E886FA /* AppDelegate.m */, @@ -519,8 +322,7 @@ 33BF41252A96174D009D92E2 /* Runner.entitlements */, 97C146FA1CF9000F007C117D /* Main.storyboard */, 97C146FD1CF9000F007C117D /* Assets.xcassets */, - 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, - 97C147021CF9000F007C117D /* Info.plist */, + 97C147021CF9000F007C117D /* Info_dev.plist */, 97C146F11CF9000F007C117D /* Supporting Files */, 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, @@ -644,82 +446,18 @@ buildActionMask = 2147483647; files = ( 82F1ED1C2BE8BA8F00265D59 /* BioAuthEngine.bundle in Resources */, + 82B657692C919DA70079121C /* launchImage_sky.png in Resources */, 82F1ED1A2BE8BA7D00265D59 /* OCRXMedia.bundle in Resources */, 82F1ED182BE8BA6900265D59 /* APBToygerFacadeSuitable.bundle in Resources */, 82F1ED162BE8BA2000265D59 /* APBToygerFacade.bundle in Resources */, + 82B657622C91665F0079121C /* Info_sky.plist in Resources */, 82F1ED142BE8B9F400265D59 /* ToygerService.bundle in Resources */, - 82C026A02AEB6C050011FE6A /* search_bar_edit_normal.9.png in Resources */, - 82C026A92AEB6C050011FE6A /* lock2.png in Resources */, - 82C026AE2AEB6C050011FE6A /* clear.png in Resources */, - 82C0269B2AEB6C050011FE6A /* call_menu.png in Resources */, 82C026542AE8AC6D0011FE6A /* AliyunEmasServices-Info.plist in Resources */, - 82C026AD2AEB6C050011FE6A /* blank.png in Resources */, - 82C0269F2AEB6C050011FE6A /* show_head_toast_bg.9.PNG in Resources */, - 82C026BA2AEB6C050011FE6A /* logo3.png in Resources */, - 82C026B22AEB6C050011FE6A /* swicth_minus_on.png in Resources */, - 82C026C22AEB6C050011FE6A /* shop_loading.png in Resources */, - 82C026AF2AEB6C050011FE6A /* rotate.png in Resources */, - 82C026BD2AEB6C050011FE6A /* logo2.png in Resources */, - 82C026C62AEB6C050011FE6A /* ic_launcher.png in Resources */, - 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, - 82C026D62AEB6C050011FE6A /* vcontacts_on.png in Resources */, - 82C026BF2AEB6C050011FE6A /* swicth_add_on.png in Resources */, - 82C026A52AEB6C050011FE6A /* unlock_on2.png in Resources */, - 82C026A12AEB6C050011FE6A /* icon_close.png in Resources */, - 82C026AB2AEB6C050011FE6A /* vcall.png in Resources */, - 82C026CE2AEB6C050011FE6A /* split.JPG in Resources */, 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, - 82C026A72AEB6C050011FE6A /* zoom.png in Resources */, - 82C026D42AEB6C050011FE6A /* split4.png in Resources */, 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, - 82C026992AEB6C050011FE6A /* ic_vd_mic_on.png in Resources */, - 82C026C12AEB6C050011FE6A /* swicth_on.png in Resources */, - 82C026B72AEB6C050011FE6A /* swicth_off.png in Resources */, - 82C026D72AEB6C050011FE6A /* mic.png in Resources */, - 82C026C32AEB6C050011FE6A /* call_menu_on.png in Resources */, - 82C026B02AEB6C050011FE6A /* call_call_on.png in Resources */, - 3364C3F42B0C902100AA5ABC /* lcokStarMain.png in Resources */, - 82C026C82AEB6C050011FE6A /* hf.png in Resources */, - 82C026BE2AEB6C050011FE6A /* vcontacts2.png in Resources */, - 82C026AC2AEB6C050011FE6A /* spk.png in Resources */, - 82C026D12AEB6C050011FE6A /* setting.png in Resources */, - 82C026D82AEB6C050011FE6A /* icon_key.png in Resources */, - 82C026C42AEB6C050011FE6A /* vcall_on.png in Resources */, - 82C026982AEB6C050011FE6A /* add.png in Resources */, - 82C026D22AEB6C050011FE6A /* back.png in Resources */, - 82C0269C2AEB6C050011FE6A /* call_del_on.png in Resources */, - 82C026B92AEB6C050011FE6A /* back3.png in Resources */, - 82C026C02AEB6C050011FE6A /* add2.png in Resources */, - 82C026BB2AEB6C050011FE6A /* menu.png in Resources */, - 82C026AA2AEB6C050011FE6A /* lock.png in Resources */, - 82C026CC2AEB6C050011FE6A /* split3.png in Resources */, - 82C026D92AEB6C050011FE6A /* bg.jpg in Resources */, - 82C026B82AEB6C050011FE6A /* test.jpg in Resources */, - 82C026B12AEB6C050011FE6A /* call_del.png in Resources */, - 82C026B52AEB6C050011FE6A /* search_bar_icon_normal.png in Resources */, - 82C026CA2AEB6C050011FE6A /* wave2.png in Resources */, - 82C0269D2AEB6C050011FE6A /* hangup.png in Resources */, - 82C0269A2AEB6C050011FE6A /* watch.png in Resources */, - 82C0269E2AEB6C050011FE6A /* save_photo.png in Resources */, - 82C026A62AEB6C050011FE6A /* vcontacts.png in Resources */, - 82C026C72AEB6C050011FE6A /* key_on.png in Resources */, - 82C026D52AEB6C050011FE6A /* thumb.png in Resources */, - 82C026B32AEB6C050011FE6A /* lock_on.png in Resources */, - 82C026A32AEB6C050011FE6A /* sidebar_background.xml in Resources */, - 82C026CF2AEB6C050011FE6A /* swicth_add_off.png in Resources */, - 82C026A22AEB6C050011FE6A /* swicth_minus_off.png in Resources */, - 82C026A42AEB6C050011FE6A /* hf_on.png in Resources */, - 82C026C92AEB6C050011FE6A /* wave3.png in Resources */, - 82C026D02AEB6C050011FE6A /* search_bar_edit_pressed.9.png in Resources */, - 82C026A82AEB6C050011FE6A /* key.png in Resources */, - 82C026CB2AEB6C050011FE6A /* ic_vd_mic_off.png in Resources */, - 82C026CD2AEB6C050011FE6A /* emotionstore_progresscancelbtn.png in Resources */, - 82C026D32AEB6C050011FE6A /* thumb_on.png in Resources */, - 82C026BC2AEB6C050011FE6A /* logo.png in Resources */, - 82C026B42AEB6C050011FE6A /* vrecord_on.png in Resources */, - 82C026C52AEB6C050011FE6A /* wave1.png in Resources */, - 82C026B62AEB6C050011FE6A /* vrecord.png in Resources */, + 82B657632C91665F0079121C /* Info_xhj.plist in Resources */, + 82B657672C919BDF0079121C /* launchImage_xhj.png in Resources */, 805C745A7C79091E65665B96 /* devDebug.xcconfig in Resources */, D415555B0C61C5422202D037 /* devProfile.xcconfig in Resources */, 8A77CDE0EDBCACCE22C29A9E /* devRelease.xcconfig in Resources */, @@ -731,6 +469,7 @@ 25B2A1422F9A2CCCBBCBBB97 /* skyRelease.xcconfig in Resources */, ADF948FD9EE8BD1AE71F0984 /* xhjDebug.xcconfig in Resources */, EE0A7A61CF36BC83ACA6EE3E /* xhjProfile.xcconfig in Resources */, + 82B657652C917F950079121C /* Info_pre.plist in Resources */, 8B1BD17852B1F49E18DB1D6F /* xhjRelease.xcconfig in Resources */, E2FF5D00DFF6E2BF9DA36649 /* devLaunchScreen.storyboard in Resources */, 99FEBCD8A8244C3EE22C5A18 /* preLaunchScreen.storyboard in Resources */, @@ -838,15 +577,6 @@ name = Main.storyboard; sourceTree = ""; }; - 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 97C147001CF9000F007C117D /* Base */, - 0420903C2C0EEAA60073E654 /* zh-Hans */, - ); - name = LaunchScreen.storyboard; - sourceTree = ""; - }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ @@ -858,6 +588,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = 7D53BZAN75; + INFOPLIST_FILE = Runner/Info_dev.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; PRODUCT_NAME = Runner; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -874,6 +605,7 @@ buildSettings = { CODE_SIGN_ENTITLEMENTS = "Runner/RunnerProfile-dev.entitlements"; DEVELOPMENT_TEAM = 7D53BZAN75; + INFOPLIST_FILE = Runner/Info_dev.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; PRODUCT_NAME = Runner; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -889,6 +621,7 @@ buildSettings = { CODE_SIGN_ENTITLEMENTS = "Runner/RunnerRelease-dev.entitlements"; DEVELOPMENT_TEAM = 7D53BZAN75; + INFOPLIST_FILE = Runner/Info_dev.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; PRODUCT_NAME = Runner; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -904,6 +637,7 @@ buildSettings = { CODE_SIGN_ENTITLEMENTS = "Runner/RunnerDebug-pre.entitlements"; DEVELOPMENT_TEAM = 7D53BZAN75; + INFOPLIST_FILE = Runner/Info_pre.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; PRODUCT_NAME = Runner; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -919,6 +653,7 @@ buildSettings = { CODE_SIGN_ENTITLEMENTS = "Runner/RunnerProfile-pre.entitlements"; DEVELOPMENT_TEAM = 7D53BZAN75; + INFOPLIST_FILE = Runner/Info_pre.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; PRODUCT_NAME = Runner; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -934,6 +669,7 @@ buildSettings = { CODE_SIGN_ENTITLEMENTS = "Runner/RunnerRelease-pre.entitlements"; DEVELOPMENT_TEAM = 7D53BZAN75; + INFOPLIST_FILE = Runner/Info_pre.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; PRODUCT_NAME = Runner; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -949,6 +685,7 @@ buildSettings = { CODE_SIGN_ENTITLEMENTS = "Runner/RunnerDebug-sky.entitlements"; DEVELOPMENT_TEAM = NAQ5PL2DYC; + INFOPLIST_FILE = Runner/Info_sky.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; PRODUCT_NAME = Runner; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -964,6 +701,7 @@ buildSettings = { CODE_SIGN_ENTITLEMENTS = "Runner/RunnerProfile-sky.entitlements"; DEVELOPMENT_TEAM = NAQ5PL2DYC; + INFOPLIST_FILE = Runner/info_sky.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; PRODUCT_NAME = Runner; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -979,6 +717,7 @@ buildSettings = { CODE_SIGN_ENTITLEMENTS = "Runner/RunnerRelease-sky.entitlements"; DEVELOPMENT_TEAM = NAQ5PL2DYC; + INFOPLIST_FILE = Runner/info_sky.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; PRODUCT_NAME = Runner; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -994,6 +733,7 @@ buildSettings = { CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; DEVELOPMENT_TEAM = P8997RW3V8; + INFOPLIST_FILE = Runner/Info_xhj.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; PRODUCT_NAME = Runner; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1009,6 +749,7 @@ buildSettings = { CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; DEVELOPMENT_TEAM = P8997RW3V8; + INFOPLIST_FILE = Runner/Info_xhj.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; PRODUCT_NAME = Runner; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1024,6 +765,7 @@ buildSettings = { CODE_SIGN_ENTITLEMENTS = "Runner/RunnerRelease-xhj.entitlements"; DEVELOPMENT_TEAM = P8997RW3V8; + INFOPLIST_FILE = Runner/Info_xhj.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; PRODUCT_NAME = Runner; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; diff --git a/ios/Runner.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcworkspace/contents.xcworkspacedata old mode 100755 new mode 100644 diff --git a/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist old mode 100755 new mode 100644 diff --git a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100755 index f9b0d7c5..00000000 --- a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - PreviewsEnabled - - - diff --git a/ios/Runner/AppDelegate.m b/ios/Runner/AppDelegate.m index 3514fd7a..086a7d55 100755 --- a/ios/Runner/AppDelegate.m +++ b/ios/Runner/AppDelegate.m @@ -19,20 +19,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { -// //【注册通知】通知回调代理（可选） -// JPUSHRegisterEntity * entity = [[JPUSHRegisterEntity alloc] init]; -// entity.types = JPAuthorizationOptionAlert|JPAuthorizationOptionBadge|JPAuthorizationOptionSound|JPAuthorizationOptionProvidesAppNotificationSettings; -// [JPUSHService registerForRemoteNotificationConfig:entity delegate:self]; -// -// //【初始化sdk】 -// // notice: 2.1.5 版本的 SDK 新增的注册方法，改成可上报 IDFA，如果没有使用 IDFA 直接传 nil -// [JPUSHService setupWithOption:launchOptions appKey:@"7ff37d174c1a568a89e98dad" -// channel:@"flutter_channel" -// apsForProduction:NO -// advertisingIdentifier:nil]; - -// [self initCloudPush]; -// [CloudPushSDK sendNotificationAck:launchOptions]; XSFlutterManager *VC = [[XSFlutterManager alloc] init]; self.window.rootViewController = VC; [self.window makeKeyAndVisible]; @@ -50,16 +36,6 @@ } -- (void)initCloudPush { - // SDK初始化 - [CloudPushSDK asyncInit:@"334068745" appSecret:@"bee9c200835e4951a85dc8709c319560" callback:^(CloudPushCallbackResult *res) { - if (res.success) { - NSLog(@"Push SDK init success, deviceId: %@.", [CloudPushSDK getDeviceId]); - } else { - NSLog(@"Push SDK init failed, error: %@", res.error); - } - }]; -} /** * 注册苹果推送，获取deviceToken用于推送 @@ -85,13 +61,7 @@ * 苹果推送注册成功回调，将苹果返回的deviceToken上传到CloudPush服务器 */ - (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken { -// [CloudPushSDK registerDevice:deviceToken withCallback:^(CloudPushCallbackResult *res) { -// if (res.success) { -// NSLog(@"Register deviceToken success."); -// } else { -// NSLog(@"Register deviceToken failed, error: %@", res.error); -// } -// }]; + //sdk注册DeviceToken [JPUSHService registerDeviceToken:deviceToken]; @@ -124,28 +94,6 @@ NSLog(@"Receive message title: %@, content: %@.", title, body); } -/* - * App处于启动状态时，通知打开回调 - */ -//- (void)application:(UIApplication*)application didReceiveRemoteNotification:(NSDictionary*)userInfo { -// NSLog(@"Receive one notification."); - // 取得APNS通知内容 -// NSDictionary *aps = [userInfo valueForKey:@"aps"]; -// // 内容 -// NSString *content = [aps valueForKey:@"alert"]; -// // badge数量 -// NSInteger badge = [[aps valueForKey:@"badge"] integerValue]; -// // 播放声音 -// NSString *sound = [aps valueForKey:@"sound"]; -// // 取得Extras字段内容 -// NSString *Extras = [userInfo valueForKey:@"Extras"]; //服务端中Extras字段，key是自己定义的 -// NSLog(@"content = [%@], badge = [%ld], sound = [%@], Extras = [%@]", content, (long)badge, sound, Extras); -// // iOS badge 清0 -// application.applicationIconBadgeNumber = 0; -// // 通知打开回执上报 -// // [CloudPushSDK handleReceiveRemoteNotification:userInfo];(Deprecated from v1.8.1) -// [CloudPushSDK sendNotificationAck:userInfo]; -//} diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json deleted file mode 100755 index a19a5492..00000000 --- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md deleted file mode 100755 index 89c2725b..00000000 --- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Launch Screen Assets - -You can customize the launch screen with your own desired assets by replacing the image files in this directory. - -You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. \ No newline at end of file diff --git a/ios/Runner/Assets.xcassets/skyLaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/skyLaunchImage.imageset/Contents.json index 0bedcf2f..a19a5492 100755 --- a/ios/Runner/Assets.xcassets/skyLaunchImage.imageset/Contents.json +++ b/ios/Runner/Assets.xcassets/skyLaunchImage.imageset/Contents.json @@ -2,22 +2,19 @@ "images" : [ { "idiom" : "universal", - "filename" : "LaunchImage.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "LaunchImage@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "LaunchImage@3x.png", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } } diff --git a/ios/Runner/Assets.xcassets/skyLaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/skyLaunchImage.imageset/LaunchImage.png deleted file mode 100755 index 9da19eac..00000000 Binary files a/ios/Runner/Assets.xcassets/skyLaunchImage.imageset/LaunchImage.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/skyLaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/skyLaunchImage.imageset/LaunchImage@2x.png deleted file mode 100755 index 9da19eac..00000000 Binary files a/ios/Runner/Assets.xcassets/skyLaunchImage.imageset/LaunchImage@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/skyLaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/skyLaunchImage.imageset/LaunchImage@3x.png deleted file mode 100755 index 9da19eac..00000000 Binary files a/ios/Runner/Assets.xcassets/skyLaunchImage.imageset/LaunchImage@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/xhjLaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/xhjLaunchImage.imageset/Contents.json index 0bedcf2f..a19a5492 100755 --- a/ios/Runner/Assets.xcassets/xhjLaunchImage.imageset/Contents.json +++ b/ios/Runner/Assets.xcassets/xhjLaunchImage.imageset/Contents.json @@ -2,22 +2,19 @@ "images" : [ { "idiom" : "universal", - "filename" : "LaunchImage.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "LaunchImage@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "LaunchImage@3x.png", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } } diff --git a/ios/Runner/Assets.xcassets/xhjLaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/xhjLaunchImage.imageset/LaunchImage.png deleted file mode 100755 index 9da19eac..00000000 Binary files a/ios/Runner/Assets.xcassets/xhjLaunchImage.imageset/LaunchImage.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/xhjLaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/xhjLaunchImage.imageset/LaunchImage@2x.png deleted file mode 100755 index 9da19eac..00000000 Binary files a/ios/Runner/Assets.xcassets/xhjLaunchImage.imageset/LaunchImage@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/xhjLaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/xhjLaunchImage.imageset/LaunchImage@3x.png deleted file mode 100755 index 9da19eac..00000000 Binary files a/ios/Runner/Assets.xcassets/xhjLaunchImage.imageset/LaunchImage@3x.png and /dev/null differ diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard deleted file mode 100755 index ceaf4276..00000000 --- a/ios/Runner/Base.lproj/LaunchScreen.storyboard +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ios/Runner/Icon-App-60x60@3x.png b/ios/Runner/Icon-App-60x60@3x.png new file mode 100755 index 00000000..d594bd59 Binary files /dev/null and b/ios/Runner/Icon-App-60x60@3x.png differ diff --git a/ios/Runner/Info.plist b/ios/Runner/Info_dev.plist similarity index 99% rename from ios/Runner/Info.plist rename to ios/Runner/Info_dev.plist index 4f61f0ae..9874419b 100755 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info_dev.plist @@ -106,7 +106,7 @@ remote-notification UILaunchStoryboardName - LaunchScreen + xhjLaunchScreen UIMainStoryboardFile Main UISupportedInterfaceOrientations diff --git a/ios/Runner/Info_pre.plist b/ios/Runner/Info_pre.plist new file mode 100755 index 00000000..9874419b --- /dev/null +++ b/ios/Runner/Info_pre.plist @@ -0,0 +1,131 @@ + + + + + CADisableMinimumFrameDurationOnPhone + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + $(BUNDLE_DISPLAY_NAME) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(BUNDLE_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleURLTypes + + + CFBundleTypeRole + None + CFBundleURLIconFile + + CFBundleURLName + com.sky.skysmartlock + CFBundleURLSchemes + + skysmartlock + + + + + + CFBundleTypeRole + Editor + CFBundleURLName + weixin + CFBundleURLSchemes + + wxbe340095d2b8fd51 + + + + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSApplicationQueriesSchemes + + weixin + weixinULAPI + weixinURLParamsAPI + + LSRequiresIPhoneOS + + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + NSAllowsArbitraryLoadsInWebContent + + NSExceptionDomains + + jpush.cn + + NSExceptionAllowsInsecureHTTPLoads + + NSIncludesSubdomains + + + + + NSBluetoothAlwaysUsageDescription + The app uses bluetooth to find, connect and transfer data between different devices + NSBluetoothPeripheralUsageDescription + The app uses bluetooth to find, connect and transfer data between different devices + NSCameraUsageDescription + 应用请求相机，以便于拍摄照片，用于头像上传及人脸认证 + NSContactsUsageDescription + Reason we need access to the contact list + NSLocationAlwaysAndWhenInUseUsageDescription + 应用在前台和后台的时候可以搜到更新的位置信息 + NSLocationAlwaysUsageDescription + 应用在后台的时候可以搜到更新的位置信息 + NSLocationWhenInUseUsageDescription + 应用在前台的时候可以搜到更新的位置信息 + NSMicrophoneUsageDescription + 应用请求麦克风用来通话 + NSPhotoLibraryUsageDescription + 应用请求相册用于头像上传 + UIApplicationSceneManifest + + UISceneConfigurations + + + UIApplicationSupportsIndirectInputEvents + + UIBackgroundModes + + remote-notification + + UILaunchStoryboardName + xhjLaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + UIInterfaceOrientationPortrait + + UIViewControllerBasedStatusBarAppearance + + NSFileProtectionKey + NSFileProtectionCompleteUntilFirstUserAuthentication + UIFileSharingEnabled + + io.flutter.embedded_views_preview + + + diff --git a/ios/Runner/Info_sky.plist b/ios/Runner/Info_sky.plist new file mode 100755 index 00000000..981899fa --- /dev/null +++ b/ios/Runner/Info_sky.plist @@ -0,0 +1,131 @@ + + + + + CADisableMinimumFrameDurationOnPhone + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + $(BUNDLE_DISPLAY_NAME) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(BUNDLE_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleURLTypes + + + CFBundleTypeRole + None + CFBundleURLIconFile + + CFBundleURLName + com.sky.skysmartlock + CFBundleURLSchemes + + skysmartlock + + + + + + CFBundleTypeRole + Editor + CFBundleURLName + weixin + CFBundleURLSchemes + + wxbe340095d2b8fd51 + + + + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSApplicationQueriesSchemes + + weixin + weixinULAPI + weixinURLParamsAPI + + LSRequiresIPhoneOS + + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + NSAllowsArbitraryLoadsInWebContent + + NSExceptionDomains + + jpush.cn + + NSExceptionAllowsInsecureHTTPLoads + + NSIncludesSubdomains + + + + + NSBluetoothAlwaysUsageDescription + The app uses bluetooth to find, connect and transfer data between different devices + NSBluetoothPeripheralUsageDescription + The app uses bluetooth to find, connect and transfer data between different devices + NSCameraUsageDescription + 应用请求相机，以便于拍摄照片，用于头像上传及人脸认证 + NSContactsUsageDescription + Reason we need access to the contact list + NSLocationAlwaysAndWhenInUseUsageDescription + 应用在前台和后台的时候可以搜到更新的位置信息 + NSLocationAlwaysUsageDescription + 应用在后台的时候可以搜到更新的位置信息 + NSLocationWhenInUseUsageDescription + 应用在前台的时候可以搜到更新的位置信息 + NSMicrophoneUsageDescription + 应用请求麦克风用来通话 + NSPhotoLibraryUsageDescription + 应用请求相册用于头像上传 + UIApplicationSceneManifest + + UISceneConfigurations + + + UIApplicationSupportsIndirectInputEvents + + UIBackgroundModes + + remote-notification + + UILaunchStoryboardName + skyLaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + UIInterfaceOrientationPortrait + + UIViewControllerBasedStatusBarAppearance + + NSFileProtectionKey + NSFileProtectionCompleteUntilFirstUserAuthentication + UIFileSharingEnabled + + io.flutter.embedded_views_preview + + + diff --git a/ios/Runner/Info_xhj.plist b/ios/Runner/Info_xhj.plist new file mode 100755 index 00000000..9874419b --- /dev/null +++ b/ios/Runner/Info_xhj.plist @@ -0,0 +1,131 @@ + + + + + CADisableMinimumFrameDurationOnPhone + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + $(BUNDLE_DISPLAY_NAME) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(BUNDLE_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleURLTypes + + + CFBundleTypeRole + None + CFBundleURLIconFile + + CFBundleURLName + com.sky.skysmartlock + CFBundleURLSchemes + + skysmartlock + + + + + + CFBundleTypeRole + Editor + CFBundleURLName + weixin + CFBundleURLSchemes + + wxbe340095d2b8fd51 + + + + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSApplicationQueriesSchemes + + weixin + weixinULAPI + weixinURLParamsAPI + + LSRequiresIPhoneOS + + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + NSAllowsArbitraryLoadsInWebContent + + NSExceptionDomains + + jpush.cn + + NSExceptionAllowsInsecureHTTPLoads + + NSIncludesSubdomains + + + + + NSBluetoothAlwaysUsageDescription + The app uses bluetooth to find, connect and transfer data between different devices + NSBluetoothPeripheralUsageDescription + The app uses bluetooth to find, connect and transfer data between different devices + NSCameraUsageDescription + 应用请求相机，以便于拍摄照片，用于头像上传及人脸认证 + NSContactsUsageDescription + Reason we need access to the contact list + NSLocationAlwaysAndWhenInUseUsageDescription + 应用在前台和后台的时候可以搜到更新的位置信息 + NSLocationAlwaysUsageDescription + 应用在后台的时候可以搜到更新的位置信息 + NSLocationWhenInUseUsageDescription + 应用在前台的时候可以搜到更新的位置信息 + NSMicrophoneUsageDescription + 应用请求麦克风用来通话 + NSPhotoLibraryUsageDescription + 应用请求相册用于头像上传 + UIApplicationSceneManifest + + UISceneConfigurations + + + UIApplicationSupportsIndirectInputEvents + + UIBackgroundModes + + remote-notification + + UILaunchStoryboardName + xhjLaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + UIInterfaceOrientationPortrait + + UIViewControllerBasedStatusBarAppearance + + NSFileProtectionKey + NSFileProtectionCompleteUntilFirstUserAuthentication + UIFileSharingEnabled + + io.flutter.embedded_views_preview + + + diff --git a/ios/Runner/img/add.png b/ios/Runner/img/add.png deleted file mode 100755 index 66af4f40..00000000 Binary files a/ios/Runner/img/add.png and /dev/null differ diff --git a/ios/Runner/img/add2.png b/ios/Runner/img/add2.png deleted file mode 100755 index d2d64bf1..00000000 Binary files a/ios/Runner/img/add2.png and /dev/null differ diff --git a/ios/Runner/img/back.png b/ios/Runner/img/back.png deleted file mode 100755 index 1bb7efd0..00000000 Binary files a/ios/Runner/img/back.png and /dev/null differ diff --git a/ios/Runner/img/back3.png b/ios/Runner/img/back3.png deleted file mode 100755 index 7ff6a49d..00000000 Binary files a/ios/Runner/img/back3.png and /dev/null differ diff --git a/ios/Runner/img/bg.jpg b/ios/Runner/img/bg.jpg deleted file mode 100755 index dd644378..00000000 Binary files a/ios/Runner/img/bg.jpg and /dev/null differ diff --git a/ios/Runner/img/blank.png b/ios/Runner/img/blank.png deleted file mode 100755 index 6e4ff976..00000000 Binary files a/ios/Runner/img/blank.png and /dev/null differ diff --git a/ios/Runner/img/call_call_on.png b/ios/Runner/img/call_call_on.png deleted file mode 100755 index 4bab1a36..00000000 Binary files a/ios/Runner/img/call_call_on.png and /dev/null differ diff --git a/ios/Runner/img/call_del.png b/ios/Runner/img/call_del.png deleted file mode 100755 index 4181c979..00000000 Binary files a/ios/Runner/img/call_del.png and /dev/null differ diff --git a/ios/Runner/img/call_del_on.png b/ios/Runner/img/call_del_on.png deleted file mode 100755 index b0f9b6b7..00000000 Binary files a/ios/Runner/img/call_del_on.png and /dev/null differ diff --git a/ios/Runner/img/call_menu.png b/ios/Runner/img/call_menu.png deleted file mode 100755 index e93a76d5..00000000 Binary files a/ios/Runner/img/call_menu.png and /dev/null differ diff --git a/ios/Runner/img/call_menu_on.png b/ios/Runner/img/call_menu_on.png deleted file mode 100755 index 28c15f73..00000000 Binary files a/ios/Runner/img/call_menu_on.png and /dev/null differ diff --git a/ios/Runner/img/clear.png b/ios/Runner/img/clear.png deleted file mode 100755 index 9eb3a67a..00000000 Binary files a/ios/Runner/img/clear.png and /dev/null differ diff --git a/ios/Runner/img/emotionstore_progresscancelbtn.png b/ios/Runner/img/emotionstore_progresscancelbtn.png deleted file mode 100755 index 03c12a10..00000000 Binary files a/ios/Runner/img/emotionstore_progresscancelbtn.png and /dev/null differ diff --git a/ios/Runner/img/hangup.png b/ios/Runner/img/hangup.png deleted file mode 100755 index fa2a628d..00000000 Binary files a/ios/Runner/img/hangup.png and /dev/null differ diff --git a/ios/Runner/img/hf.png b/ios/Runner/img/hf.png deleted file mode 100755 index 569d18c4..00000000 Binary files a/ios/Runner/img/hf.png and /dev/null differ diff --git a/ios/Runner/img/hf_on.png b/ios/Runner/img/hf_on.png deleted file mode 100755 index c745d1d4..00000000 Binary files a/ios/Runner/img/hf_on.png and /dev/null differ diff --git a/ios/Runner/img/ic_launcher.png b/ios/Runner/img/ic_launcher.png deleted file mode 100755 index 85a60815..00000000 Binary files a/ios/Runner/img/ic_launcher.png and /dev/null differ diff --git a/ios/Runner/img/ic_vd_mic_off.png b/ios/Runner/img/ic_vd_mic_off.png deleted file mode 100755 index f9b6bd0f..00000000 Binary files a/ios/Runner/img/ic_vd_mic_off.png and /dev/null differ diff --git a/ios/Runner/img/ic_vd_mic_on.png b/ios/Runner/img/ic_vd_mic_on.png deleted file mode 100755 index 27aa4665..00000000 Binary files a/ios/Runner/img/ic_vd_mic_on.png and /dev/null differ diff --git a/ios/Runner/img/icon_close.png b/ios/Runner/img/icon_close.png deleted file mode 100755 index dd5a6ce2..00000000 Binary files a/ios/Runner/img/icon_close.png and /dev/null differ diff --git a/ios/Runner/img/icon_key.png b/ios/Runner/img/icon_key.png deleted file mode 100755 index 48054dc1..00000000 Binary files a/ios/Runner/img/icon_key.png and /dev/null differ diff --git a/ios/Runner/img/key.png b/ios/Runner/img/key.png deleted file mode 100755 index b5ef8815..00000000 Binary files a/ios/Runner/img/key.png and /dev/null differ diff --git a/ios/Runner/img/key_on.png b/ios/Runner/img/key_on.png deleted file mode 100755 index 268d0339..00000000 Binary files a/ios/Runner/img/key_on.png and /dev/null differ diff --git a/ios/Runner/img/lock.png b/ios/Runner/img/lock.png deleted file mode 100755 index 6e801582..00000000 Binary files a/ios/Runner/img/lock.png and /dev/null differ diff --git a/ios/Runner/img/lock2.png b/ios/Runner/img/lock2.png deleted file mode 100755 index d612ba62..00000000 Binary files a/ios/Runner/img/lock2.png and /dev/null differ diff --git a/ios/Runner/img/lock_on.png b/ios/Runner/img/lock_on.png deleted file mode 100755 index 18ece236..00000000 Binary files a/ios/Runner/img/lock_on.png and /dev/null differ diff --git a/ios/Runner/img/logo.png b/ios/Runner/img/logo.png deleted file mode 100755 index dd8a97f8..00000000 Binary files a/ios/Runner/img/logo.png and /dev/null differ diff --git a/ios/Runner/img/logo2.png b/ios/Runner/img/logo2.png deleted file mode 100755 index 4d2453e0..00000000 Binary files a/ios/Runner/img/logo2.png and /dev/null differ diff --git a/ios/Runner/img/logo3.png b/ios/Runner/img/logo3.png deleted file mode 100755 index 75ff860d..00000000 Binary files a/ios/Runner/img/logo3.png and /dev/null differ diff --git a/ios/Runner/img/menu.png b/ios/Runner/img/menu.png deleted file mode 100755 index faee050c..00000000 Binary files a/ios/Runner/img/menu.png and /dev/null differ diff --git a/ios/Runner/img/mic.png b/ios/Runner/img/mic.png deleted file mode 100755 index f36b98af..00000000 Binary files a/ios/Runner/img/mic.png and /dev/null differ diff --git a/ios/Runner/img/rotate.png b/ios/Runner/img/rotate.png deleted file mode 100755 index b1cde9c9..00000000 Binary files a/ios/Runner/img/rotate.png and /dev/null differ diff --git a/ios/Runner/img/save_photo.png b/ios/Runner/img/save_photo.png deleted file mode 100755 index 0c0309f0..00000000 Binary files a/ios/Runner/img/save_photo.png and /dev/null differ diff --git a/ios/Runner/img/search_bar_edit_normal.9.png b/ios/Runner/img/search_bar_edit_normal.9.png deleted file mode 100755 index 8902a137..00000000 Binary files a/ios/Runner/img/search_bar_edit_normal.9.png and /dev/null differ diff --git a/ios/Runner/img/search_bar_edit_pressed.9.png b/ios/Runner/img/search_bar_edit_pressed.9.png deleted file mode 100755 index 1e464a77..00000000 Binary files a/ios/Runner/img/search_bar_edit_pressed.9.png and /dev/null differ diff --git a/ios/Runner/img/search_bar_icon_normal.png b/ios/Runner/img/search_bar_icon_normal.png deleted file mode 100755 index c0e93158..00000000 Binary files a/ios/Runner/img/search_bar_icon_normal.png and /dev/null differ diff --git a/ios/Runner/img/setting.png b/ios/Runner/img/setting.png deleted file mode 100755 index 28f3932a..00000000 Binary files a/ios/Runner/img/setting.png and /dev/null differ diff --git a/ios/Runner/img/shop_loading.png b/ios/Runner/img/shop_loading.png deleted file mode 100755 index 6e1fc334..00000000 Binary files a/ios/Runner/img/shop_loading.png and /dev/null differ diff --git a/ios/Runner/img/show_head_toast_bg.9.PNG b/ios/Runner/img/show_head_toast_bg.9.PNG deleted file mode 100755 index 18e7a126..00000000 Binary files a/ios/Runner/img/show_head_toast_bg.9.PNG and /dev/null differ diff --git a/ios/Runner/img/sidebar_background.xml b/ios/Runner/img/sidebar_background.xml deleted file mode 100755 index 671c9a53..00000000 --- a/ios/Runner/img/sidebar_background.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/ios/Runner/img/spk.png b/ios/Runner/img/spk.png deleted file mode 100755 index 87187ae0..00000000 Binary files a/ios/Runner/img/spk.png and /dev/null differ diff --git a/ios/Runner/img/split.JPG b/ios/Runner/img/split.JPG deleted file mode 100755 index 315a8d32..00000000 Binary files a/ios/Runner/img/split.JPG and /dev/null differ diff --git a/ios/Runner/img/split3.png b/ios/Runner/img/split3.png deleted file mode 100755 index 44addc92..00000000 Binary files a/ios/Runner/img/split3.png and /dev/null differ diff --git a/ios/Runner/img/split4.png b/ios/Runner/img/split4.png deleted file mode 100755 index 61ed2931..00000000 Binary files a/ios/Runner/img/split4.png and /dev/null differ diff --git a/ios/Runner/img/swicth_add_off.png b/ios/Runner/img/swicth_add_off.png deleted file mode 100755 index e0614006..00000000 Binary files a/ios/Runner/img/swicth_add_off.png and /dev/null differ diff --git a/ios/Runner/img/swicth_add_on.png b/ios/Runner/img/swicth_add_on.png deleted file mode 100755 index 5de6a839..00000000 Binary files a/ios/Runner/img/swicth_add_on.png and /dev/null differ diff --git a/ios/Runner/img/swicth_minus_off.png b/ios/Runner/img/swicth_minus_off.png deleted file mode 100755 index 9819021a..00000000 Binary files a/ios/Runner/img/swicth_minus_off.png and /dev/null differ diff --git a/ios/Runner/img/swicth_minus_on.png b/ios/Runner/img/swicth_minus_on.png deleted file mode 100755 index 14f53d0f..00000000 Binary files a/ios/Runner/img/swicth_minus_on.png and /dev/null differ diff --git a/ios/Runner/img/swicth_off.png b/ios/Runner/img/swicth_off.png deleted file mode 100755 index 54d80d52..00000000 Binary files a/ios/Runner/img/swicth_off.png and /dev/null differ diff --git a/ios/Runner/img/swicth_on.png b/ios/Runner/img/swicth_on.png deleted file mode 100755 index e0fe807f..00000000 Binary files a/ios/Runner/img/swicth_on.png and /dev/null differ diff --git a/ios/Runner/img/test.jpg b/ios/Runner/img/test.jpg deleted file mode 100755 index 5fb48593..00000000 Binary files a/ios/Runner/img/test.jpg and /dev/null differ diff --git a/ios/Runner/img/thumb.png b/ios/Runner/img/thumb.png deleted file mode 100755 index 05be33fb..00000000 Binary files a/ios/Runner/img/thumb.png and /dev/null differ diff --git a/ios/Runner/img/thumb_on.png b/ios/Runner/img/thumb_on.png deleted file mode 100755 index 20407b1f..00000000 Binary files a/ios/Runner/img/thumb_on.png and /dev/null differ diff --git a/ios/Runner/img/unlock_on2.png b/ios/Runner/img/unlock_on2.png deleted file mode 100755 index d708508b..00000000 Binary files a/ios/Runner/img/unlock_on2.png and /dev/null differ diff --git a/ios/Runner/img/vcall.png b/ios/Runner/img/vcall.png deleted file mode 100755 index 09c5e95a..00000000 Binary files a/ios/Runner/img/vcall.png and /dev/null differ diff --git a/ios/Runner/img/vcall_on.png b/ios/Runner/img/vcall_on.png deleted file mode 100755 index ab92938a..00000000 Binary files a/ios/Runner/img/vcall_on.png and /dev/null differ diff --git a/ios/Runner/img/vcontacts.png b/ios/Runner/img/vcontacts.png deleted file mode 100755 index 0aeb6ba8..00000000 Binary files a/ios/Runner/img/vcontacts.png and /dev/null differ diff --git a/ios/Runner/img/vcontacts2.png b/ios/Runner/img/vcontacts2.png deleted file mode 100755 index ae5365ac..00000000 Binary files a/ios/Runner/img/vcontacts2.png and /dev/null differ diff --git a/ios/Runner/img/vcontacts_on.png b/ios/Runner/img/vcontacts_on.png deleted file mode 100755 index d2debc11..00000000 Binary files a/ios/Runner/img/vcontacts_on.png and /dev/null differ diff --git a/ios/Runner/img/vrecord.png b/ios/Runner/img/vrecord.png deleted file mode 100755 index 6f4c9b3b..00000000 Binary files a/ios/Runner/img/vrecord.png and /dev/null differ diff --git a/ios/Runner/img/vrecord_on.png b/ios/Runner/img/vrecord_on.png deleted file mode 100755 index c182f903..00000000 Binary files a/ios/Runner/img/vrecord_on.png and /dev/null differ diff --git a/ios/Runner/img/watch.png b/ios/Runner/img/watch.png deleted file mode 100755 index a9b0523a..00000000 Binary files a/ios/Runner/img/watch.png and /dev/null differ diff --git a/ios/Runner/img/wave1.png b/ios/Runner/img/wave1.png deleted file mode 100755 index a7251d79..00000000 Binary files a/ios/Runner/img/wave1.png and /dev/null differ diff --git a/ios/Runner/img/wave2.png b/ios/Runner/img/wave2.png deleted file mode 100755 index 43e8d4da..00000000 Binary files a/ios/Runner/img/wave2.png and /dev/null differ diff --git a/ios/Runner/img/wave3.png b/ios/Runner/img/wave3.png deleted file mode 100755 index b5821c4d..00000000 Binary files a/ios/Runner/img/wave3.png and /dev/null differ diff --git a/ios/Runner/img/zoom.png b/ios/Runner/img/zoom.png deleted file mode 100755 index daa298ba..00000000 Binary files a/ios/Runner/img/zoom.png and /dev/null differ diff --git a/ios/Runner/launchImage_sky.png b/ios/Runner/launchImage_sky.png new file mode 100644 index 00000000..b323652c Binary files /dev/null and b/ios/Runner/launchImage_sky.png differ diff --git a/ios/Runner/launchImage_xhj.png b/ios/Runner/launchImage_xhj.png new file mode 100644 index 00000000..c78c2cfe Binary files /dev/null and b/ios/Runner/launchImage_xhj.png differ diff --git a/ios/Runner/lcokStarMain.png b/ios/Runner/lcokStarMain.png deleted file mode 100755 index 15078627..00000000 Binary files a/ios/Runner/lcokStarMain.png and /dev/null differ diff --git a/ios/Runner/skyLaunchScreen.storyboard b/ios/Runner/skyLaunchScreen.storyboard index 9ce9a308..aa804fbc 100755 --- a/ios/Runner/skyLaunchScreen.storyboard +++ b/ios/Runner/skyLaunchScreen.storyboard @@ -1,9 +1,9 @@ - + - + @@ -19,11 +19,11 @@ - - + + - + @@ -38,6 +38,6 @@ - + diff --git a/ios/Runner/xhjLaunchScreen.storyboard b/ios/Runner/xhjLaunchScreen.storyboard index b799f493..396e6501 100755 --- a/ios/Runner/xhjLaunchScreen.storyboard +++ b/ios/Runner/xhjLaunchScreen.storyboard @@ -1,9 +1,9 @@ - + - + @@ -19,11 +19,11 @@ - - + + - + @@ -38,6 +38,6 @@ - + diff --git a/ios/Runner/zh-Hans.lproj/LaunchScreen.strings b/ios/Runner/zh-Hans.lproj/LaunchScreen.strings deleted file mode 100644 index 8b137891..00000000 --- a/ios/Runner/zh-Hans.lproj/LaunchScreen.strings +++ /dev/null @@ -1 +0,0 @@ - diff --git a/lan/lan_en.json b/lan/lan_en.json index 16d2506e..40ab7efa 100755 --- a/lan/lan_en.json +++ b/lan/lan_en.json @@ -914,4 +914,12 @@ "操作流程值": "1. Open the Alexa app and search for the Skye Smart Lock skill\n2. Click Enable Skill and log in to your Skye account\n3. Say 'Alexa, discover devices' to Alexa\n4. After discovering the device, you can use the voice command to control the lock" "秒内不可使用面容开锁": "Face unlocking cannot be used within seconds", "密码需至少包含数字/字母/字符中的2种组合": "The password must contain at least 2 combinations of numbers/letters/characters" + "操作流程值": "1. Open the Alexa app and search for the Skye Smart Lock skill\n2. Click Enable Skill and log in to your Skye account\n3. Say 'Alexa, discover devices' to Alexa\n4. After discovering the device, you can use the voice command to control the lock", + "Google Home": "Google Home", + "Action name": "Action name", + "ScienerSmart": "ScienerSmart", + "支持的语言": "Supported languages", + "英语": "English", + "Google Home操作流程的值": "1. Open the Google Home app and click the '+' in the upper left corner\n2. Click 'Set up device' and select 'Works with Google'\n3. Search for 'ScienerSmart' and log in to your Skye account\n4. After discovering the device, you can use the voice command to control the lock", + "开启": "Open" } diff --git a/lan/lan_keys.json b/lan/lan_keys.json index 4a81514d..3618f20a 100755 --- a/lan/lan_keys.json +++ b/lan/lan_keys.json @@ -951,4 +951,12 @@ "秒内不可使用面容开锁": "秒内不可使用面容开锁", "密码需至少包含数字/字母/字符中的2种组合": "密码需至少包含数字/字母/字符中的2种组合" + "操作流程值":"操作流程值", + "Google Home":"Google Home", + "Action name":"Action name", + "ScienerSmart":"ScienerSmart", + "支持的语言":"支持的语言", + "英语":"英语", + "Google Home操作流程的值":"Google Home操作流程的值", + "开启":"开启" } diff --git a/lan/lan_zh.json b/lan/lan_zh.json index d81da921..2cc18095 100755 --- a/lan/lan_zh.json +++ b/lan/lan_zh.json @@ -912,4 +912,12 @@ "密码需至少包含数字/字母/字符中的2种组合": "密码需至少包含数字/字母/字符中的2种组合" + "操作流程值":"1 用智能锁APP添加锁和网关\n\n2 在APP里开启锁的远程开锁功能（这个功能默认是关闭的）。如果没有这个选项，则锁不支持Alexa \n\n3 在Alexa中添加Skill，并用智能锁APP的账号和密码进行授权。授权成功后就可以发现账号下的设备\n\n4 在Alexa app里找到锁，开启语音开锁的功能，并设置语言密码\n\n5 可以通过Alexa操作锁了", + "Google Home": "Google Home", + "Action name": "Action name", + "ScienerSmart": "ScienerSmart", + "支持的语言": "支持的语言", + "英语": "英语", + "Google Home操作流程的值": "1.用智能锁APP添加锁和网关\n\n2.在APP里开启锁的远程开锁功能（这个功能默认是关闭的）。如果没有这个选项，则锁不支持Google Home \n\n3.安装Google Home APP，点击左上角的“+”按钮\n\n4.在设置页面，选择“与Google协同工作”\n\n5.搜索“ScienerSmart”，并用智能锁APP的账号和密码进行授权\n\n6.在智能锁APP里设置安全码，使用Google Home开锁时提供此安全码", + "开启": "开启" } diff --git a/lib/login/login/starLock_login_state.dart b/lib/login/login/starLock_login_state.dart index 9521398c..793ae233 100755 --- a/lib/login/login/starLock_login_state.dart +++ b/lib/login/login/starLock_login_state.dart @@ -19,7 +19,12 @@ class StarLockLoginState { FocusNode emailOrPhoneFocusNode = FocusNode(); FocusNode pwdFocusNode = FocusNode(); - RxMap deviceInfoMap = {}.obs; + RxMap deviceInfoMap = { + 'deviceBrand': '暂无', + 'deviceModel': '暂无', + 'deviceVersion': '暂无', + 'deviceType': 0 + }.obs; StarLockLoginState() { // emailOrPhone.value = StoreService.to.getLastUserAccount() as String; diff --git a/lib/login/register/starLock_register_logic.dart b/lib/login/register/starLock_register_logic.dart index e34cfb26..22d05cab 100755 --- a/lib/login/register/starLock_register_logic.dart +++ b/lib/login/register/starLock_register_logic.dart @@ -61,7 +61,6 @@ class StarLockRegisterLogic extends BaseGetXController { Storage.saveLoginData(entity.data); Storage.setBool(saveIsVip, entity.data!.isVip == 1); eventBus.fire(MineInfoChangeRefreshUI()); - XSJPushProvider().bindDeviceID(); XSJPushProvider().initLocalNotification(isCancelLocalPush: false); Get.offNamedUntil(Routers.starLockMain, (Route route) => false); BlueManage().scanDevices.clear(); //清除设备缓存 diff --git a/lib/main/lockMian/lockMain/lockMain_logic.dart b/lib/main/lockMian/lockMain/lockMain_logic.dart index 8c60f6f1..6234c12c 100755 --- a/lib/main/lockMian/lockMain/lockMain_logic.dart +++ b/lib/main/lockMian/lockMain/lockMain_logic.dart @@ -29,8 +29,10 @@ class LockMainLogic extends BaseGetXController { final List> _subscriptions = >[]; - Future getStarLockInfo({bool isUnShowLoading = false}) async { - final LockListInfoEntity entity = await ApiRepository.to.getStarLockListInfo( + Future getStarLockInfo( + {bool isUnShowLoading = false}) async { + final LockListInfoEntity entity = + await ApiRepository.to.getStarLockListInfo( pageNo: pageNo, pageSize: 50, isUnShowLoading: isUnShowLoading, @@ -44,13 +46,12 @@ class LockMainLogic extends BaseGetXController { } Future updateZoneOffsetsAndLanguages() async { - final LoginEntity entity = await ApiRepository.to.updateZoneOffsetsAndLanguages( + final LoginEntity entity = + await ApiRepository.to.updateZoneOffsetsAndLanguages( timezoneOffset: DateTime.now().timeZoneOffset.inSeconds, // language: '' ); - if (entity.errorCode!.codeIsSuccessful) { - - } + if (entity.errorCode!.codeIsSuccessful) {} return entity; } @@ -88,18 +89,22 @@ class LockMainLogic extends BaseGetXController { }); } - if(state.dataLength.value == 1){ + if (state.dataLength.value == 1) { if (Get.isRegistered()) { //设置控制器数据并刷新 // AppLog.log('检测控制器是否存 调用了 setLockListInfoGroupEntity'); - Get.find().loadData(lockListInfoItemEntity: entity.groupList![0].lockList![0], isOnlyOneData: true); + Get.find().loadData( + lockListInfoItemEntity: entity.groupList![0].lockList![0], + isOnlyOneData: true); } else { //延迟加载 Future.delayed(200.milliseconds, () { if (Get.isRegistered()) { //设置控制器数据并刷新 // AppLog.log('检测控制器是否存 延迟调用了 setLockListInfoGroupEntity'); - Get.find().loadData(lockListInfoItemEntity: entity.groupList![0].lockList![0], isOnlyOneData: true); + Get.find().loadData( + lockListInfoItemEntity: entity.groupList![0].lockList![0], + isOnlyOneData: true); } }); } @@ -300,7 +305,6 @@ class LockMainLogic extends BaseGetXController { // 初始化JPush服务并绑定设备ID final XSJPushProvider jpushProvider = XSJPushProvider(); await jpushProvider.initJPushService(); - await jpushProvider.bindDeviceID(); await jpushProvider.initLocalNotification(isCancelLocalPush: false); // 开启UDP diff --git a/lib/main/lockMian/lockMain/xhj/lockMain_xhj_logic.dart b/lib/main/lockMian/lockMain/xhj/lockMain_xhj_logic.dart index 3b5c78fb..77c18a63 100755 --- a/lib/main/lockMian/lockMain/xhj/lockMain_xhj_logic.dart +++ b/lib/main/lockMian/lockMain/xhj/lockMain_xhj_logic.dart @@ -61,7 +61,6 @@ class LockMainXHJLogic extends BaseGetXController { // 初始化JPush服务并绑定设备ID final XSJPushProvider jpushProvider = XSJPushProvider(); await jpushProvider.initJPushService(); - await jpushProvider.bindDeviceID(); await jpushProvider.initLocalNotification(isCancelLocalPush: false); } diff --git a/lib/mine/mineSet/google_home/google_home_logic.dart b/lib/mine/mineSet/google_home/google_home_logic.dart index 28618b68..79660710 100644 --- a/lib/mine/mineSet/google_home/google_home_logic.dart +++ b/lib/mine/mineSet/google_home/google_home_logic.dart @@ -1,3 +1,4 @@ +import 'package:get/get.dart'; import 'package:star_lock/main/lockDetail/passwordKey/passwordKeyList/passwordKeyListEntity.dart'; import 'package:star_lock/mine/mineSet/google_home/google_home_state.dart'; import 'package:star_lock/network/api_repository.dart'; @@ -16,11 +17,11 @@ class GoogleHomeLogic extends BaseGetXController { state.isGoogleHome.value = !state.isGoogleHome.value; state.isGoogleHome.refresh(); if (state.isGoogleHome.value) { - state.isOpenedText.value = '关闭'; + state.isOpenedText.value = '关闭'.tr; } else { - state.isOpenedText.value = '开启'; + state.isOpenedText.value = '开启'.tr; } - showToast('操作成功'); + showToast('操作成功'.tr); } } } diff --git a/lib/mine/mineSet/google_home/google_home_page.dart b/lib/mine/mineSet/google_home/google_home_page.dart index 36b458e4..a0301e9d 100644 --- a/lib/mine/mineSet/google_home/google_home_page.dart +++ b/lib/mine/mineSet/google_home/google_home_page.dart @@ -49,8 +49,8 @@ class _GoogleHomePageState extends State { return Column( children: [ CommonItem( - leftTitel: 'Action name', - rightTitle: 'ScienerSmart', + leftTitel: 'Action name'.tr, + rightTitle: 'ScienerSmart'.tr, ), SizedBox( height: 20.h, @@ -84,10 +84,7 @@ class _GoogleHomePageState extends State { children: [ _buildInfoSection('支持的语言'.tr, '英语'.tr), SizedBox(height: 20.h), - _buildInfoSection( - '操作流程'.tr, - '1.用智能锁APP添加锁和网关\n\n2.在APP里开启锁的远程开锁功能（这个功能默认是关闭的）。如果没有这个选项，则锁不支持Google Home \n\n3.安装Google Home APP，点击左上角的“+”按钮\n\n4.在设置页面，选择“与Google协同工作”\n\n5.搜索“ScienerSmart”，并用智能锁APP的账号和密码进行授权\n\n6.在智能锁APP里设置安全码，使用Google Home开锁时提供此安全码' - .tr), + _buildInfoSection('操作流程'.tr, 'Google Home操作流程的值'.tr), ], ), ); diff --git a/lib/mine/mineSet/mineSet/mineSet_page.dart b/lib/mine/mineSet/mineSet/mineSet_page.dart index a8bb6f7b..79f7fe76 100755 --- a/lib/mine/mineSet/mineSet/mineSet_page.dart +++ b/lib/mine/mineSet/mineSet/mineSet_page.dart @@ -296,10 +296,9 @@ class _MineSetPageState extends State })), */ Obx(() => CommonItem( - leftTitel:'隐藏无效开锁权限'.tr, - rightTitle: (state.hideExpiredAccessFlag.value == 1 - ? '已开启'.tr - : '已关闭'.tr), + leftTitel: '隐藏无效开锁权限'.tr, + rightTitle: + (state.hideExpiredAccessFlag.value == 1 ? '已开启'.tr : '已关闭'.tr), isHaveLine: true, isHaveDirection: true, action: () { @@ -345,7 +344,7 @@ class _MineSetPageState extends State }); }), CommonItem( - leftTitel: 'Google Home', + leftTitel: 'Google Home'.tr, rightTitle: '', isHaveLine: true, isHaveDirection: true, @@ -370,7 +369,7 @@ class _MineSetPageState extends State leftTitel: '客服'.tr, isHaveLine: widget.showAbout, isHaveDirection: true, - action: (){ + action: () { WechatManageTool.getAppInfo(CustomerTool.openCustomerService); }, ), diff --git a/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_logic.dart b/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_logic.dart index 7e4c4298..538f5680 100755 --- a/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_logic.dart +++ b/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_logic.dart @@ -1,5 +1,6 @@ import 'dart:async'; import 'package:star_lock/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_entity.dart'; +import 'package:star_lock/mine/mineSet/mineSet/userSettingInfoEntity.dart'; import 'package:star_lock/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_state.dart'; import 'package:star_lock/tools/storage.dart'; @@ -23,6 +24,23 @@ class ValueAddedServicesListLogic extends BaseGetXController { } } + //用户信息 + Future userSettingsInfoRequest() async { + final UserSettingInfoEntity entity = + await ApiRepository.to.userSettingsInfo(); + if (entity.errorCode!.codeIsSuccessful) { + //是否打开Amazon Alexa + entity.data!.isAmazonAlexa! == 1 + ? state.isAmazonAlexa.value = true + : state.isAmazonAlexa.value = false; + + //是否打开Google Home + entity.data!.isGoogleHome! == 1 + ? state.isGoogleHome.value = true + : state.isGoogleHome.value = false; + } + } + @override Future onReady() async { super.onReady(); diff --git a/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart b/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart index 5c80cddb..2c1fa082 100755 --- a/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart +++ b/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart @@ -116,7 +116,9 @@ class _ValueAddedServicesPageListState fontWeight: FontWeight.w600), ), 'Amazon Alexa', () { - Get.toNamed(Routers.amazonAlexaPage); + Get.toNamed(Routers.amazonAlexaPage, arguments: { + 'isAmazonAlexa': state.isAmazonAlexa.value + }); }), if (!F.isProductionEnv) _valueAddedServicesItem( @@ -129,7 +131,11 @@ class _ValueAddedServicesPageListState ), 'Google Home', () { // EasyLoading.showToast('功能暂未开放', duration: 2000.milliseconds); - Get.toNamed(Routers.googleHomePage); + Get.toNamed(Routers.googleHomePage, arguments: { + 'isGoogleHome': state.isGoogleHome.value + })?.then((Object? value) { + logic.userSettingsInfoRequest(); + }); }), if (!F.isProductionEnv) _valueAddedServicesItem( diff --git a/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_state.dart b/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_state.dart index fffad321..b15e1407 100755 --- a/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_state.dart +++ b/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_state.dart @@ -1 +1,6 @@ -class ValueAddedServicesListState {} +import 'package:get/get.dart'; + +class ValueAddedServicesListState { + RxBool isAmazonAlexa = false.obs; //亚马逊Alexa + RxBool isGoogleHome = false.obs; //谷歌Home +} diff --git a/lib/tools/push/xs_jPhush.dart b/lib/tools/push/xs_jPhush.dart index b4defb24..7c72a424 100755 --- a/lib/tools/push/xs_jPhush.dart +++ b/lib/tools/push/xs_jPhush.dart @@ -49,39 +49,33 @@ class XSJPushProvider { //极光推送事件处理方法 void addJPushEventHandler() { jpush.addEventHandler( - onReceiveNotification: (Map message) async { - AppLog.log('onReceiveNotification: $message'); - }, onOpenNotification: (Map message) async { - AppLog.log('onOpenNotification: $message'); - }, onReceiveMessage: (Map message) async { - AppLog.log('onReceiveMessage: $message'); - //这里接收自定义消息 - MessageManagement.shunting(message); - }, onReceiveNotificationAuthorization: - (Map message) async { - AppLog.log('onReceiveNotificationAuthorization: $message'); - }, onInAppMessageShow: (Map message) async { - AppLog.log('onInAppMessageShow: $message'); - }); - } + onReceiveNotification: (Map message) async { + AppLog.log('onReceiveNotification: $message'); + }, + onOpenNotification: (Map message) async { + AppLog.log('onOpenNotification: $message'); + }, + onReceiveMessage: (Map message) async { + AppLog.log('onReceiveMessage: $message'); + //这里接收自定义消息 + MessageManagement.shunting(message); + }, + onReceiveNotificationAuthorization: (Map message) async { + AppLog.log('onReceiveNotificationAuthorization: $message'); + }, + onInAppMessageShow: (Map message) async { + AppLog.log('onInAppMessageShow: $message'); + }, + onConnected: (Map message) async { + //绑定设备id + final String rid = await jpush.getRegistrationID(); + AppLog.log('onConnected registration id : $rid'); + await Storage.setString(pushDeviceID, rid); + await pushBindDeviceID(rid, Platform.isAndroid ? 10 : 20); - //绑定设备ID - Future bindDeviceID() async { - try { - AppLog.log('Fetching registration ID...'); - String rid; - rid = await jpush.getRegistrationID(); - if (rid.isEmpty) { - AppLog.log('Registration ID is empty.'); - rid = await jpush.getRegistrationID(); - return; - } - AppLog.log('flutter get registration id : $rid'); - await Storage.setString(pushDeviceID, rid); - await pushBindDeviceID(rid, Platform.isAndroid ? 10 : 20); - } catch (e) { - AppLog.log('Error getting registration ID: $e'); - } + return Future.value(); + }, + ); } Future pushBindDeviceID(String deviceID, int deviceType) async {