Merge remote-tracking branch 'origin/develop' into develop_liyi

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