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({ @@ -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 channel2Token = { 'channel': channelTypeMapping[data['platform']], 'channelToken': data['token']