From 5aa6958acc2bf58d9a542a460f305eb2e45bae52 Mon Sep 17 00:00:00 2001
From: Liuyf <lyf571321556@163.com>
Date: Tue, 25 Feb 2025 11:49:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E5=8E=82=E5=95=86?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=9C=89=E6=97=B6=E5=80=99=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=88=B0registrationId=E5=92=8Ctoken=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tools/push/xs_jPhush.dart | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/tools/push/xs_jPhush.dart b/lib/tools/push/xs_jPhush.dart
index 51ec7ebe..bb39b106 100755
--- a/lib/tools/push/xs_jPhush.dart
+++ b/lib/tools/push/xs_jPhush.dart
@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:flutter/foundation.dart';
+import 'package:get/get.dart';
 import 'package:jpush_flutter/jpush_flutter.dart';
 import 'package:star_lock/flavors.dart';
 import 'package:star_lock/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccount/mineUnbindPhoneOrEmail_entity.dart';
@@ -83,8 +84,9 @@ class XSJPushProvider {
         final int cmdCode = data['cmd'];
         switch (cmdCode) {
           case CMD_GET_REGISTRATION_ID:
-            if (!_jpushRegistrationIdCompleter.isCompleted &&
-                data['message'] != null) {
+            final bool isNullOrBlank =
+                GetUtils.isNullOrBlank(data['message']) ?? true;
+            if (!_jpushRegistrationIdCompleter.isCompleted && !isNullOrBlank) {
               await Storage.setString(pushDeviceID, data['message']);
               AppLog.log('flutter get registration id : ${data['message']}');
               _jpushRegistrationIdCompleter.complete(<String, dynamic>{
@@ -100,7 +102,9 @@ class XSJPushProvider {
             // }
             break;
           case CMD_GET_TOKEN:
-            if (!_vendorTokenCompleter.isCompleted && data['token'] != null) {
+            final bool isNullOrBlank =
+                GetUtils.isNullOrBlank(data['token']) ?? true;
+            if (!_vendorTokenCompleter.isCompleted && !isNullOrBlank) {
               final Map<String, dynamic> channel2Token = <String, dynamic>{
                 'channel': channelTypeMapping[data['platform']],
                 'channelToken': data['token']