Merge branch 'develop' into build-addGateway-20240814

ios/Podfile.lock

@@ -10,12 +10,12 @@ PODS:
     - EMASRest
   - AlicloudUT (5.2.0.16):
     - AlicloudUTDID
-  - AlicloudUTDID (1.6.1)
+  - AlicloudUTDID (1.6.0)
-  - AlicloudUtils (2.0.1):
+  - AlicloudUtils (2.0.0):
     - AlicloudUTDID
   - aliyun_face_plugin (0.0.1):
     - Flutter
-  - AMap3DMap (10.1.200):
+  - AMap3DMap (10.0.700):
     - AMapFoundation (>= 1.8.0)
   - amap_flutter_location (0.0.1):
     - AMapLocation
@@ -167,10 +167,10 @@ PODS:
     - GoogleUtilities/Network (~> 8.0)
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
     - nanopb (~> 3.30910.0)
-  - GoogleMaps (7.4.0):
+  - GoogleMaps (6.2.1):
-    - GoogleMaps/Maps (= 7.4.0)
+    - GoogleMaps/Maps (= 6.2.1)
-  - GoogleMaps/Base (7.4.0)
+  - GoogleMaps/Base (6.2.1)
-  - GoogleMaps/Maps (7.4.0):
+  - GoogleMaps/Maps (6.2.1):
     - GoogleMaps/Base
   - GoogleUtilities/AppDelegateSwizzler (8.0.2):
     - GoogleUtilities/Environment
@@ -203,8 +203,8 @@ PODS:
     - Flutter
   - image_picker_ios (0.0.1):
     - Flutter
-  - ios-voice-processor (1.1.2)
+  - ios-voice-processor (1.1.0)
-  - JCore (4.9.0)
+  - JCore (4.6.2)
   - JPush (5.3.0):
     - JCore (>= 2.0.0)
   - jpush_flutter (0.0.2):
@@ -230,9 +230,9 @@ PODS:
   - permission_handler_apple (9.3.0):
     - Flutter
   - PromisesObjC (2.4.0)
-  - SDWebImage (5.20.0):
+  - SDWebImage (5.19.2):
-    - SDWebImage/Core (= 5.20.0)
+    - SDWebImage/Core (= 5.19.2)
-  - SDWebImage/Core (5.20.0)
+  - SDWebImage/Core (5.19.2)
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -243,7 +243,7 @@ PODS:
   - system_settings (0.0.1):
     - Flutter
   - Toast (4.1.1)
-  - UMCommon (7.5.2):
+  - UMCommon (7.4.7):
     - UMDevice
   - UMDevice (3.4.0)
   - umeng_common_sdk (0.0.1):
@@ -427,10 +427,10 @@ SPEC CHECKSUMS:
   AlicloudPush: 88529c9b796e4ece0601de0867b30359f55b61f7
   AlicloudSender: 1f468b6bd962a099ffc19d45e3608b0fe98f259d
   AlicloudUT: 6d1cf30d57d096b7e9bb4b069dd0ba6ad59a3338
-  AlicloudUTDID: 5d2f22d50e11eecd38f30bc7a48c71925ea90976
+  AlicloudUTDID: 4e9d44c2fd704b3508069c38eaec9d6a759e702c
-  AlicloudUtils: ef4436f52b828b1182b002373758ecb88068e679
+  AlicloudUtils: 2a78de434a8b2dc99e408c4d6220e654076d9ef0
   aliyun_face_plugin: 7a90b6526c5acea616062e809699294c782c3eb8
-  AMap3DMap: 06a11a83072857d6076c14060b2e1a676182e84d
+  AMap3DMap: 6ee456d7ba946ebbad580a343b74ffa8e9936175
   amap_flutter_location: 44ff5beb64f42e0bf5feb402fe299dac0013af6f
   amap_flutter_map: 979e54d227cedac6c7504a2151bfbf3bcf96760a
   AMapFoundation: 9885c48fc3a78fdfb84a0299a2293e56ea3c9fec
@@ -465,12 +465,12 @@ SPEC CHECKSUMS:
   fluwx: c18fd6c16b03a2187cd07d6e48e32a7801962849
   google_maps_flutter_ios: f135b968a67c05679e0a53538e900b5c174b0d99
   GoogleAppMeasurement: 6e49ffac7d3f2c3ded9cc663f912a13b67bbd0de
-  GoogleMaps: 032f676450ba0779bd8ce16840690915f84e57ac
+  GoogleMaps: 20d7b12be49a14287f797e88e0e31bc4156aaeb4
   GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
   image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb
   image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
