From 057eef285f8a6b01a73dd88d983e64f0565f00b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CDaisyWu=E2=80=9D?= <“18682150237@163.com”>
Date: Wed, 12 Feb 2025 09:19:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E8=AE=BE=E5=A4=87=E9=80=BB=E8=BE=91=EF=BC=9A?=
 =?UTF-8?q?=E4=B8=8E=E5=90=8E=E5=8F=B0=E7=BA=A6=E5=AE=9A=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?Device=E6=95=B0=E7=BB=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/main/lockMian/lockMain/lockMain_logic.dart               | 5 ++++-
 lib/main/lockMian/lockMain/xhj/lockMain_xhj_logic.dart       | 4 +++-
 .../minePersonInfoPage/minePersonInfo_entity.dart            | 4 ++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/main/lockMian/lockMain/lockMain_logic.dart b/lib/main/lockMian/lockMain/lockMain_logic.dart
index b283a6f0..f092e8fd 100755
--- a/lib/main/lockMian/lockMain/lockMain_logic.dart
+++ b/lib/main/lockMian/lockMain/lockMain_logic.dart
@@ -70,11 +70,14 @@ class LockMainLogic extends BaseGetXController {
       }
 
       Storage.setBool(saveIsVip, entity.data!.isVip == 1);
+      //当 deviceId 为空或 deviceIds 列表中不包含 deviceId 时，都会再次绑定设备
       if (entity.data!.deviceId != null) {
-        if (entity.data!.deviceId!.isEmpty) {
+        if (entity.data!.deviceId!.isEmpty ||
+            !entity.data!.deviceIds!.contains(entity.data!.deviceId)) {
           bindPushDevice();
         }
       }
+
       if (entity.data!.starchart != null) {
         if (entity.data!.starchart!.starchartId == null) {
           bindStarChart();
diff --git a/lib/main/lockMian/lockMain/xhj/lockMain_xhj_logic.dart b/lib/main/lockMian/lockMain/xhj/lockMain_xhj_logic.dart
index e541f82a..df3d5fcb 100755
--- a/lib/main/lockMian/lockMain/xhj/lockMain_xhj_logic.dart
+++ b/lib/main/lockMian/lockMain/xhj/lockMain_xhj_logic.dart
@@ -47,8 +47,10 @@ class LockMainXHJLogic extends BaseGetXController {
       }
 
       Storage.setBool(saveIsVip, entity.data!.isVip == 1);
+      //当 deviceId 为空或 deviceIds 列表中不包含 deviceId 时，都会再次绑定设备
       if (entity.data!.deviceId != null) {
-        if (entity.data!.deviceId!.isEmpty) {
+        if (entity.data!.deviceId!.isEmpty ||
+            !entity.data!.deviceIds!.contains(entity.data!.deviceId)) {
           bindPushDevice();
         }
       }
diff --git a/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_entity.dart b/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_entity.dart
index 16b87225..b06e9a46 100755
--- a/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_entity.dart
+++ b/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_entity.dart
@@ -39,6 +39,7 @@ class MinePersonInfoData {
       this.countryName,
       this.isVip,
       this.deviceId,
+      this.deviceIds,
       this.lang,
       this.amazonAlexa,
       this.googleHome,
@@ -56,6 +57,7 @@ class MinePersonInfoData {
     countryName = json['countryName'];
     isVip = json['isVip'];
     deviceId = json['deviceId'];
+    deviceIds = json['deviceIds'];
     lang = json['lang'];
     amazonAlexa = json['amazonAlexa'] != null
         ? AmazonAlexa.fromJson(json['amazonAlexa'])
@@ -78,6 +80,7 @@ class MinePersonInfoData {
   String? countryName;
   int? isVip;
   String? deviceId;
+  List? deviceIds;
   String? lang;
   AmazonAlexa? amazonAlexa;
   GoogleHome? googleHome;
@@ -96,6 +99,7 @@ class MinePersonInfoData {
     data['countryName'] = countryName;
     data['isVip'] = isVip;
     data['deviceId'] = deviceId;
+    data['deviceIds'] = deviceIds;
     data['lang'] = lang;
     if (amazonAlexa != null) {
       data['amazonAlexa'] = amazonAlexa!.toJson();