fix: sky和鑫泓佳环境下推送渠道的区分以及各个厂商通道ID的规整

android/app/build.gradle

@@ -117,7 +117,19 @@ android {
             applicationId "com.skychip.lock"
             signingConfig signingConfigs.sky
             resValue "string", "app_name", "TTLock Pro"
-            manifestPlaceholders.JPUSH_PKGNAME = "com.skychip.lock"
+            manifestPlaceholders = [
+                    JPUSH_PKGNAME : "com.skychip.lock",
+                    JPUSH_APPKEY : "7ff37d174c1a568a89e98dad",//--skyAppKey
+                    JPUSH_CHANNEL : "flutter_channel",
+                    XIAOMI_APPID : "MI-2882303761520287291",
+                    XIAOMI_APPKEY : "MI-5352028744291",
+                    OPPO_APPKEY   : "OP-ccae67a4a8c1470a8350b0d6a89f8105",
+                    OPPO_APPID    : "OP-31586713",
+                    OPPO_APPSECRET: "OP-2339389233094ca297de7b10213f7bd8",
+                    VIVO_APPKEY   : "6a18657357d176364a91f50e4c9cd7c4",
+                    VIVO_APPID    : "105724810",
+                    HONOR_APPID   : "104437184",
+            ]
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules-sky.pro'
         }
         sky_pre {
@@ -139,7 +151,19 @@ android {
             applicationId "com.xhjcn.lock"
             signingConfig signingConfigs.xhj
             resValue "string", "app_name", "Star Lock"
-            manifestPlaceholders.JPUSH_PKGNAME = "com.xhjcn.lock"
+            manifestPlaceholders = [
+                    JPUSH_PKGNAME : "com.xhjcn.lock",
+                    JPUSH_APPKEY  : "251fc8074820d122b6de58d2",//--鑫泓佳AppKey
+                    JPUSH_CHANNEL : "flutter_channel",
+                    XIAOMI_APPID  : "MI-2882303761520314939",
+                    XIAOMI_APPKEY : "MI-5312031456939",
+                    OPPO_APPKEY   : "OP-47f668c9943248118502aa58d066393b",
+                    OPPO_APPID    : "OP-31726001",
+                    OPPO_APPSECRET: "OP-05723986bba64183a71530b496922450",
+                    VIVO_APPKEY   : "75fe8e570425b714e08d0390b14797cb",
+                    VIVO_APPID    : "105752244",
+                    HONOR_APPID   : "104458196",
+            ]
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules-xhj.pro'
         }
 
@@ -224,22 +248,22 @@ android {
                 JPUSH_PKGNAME : "这里不重要，在口味配置",
                 //JPush 上注册的包名对应的 Appkey.
                 // JPUSH_APPKEY : "7ff37d174c1a568a89e98dad",//--skyAppKey
-                JPUSH_APPKEY  : "251fc8074820d122b6de58d2",//--鑫泓佳AppKey
+//                JPUSH_APPKEY  : "251fc8074820d122b6de58d2",//--鑫泓佳AppKey
-                JPUSH_CHANNEL : "flutter_channel",
+//                JPUSH_CHANNEL : "flutter_channel",
 
                 //若不集成厂商通道，可直接跳过以下配置
                 //以下为sky的配置
                 // XIAOMI_APPID : "MI-2882303761520287291",
                 // XIAOMI_APPKEY : "MI-5352028744291",
                 //以下均为鑫泓佳的配置
-                XIAOMI_APPID  : "MI-2882303761520314939",
+//                XIAOMI_APPID  : "MI-2882303761520314939",
-                XIAOMI_APPKEY : "MI-5312031456939",
+//                XIAOMI_APPKEY : "MI-5312031456939",
-                OPPO_APPKEY   : "OP-47f668c9943248118502aa58d066393b",
+//                OPPO_APPKEY   : "OP-47f668c9943248118502aa58d066393b",
-                OPPO_APPID    : "OP-31726001",
+//                OPPO_APPID    : "OP-31726001",
-                OPPO_APPSECRET: "OP-05723986bba64183a71530b496922450",
+//                OPPO_APPSECRET: "OP-05723986bba64183a71530b496922450",
-                VIVO_APPKEY   : "75fe8e570425b714e08d0390b14797cb",
+//                VIVO_APPKEY   : "75fe8e570425b714e08d0390b14797cb",
-                VIVO_APPID    : "105752244",
+//                VIVO_APPID    : "105752244",
-                HONOR_APPID   : "104458196",
+//                HONOR_APPID   : "104458196",
         ]
         splits {
             abi {

android/app/src/main/AndroidManifest.xml

@@ -79,23 +79,23 @@
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_channel_id"
             android:value="1" /> <!-- 将您的通知渠道ID替换为您的实际ID -->
-        <meta-data
+<!--        <meta-data-->
-            android:name="com.huawei.hms.client.appid"
+<!--            android:name="com.huawei.hms.client.appid"-->
-            android:value="110798531" />
+<!--            android:value="110798531" />-->
-        <meta-data
+<!--        <meta-data-->
-            android:name="com.huawei.hms.client.cpid"
+<!--            android:name="com.huawei.hms.client.cpid"-->
-            android:value="1406555529261648640" />
+<!--            android:value="1406555529261648640" />-->
-        <meta-data
+<!--        <meta-data-->
-            android:name="OPPO_APPKEY"
+<!--            android:name="OPPO_APPKEY"-->
-            android:value="OP-47f668c9943248118502aa58d066393b" />
+<!--            android:value="OP-47f668c9943248118502aa58d066393b" />-->
 
-        <meta-data
+<!--        <meta-data-->
-            android:name="OPPO_APPID"
+<!--            android:name="OPPO_APPID"-->
-            android:value="OP-31726001" />
+<!--            android:value="OP-31726001" />-->
 
-        <meta-data
+<!--        <meta-data-->
-            android:name="OPPO_APPSECRET"
+<!--            android:name="OPPO_APPSECRET"-->
-            android:value="OP-05723986bba64183a71530b496922450" />
+<!--            android:value="OP-05723986bba64183a71530b496922450" />-->
 
         <service
                 android:name="com.huawei.hms.push.HmsMessageService"

lib/main.dart

@@ -55,8 +55,6 @@ FutureOr<void> main() async {
       }
     });
 
-    NotificationService().init(); // 初始化通知服务
-
     //ToDo: 增加对讲调试、正式可删除
     runApp(MultiProvider(providers: [
       ChangeNotifierProvider(create: (_) => DebugInfoModel()),
@@ -98,4 +96,6 @@ Future<void> privacySDKInitialization() async {
   // 初始化JPush服务
   final XSJPushProvider jpushProvider = XSJPushProvider();
   await jpushProvider.initJPushService();
+  await jpushProvider.initLocalNotification(isCancelLocalPush: false);
+  NotificationService().init(); // 初始化通知服务
 }

lib/main/lockMian/lockMain/lockMain_logic.dart

@@ -11,10 +11,12 @@ import 'package:star_lock/flavors.dart';
 import 'package:star_lock/login/login/entity/LoginEntity.dart';
 import 'package:star_lock/main/lockDetail/lockDetail/lockDetail_logic.dart';
 import 'package:star_lock/main/lockMian/lockList/lockList_logic.dart';
+import 'package:star_lock/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_entity.dart';
 import 'package:star_lock/talk/starChart/star_chart_manage.dart';
 import 'package:star_lock/tools/eventBusEventManage.dart';
 import 'package:star_lock/tools/push/xs_jPhush.dart';
 import 'package:star_lock/tools/showTipView.dart';
+import 'package:star_lock/tools/store_service.dart';
 
 import '../../../app_settings/app_settings.dart';
 import '../../../blue/blue_manage.dart';
@@ -46,6 +48,56 @@ class LockMainLogic extends BaseGetXController {
     return entity;
   }
 
+  //用户信息
+  Future<void> getUserInfoRequest() async {
+    final MinePersonInfoEntity entity = await ApiRepository.to.getUserInfo();
+    if (entity.errorCode!.codeIsSuccessful) {
+      final String languageCodeAndCountryCode = entity.data!.lang!;
+      if (languageCodeAndCountryCode.isEmpty) {
+        await StoreService.to.saveLanguageCode('');
+        await Get.updateLocale(Get.deviceLocale!);
+      } else if (languageCodeAndCountryCode.contains('-')) {
+        final List<String> parts = languageCodeAndCountryCode.split('-');
+        final Locale locale = Locale(parts[0], parts[1]);
+        await Get.updateLocale(locale);
+        await StoreService.to.saveLanguageCode(locale.toString());
+      } else if (languageCodeAndCountryCode.contains('_')) {
+        final List<String> parts = languageCodeAndCountryCode.split('_');
+        final Locale locale = Locale(parts[0], parts[1]);
+        await Get.updateLocale(locale);
+        AppLog.log('用户信息请求成功 更新locale: $locale');
+        await StoreService.to.saveLanguageCode(locale.toString());
+      }
+
+      Storage.setBool(saveIsVip, entity.data!.isVip == 1);
+      if (entity.data!.deviceId != null) {
+        if (entity.data!.deviceId!.isEmpty) {
+          bindPushDevice();
+        }
+      }
+      if (entity.data!.starchart != null) {
+        if (entity.data!.starchart!.starchartId == null) {
+          bindStarChart();
+        }
+      } else {
+        StartChartManage().init();
+      }
+    }
+  }
+
+  Future<void> bindPushDevice() async {
+    // 初始化JPush服务并绑定设备ID
+    final XSJPushProvider jpushProvider = XSJPushProvider();
+    await jpushProvider.initJPushService();
+    await jpushProvider.initLocalNotification(isCancelLocalPush: false);
+  }
+
+//绑定星图
+  Future<void> bindStarChart() async {
+    //初始化星图服务并绑定配置
+    await StartChartManage().init();
+  }
+
   Future<LoginEntity> updateZoneOffsetsAndLanguages() async {
     final LoginEntity entity =
         await ApiRepository.to.updateZoneOffsetsAndLanguages(
@@ -322,6 +374,7 @@ class LockMainLogic extends BaseGetXController {
     super.onInit();
     checkWhetherPushIsEnabled();
     _initSubscription();
+    getUserInfoRequest();
     // connectListener();
 
     // AppLog.log('onInit() updateZoneOffsetsAndLanguages');

lib/tools/push/xs_jPhush.dart

@@ -88,6 +88,15 @@ class XSJPushProvider {
 
   Future<void> pushBindDeviceID(String deviceID, int deviceType) async {
     try {
+      if (deviceID.isEmpty) {
+        AppLog.log('Device ID is empty.');
+        //绑定设备id
+        final String rid = await jpush.getRegistrationID();
+        AppLog.log('onConnected registration id : $rid');
+        await Storage.setString(pushDeviceID, rid);
+        deviceID = rid;
+        deviceType = Platform.isAndroid ? 10 : 20;
+      }
       final MineUnbindPhoneOrEmailEntity entity =
           await ApiRepository.to.pushBindAppId(deviceID, deviceType);
       if (entity.errorCode!.codeIsSuccessful) {