-  ios-voice-processor: 00bf226d172c7006f565d6b6dbf2dc5e5b76938b
+  ios-voice-processor: 8e32d7f980a06d392d128ef1cd19cf6ddcaca3c1
-  JCore: 1128d8c6f33f5c3607536a7b87c0e450d2c6ada6
+  JCore: 024c73b04e110b496e93d8c127ea9cd1ed934e4c
   JPush: b71f497a3c1b825c7843fd97f290b05d5cd75f2e
   jpush_flutter: c87be254790933c0363684169ef9d3d279a5adc5
   just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
@@ -481,13 +481,13 @@ SPEC CHECKSUMS:
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
-  SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8
+  SDWebImage: dfe95b2466a9823cf9f0c6d01217c06550d7b29a
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
   SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
   system_settings: 8f5cdbfa72c677fc8d665b863bcc20d393d87e9d
   Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
-  UMCommon: 72513a01ebca2dead52f2112b4d7c6196dbbe412
+  UMCommon: 8b4cd0423297c39bca6eea1ec896558b40e5bcf7
   UMDevice: dcdf7ec167387837559d149fbc7d793d984faf82
   umeng_common_sdk: a8abd7f86dfd013dbbeeae587ee143760c6582f2
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
@@ -498,3 +498,4 @@ SPEC CHECKSUMS:
 PODFILE CHECKSUM: 728f9c851a19709391c77c54ed3556e484b54db6
 
 COCOAPODS: 1.14.3
+

ios/Runner.xcodeproj/project.pbxproj

@@ -1075,8 +1075,10 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = "Runner/RunnerRelease-sky.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = NAQ5PL2DYC;
+				CODE_SIGN_STYLE = Manual;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = NAQ5PL2DYC;
 				INFOPLIST_FILE = Runner/info_sky.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1086,6 +1088,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.starlock.lock.local;
 				PRODUCT_NAME = Runner;
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = Debug_com.starlock.lock.local.mobileprovision;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
@@ -1197,8 +1200,10 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = "Runner/RunnerRelease-sky.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
-				DEVELOPMENT_TEAM = NAQ5PL2DYC;
+				CODE_SIGN_STYLE = Manual;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = NAQ5PL2DYC;
 				INFOPLIST_FILE = Runner/info_sky.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1207,6 +1212,7 @@
 				);
 				PRODUCT_NAME = Runner;
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = Appstore_com.skychip.lock.mobileprovision;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
@@ -1220,8 +1226,10 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = "Runner/RunnerRelease-xhj.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
-				DEVELOPMENT_TEAM = P8997RW3V8;
+				CODE_SIGN_STYLE = Manual;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = P8997RW3V8;
 				INFOPLIST_FILE = Runner/info_xhj.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1231,6 +1239,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.xhjcn.lock;
 				PRODUCT_NAME = Runner;
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = Appstore_com.xhjcn.lock.mobileprovision;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
@@ -1561,8 +1570,10 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = "Runner/RunnerRelease-sky.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
-				DEVELOPMENT_TEAM = NAQ5PL2DYC;
+				CODE_SIGN_STYLE = Manual;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = NAQ5PL2DYC;
 				INFOPLIST_FILE = Runner/info_sky.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1572,6 +1583,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.skychip.lock.pre;
 				PRODUCT_NAME = Runner;
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = Adhoc_com.skychip.lock.pre.mobileprovision;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
@@ -1754,8 +1766,10 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = "Runner/RunnerRelease-xhj.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
-				DEVELOPMENT_TEAM = P8997RW3V8;
+				CODE_SIGN_STYLE = Manual;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = P8997RW3V8;
 				INFOPLIST_FILE = Runner/info_xhj.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1765,6 +1779,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.xhjcn.lock.pre;
 				PRODUCT_NAME = Runner;
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = Adhoc_com.xhjcn.lock.pre.mobileprovision;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;

ios/Runner/RunnerRelease-xhj.entitlements

@@ -6,7 +6,7 @@
 	<string>development</string>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
-		<string>applinks:lock.skychip.top</string>
+		<string>applinks:lock.xhjcn.ltd</string>
 	</array>
 	<key>com.apple.external-accessory.wireless-configuration</key>
 	<true/>

ios/Runner/info_xhj.plist

@@ -30,10 +30,10 @@
 			<key>CFBundleURLIconFile</key>
 			<string></string>
 			<key>CFBundleURLName</key>
