1，星锁fix—推送偶发性获取不到DeviceID问题

2，星锁fix—登录报错DeviceInfo不能为空问题
3，星锁集成—荣耀厂商通道以提高推送到达率（已测试通过）
4，星锁集成—vivo厂商通道（待vivo机型测试）

android/app/build.gradle

@@ -180,9 +180,9 @@ android {
                 OPPO_APPKEY : "OP-47f668c9943248118502aa58d066393b",
                 OPPO_APPID : "OP-31726001",
                 OPPO_APPSECRET : "OP-05723986bba64183a71530b496922450",
-                // VIVO_APPKEY : "vivo的APPKEY",
+                VIVO_APPKEY : "75fe8e570425b714e08d0390b14797cb",
-                // VIVO_APPID : "vivo的APPID",
+                VIVO_APPID : "105752244",
-                HONOR_APPID : "110798531", 
+                HONOR_APPID : "104458196", 
         ]
         splits {
             abi {
@@ -249,5 +249,10 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.6.2'
     implementation 'commons-codec:commons-codec:1.6'
     implementation 'androidx.annotation:annotation:1.1.0'
-
+    // 接入荣耀厂商
+    implementation 'cn.jiguang.sdk.plugin:honor:5.2.3' 
+    //需要单独引入荣耀厂商 aar ，请下载官网 SDK 包并把 jpush-android-xxx-release/third-push/honor/libs 下的 aar 文件单独拷贝一份到应用 module/libs 下
+    // implementation(name: 'HiPushSDK-7.0.61.303', ext: 'aar')
+    //接入 VIVO 厂商
+    implementation 'cn.jiguang.sdk.plugin:vivo:5.2.3'
 }

android/app/src/main/AndroidManifest.xml

@@ -56,6 +56,8 @@
         android:name="android.permission.QUERY_ALL_PACKAGES"
         tools:node="remove" />
 
+    <uses-permission android:name="com.hihonor.permission.sec.SDK_LAUNCHER" />
+
     <application
         android:name="android.app.Application"
         android:icon="@mipmap/ic_launcher"
@@ -96,6 +98,46 @@
         <meta-data
             android:name="OPPO_APPSECRET"
             android:value="OP-05723986bba64183a71530b496922450" />
+
+
+        <meta-data
+            android:name="com.huawei.hms.client.appid"
+            android:value="110798531" />
+        <meta-data
+            android:name="com.huawei.hms.client.cpid"
+            android:value="1406555529261648640" />
+        <meta-data
+            android:name="OPPO_APPKEY"
+            android:value="OP-47f668c9943248118502aa58d066393b" />
+
+        <meta-data
+            android:name="OPPO_APPID"
+            android:value="OP-31726001" />
+
+        <meta-data
+            android:name="OPPO_APPSECRET"
+            android:value="OP-05723986bba64183a71530b496922450" />
+
+
+        <service
+            android:name="com.huawei.hms.push.HmsMessageService"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.huawei.push.action.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+
+
+        <receiver
+            android:name="com.huawei.hms.support.api.push.PushReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.huawei.android.push.intent.REGISTRATION" />
+                <action android:name="com.huawei.android.push.intent.RECEIVE" />
+                <category android:name="${applicationId}" />
+            </intent-filter>
+        </receiver>
+
         <!-- 配置定位Service -->
         <service android:name="com.amap.api.location.APSService" />
         <!-- since JPushv3.6.8 ，oppov2.1.0 oppo 核心功能-->

lib/login/login/starLock_login_state.dart

@@ -19,7 +19,12 @@ class StarLockLoginState {
 
   FocusNode emailOrPhoneFocusNode = FocusNode();
   FocusNode pwdFocusNode = FocusNode();
-  RxMap<String, dynamic> deviceInfoMap = <String, dynamic>{}.obs;
+  RxMap<String, dynamic> deviceInfoMap = <String, dynamic>{
+    'deviceBrand': '暂无',
+    'deviceModel': '暂无',
+    'deviceVersion': '暂无',
+    'deviceType': 0
+  }.obs;
 
   StarLockLoginState() {
     // emailOrPhone.value = StoreService.to.getLastUserAccount() as String;

lib/login/register/starLock_register_logic.dart

@@ -57,7 +57,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(); //清除设备缓存

lib/main/lockMian/lockMain/lockMain_logic.dart

@@ -29,8 +29,10 @@ class LockMainLogic extends BaseGetXController {
   final List<StreamSubscription<void>> _subscriptions =
       <StreamSubscription<void>>[];
 
-  Future<LockListInfoEntity> getStarLockInfo({bool isUnShowLoading = false}) async {
+  Future<LockListInfoEntity> getStarLockInfo(
-    final LockListInfoEntity entity = await ApiRepository.to.getStarLockListInfo(
+      {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<LoginEntity> 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<LockDetailLogic>()) {
         //设置控制器数据并刷新
         // AppLog.log('检测控制器是否存 调用了 setLockListInfoGroupEntity');
-        Get.find<LockDetailLogic>().loadData(lockListInfoItemEntity: entity.groupList![0].lockList![0], isOnlyOneData: true);
+        Get.find<LockDetailLogic>().loadData(
+            lockListInfoItemEntity: entity.groupList![0].lockList![0],
+            isOnlyOneData: true);
       } else {
         //延迟加载
         Future<dynamic>.delayed(200.milliseconds, () {
           if (Get.isRegistered<LockDetailLogic>()) {
             //设置控制器数据并刷新
             // AppLog.log('检测控制器是否存 延迟调用了 setLockListInfoGroupEntity');
-            Get.find<LockDetailLogic>().loadData(lockListInfoItemEntity: entity.groupList![0].lockList![0], isOnlyOneData: true);
+            Get.find<LockDetailLogic>().loadData(
+                lockListInfoItemEntity: entity.groupList![0].lockList![0],
+                isOnlyOneData: true);
           }
         });
       }
@@ -301,7 +306,6 @@ class LockMainLogic extends BaseGetXController {
     // 初始化JPush服务并绑定设备ID
     final XSJPushProvider jpushProvider = XSJPushProvider();
     await jpushProvider.initJPushService();
-    await jpushProvider.bindDeviceID();
     await jpushProvider.initLocalNotification(isCancelLocalPush: false);
 
     // 开启UDP

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);
   }
 

lib/tools/push/xs_jPhush.dart

@@ -49,39 +49,33 @@ class XSJPushProvider {
   //极光推送事件处理方法
   void addJPushEventHandler() {
     jpush.addEventHandler(
-        onReceiveNotification: (Map<String, dynamic> message) async {
+      onReceiveNotification: (Map<String, dynamic> message) async {
-      AppLog.log('onReceiveNotification: $message');
+        AppLog.log('onReceiveNotification: $message');
-    }, onOpenNotification: (Map<String, dynamic> message) async {
+      },
-      AppLog.log('onOpenNotification: $message');
+      onOpenNotification: (Map<String, dynamic> message) async {
-    }, onReceiveMessage: (Map<String, dynamic> message) async {
+        AppLog.log('onOpenNotification: $message');
-      AppLog.log('onReceiveMessage: $message');
+      },
-      //这里接收自定义消息
+      onReceiveMessage: (Map<String, dynamic> message) async {
-      MessageManagement.shunting(message);
+        AppLog.log('onReceiveMessage: $message');
-    }, onReceiveNotificationAuthorization:
+        //这里接收自定义消息
-            (Map<String, dynamic> message) async {
+        MessageManagement.shunting(message);
-      AppLog.log('onReceiveNotificationAuthorization: $message');
+      },
-    }, onInAppMessageShow: (Map<String, dynamic> message) async {
+      onReceiveNotificationAuthorization: (Map<String, dynamic> message) async {
-      AppLog.log('onInAppMessageShow: $message');
+        AppLog.log('onReceiveNotificationAuthorization: $message');
-    });
+      },
-  }
+      onInAppMessageShow: (Map<String, dynamic> message) async {
+        AppLog.log('onInAppMessageShow: $message');
+      },
+      onConnected: (Map<String, dynamic> 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
+        return Future.value();
-  Future<void> 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');
-    }
   }
 
   Future<void> pushBindDeviceID(String deviceID, int deviceType) async {