-			<string>com.sky.skysmartlock</string>
+			<string>com.xhj.xhjsmartlock</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>skysmartlock</string>
+				<string>xhjsmartlock</string>
 				<string></string>
 				<string></string>
 			</array>
@@ -45,7 +45,7 @@
 			<string>weixin</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>wxbe340095d2b8fd51</string>
+				<string>wx8e48112e22343817</string>
 			</array>
 		</dict>
 	</array>

lib/flavors.dart

@@ -39,6 +39,13 @@ class UmengKey {
 
 typedef dynamic fCallFunction();
 
+class WechatAppInfo {
+  WechatAppInfo({required this.wechatAppId, required this.universalLink});
+
+  String wechatAppId;
+  String universalLink;
+}
+
 class F {
   static Flavor? appFlavor;
 
@@ -281,6 +288,37 @@ class F {
     }
   }
 
+  static WechatAppInfo get wechatAppInfo {
+    switch (appFlavor) {
+      case Flavor.local:
+        return WechatAppInfo(
+            wechatAppId: 'wxbe340095d2b8fd51',
+            universalLink: 'https://apt.skychip.top/');
+      case Flavor.dev:
+        return WechatAppInfo(
+            wechatAppId: 'wxbe340095d2b8fd51',
+            universalLink: 'https://apt.skychip.top/');
+      case Flavor.pre:
+      case Flavor.sky_pre:
+      case Flavor.xhj_pre:
+        return WechatAppInfo(
+            wechatAppId: 'wxbe340095d2b8fd51',
+            universalLink: 'https://apt.skychip.top/');
+      case Flavor.sky:
+        return WechatAppInfo(
+            wechatAppId: 'wxbe340095d2b8fd51',
+            universalLink: 'https://lock.skychip.top/');
+      case Flavor.xhj:
+      case Flavor.xhj_bundle:
+        return WechatAppInfo(
+            wechatAppId: 'wx8e48112e22343817',
+            universalLink: 'https://lock.xhjcn.ltd/');
+      default:
+        return WechatAppInfo(
+            wechatAppId: 'wxbe340095d2b8fd51', universalLink: '');
+    }
+  }
+
   // 是否是生产环境
   static bool get isProductionEnv {
     switch (appFlavor) {

lib/mine/mine/starLockMine_page.dart

@@ -49,7 +49,7 @@ class StarLockMinePageState extends State<StarLockMinePage> with BaseWidget {
             onTap: () {
               WechatManageTool.getAppInfo(() {
                 WxPushWeChatMiniProgramTool.pushWeChatMiniProgram(
-                    'wxbe340095d2b8fd51');
+                    F.wechatAppInfo.wechatAppId, F.wechatAppInfo.universalLink);
               });
             },
             child: Padding(

lib/mine/mineSet/mineSet/mineSet_page.dart

@@ -86,7 +86,8 @@ class _MineSetPageState extends State<MineSetPage>
                 onTap: () {
                   WechatManageTool.getAppInfo(() {
                     WxPushWeChatMiniProgramTool.pushWeChatMiniProgram(
-                        'wxbe340095d2b8fd51');
+                        F.wechatAppInfo.wechatAppId,
+                        F.wechatAppInfo.universalLink);
                   });
                 },
                 child: ClipRRect(

lib/tools/wechat/wx_push_miniProgram/wx_push_miniProgram.dart

@@ -23,10 +23,9 @@ class WxPushWeChatMiniProgramTool {
         doOnIOS: true);
   }
 
-  static Future<void> pushWeChatMiniProgram(String appId) async {
+  static Future<void> pushWeChatMiniProgram(String appId,String _associationUrl) async {
     if (!isInit) {
       isInit = true;
-      final String _associationUrl = await Storage.getAssociationUrl();
       await initWeChatMiniProgram(appId, _associationUrl);
 
       final MiniProgram miniProgram = MiniProgram(

pubspec.yaml

@@ -109,12 +109,12 @@ version: 1.0.85+2025010802
 environment:
   sdk: '>=2.12.0 <3.0.0'
 
-fluwx:
+#fluwx:
-  app_id: 'wxbe340095d2b8fd51'
+#  app_id: 'wxbe340095d2b8fd51'
-  debug_logging: true
+#  debug_logging: true
-  android:
+#  android:
-  ios:
+#  ios:
-    universal_link: https://lock.skychip.top/apple-app-site-association.json
+#    universal_link: https://lock.skychip.top/apple-app-site-association.json
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions