sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 停用友盟，格式化部分代码

Browse Source
This commit is contained in:
liyi 2025-10-09 11:38:47 +08:00
parent ddb71668c4
commit 10c9b896aa
8 changed files with 80 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/apm/umeng/umeng_helper.dart
View File

@ -1,5 +1,5 @@
//<cn> //<cn>
import 'package:umeng_common_sdk/umeng_common_sdk.dart'; // import 'package:umeng_common_sdk/umeng_common_sdk.dart';
import '../../flavors.dart'; import '../../flavors.dart';
class UmengHelper { class UmengHelper {
@ -15,27 +15,24 @@ class UmengHelper {
return _instance!; return _instance!;
} }
Future<void> initApp() async { Future<void> initApp() async {}
}
Future<void> initSdk() async { Future<void> initSdk() async {
UmengCommonSdk.initCommon( // UmengCommonSdk.initCommon(
F.umengKey.androidKey, F.umengKey.iosKey, F.umengKey.channel); // F.umengKey.androidKey, F.umengKey.iosKey, F.umengKey.channel);
UmengCommonSdk.setPageCollectionModeManual(); // UmengCommonSdk.setPageCollectionModeManual();
} }
Future<void> login(String userId) async { Future<void> login(String userId) async {
UmengCommonSdk.onProfileSignIn(userId); // UmengCommonSdk.onProfileSignIn(userId);
} }
Future<void> trackEvent( Future<void> trackEvent(String eventName, Map<String, Object> parameters) async {
String eventName, Map<String, Object> parameters) async { // UmengCommonSdk.onEvent(eventName, parameters);
UmengCommonSdk.onEvent(eventName, parameters);
} }
Future<void> logout() async { Future<void> logout() async {
UmengCommonSdk.onProfileSignOff(); // UmengCommonSdk.onProfileSignOff();
} }
} }
//</cn> //</cn>

1
lib/main/lockDetail/face/faceList/faceList_logic.dart
View File

@ -316,6 +316,7 @@ class FaceListLogic extends BaseGetXController {
{required bool isRefresh}) async { {required bool isRefresh}) async {
if (isRefresh) { if (isRefresh) {
state.faceItemListData.clear(); state.faceItemListData.clear();
state.faceItemListData.refresh();
pageNo = 1; pageNo = 1;
} }
final FingerprintListDataEntity entity = final FingerprintListDataEntity entity =

64
lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart
View File

@ -25,11 +25,9 @@ class FingerprintListLogic extends BaseGetXController {
late StreamSubscription<Reply> _replySubscription; late StreamSubscription<Reply> _replySubscription;
void _initReplySubscription() { void _initReplySubscription() {
_replySubscription = _replySubscription = EventBusManager().eventBus!.on<Reply>().listen((Reply reply) {
EventBusManager().eventBus!.on<Reply>().listen((Reply reply) {
// 添加指纹开始(此处用作删除指纹) // 添加指纹开始(此处用作删除指纹)
if ((reply is SenderAddFingerprintWithTimeCycleCoercionReply) && if ((reply is SenderAddFingerprintWithTimeCycleCoercionReply) && (state.ifCurrentScreen.value == true)) {
(state.ifCurrentScreen.value == true)) {
_replyAddFingerprintBegin(reply); _replyAddFingerprintBegin(reply);
} }
@ -57,13 +55,10 @@ class FingerprintListLogic extends BaseGetXController {
break; break;
case 0x06: case 0x06:
//无权限 //无权限
final List<String>? privateKey = final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
await Storage.getStringList(saveBluePrivateKey); final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
final List<int> getPrivateKeyList =
changeStringListToIntList(privateKey!);
final List<String>? signKey = final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
await Storage.getStringList(saveBlueSignKey);
final List<int> signKeyDataList = changeStringListToIntList(signKey!); final List<int> signKeyDataList = changeStringListToIntList(signKey!);
final List<int> token = reply.data.sublist(5, 9); final List<int> token = reply.data.sublist(5, 9);
@ -257,20 +252,16 @@ class FingerprintListLogic extends BaseGetXController {
showBlueConnetctToastTimer(action: () { showBlueConnetctToastTimer(action: () {
dismissEasyLoading(); dismissEasyLoading();
}); });
BlueManage().blueSendData(BlueManage().connectDeviceName, BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState deviceConnectionState) async {
(BluetoothConnectionState deviceConnectionState) async {
if (deviceConnectionState == BluetoothConnectionState.connected) { if (deviceConnectionState == BluetoothConnectionState.connected) {
// var publicKey = await Storage.getStringList(saveBluePublicKey); // var publicKey = await Storage.getStringList(saveBluePublicKey);
// List<int> publicKeyDataList = changeStringListToIntList(publicKey!); // List<int> publicKeyDataList = changeStringListToIntList(publicKey!);
final List<String>? signKey = final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
await Storage.getStringList(saveBlueSignKey);
final List<int> signKeyDataList = changeStringListToIntList(signKey!); final List<int> signKeyDataList = changeStringListToIntList(signKey!);
final List<String>? privateKey = final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
await Storage.getStringList(saveBluePrivateKey); final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
final List<int> getPrivateKeyList =
changeStringListToIntList(privateKey!);
final List<String>? token = await Storage.getStringList(saveBlueToken); final List<String>? token = await Storage.getStringList(saveBlueToken);
final List<int> getTokenList = changeStringListToIntList(token!); final List<int> getTokenList = changeStringListToIntList(token!);
@ -298,8 +289,7 @@ class FingerprintListLogic extends BaseGetXController {
privateKey: getPrivateKeyList, privateKey: getPrivateKeyList,
token: getTokenList, token: getTokenList,
isBeforeAddUser: false); isBeforeAddUser: false);
} else if (deviceConnectionState == } else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
BluetoothConnectionState.disconnected) {
dismissEasyLoading(); dismissEasyLoading();
cancelBlueConnetctToastTimer(); cancelBlueConnetctToastTimer();
if (state.ifCurrentScreen.value == true) { if (state.ifCurrentScreen.value == true) {
@ -337,15 +327,15 @@ class FingerprintListLogic extends BaseGetXController {
*/ */
// 获取指纹列表 // 获取指纹列表
Future<FingerprintListDataEntity> getFingerprintsListData( Future<FingerprintListDataEntity> getFingerprintsListData({required bool isRefresh}) async {
{required bool isRefresh}) async {
// 如果是下拉刷新，清空已有数据 // 如果是下拉刷新，清空已有数据
// if (isRefresh) { if (isRefresh) {
state.fingerprintItemListData.clear();
pageNo = 1; pageNo = 1;
state.fingerprintItemListData.clear();
state.fingerprintItemListData.refresh();
}
final FingerprintListDataEntity entity = final FingerprintListDataEntity entity = await ApiRepository.to.getFingerprintsListData(
await ApiRepository.to.getFingerprintsListData(
lockId: state.lockId.value.toString(), lockId: state.lockId.value.toString(),
pageNo: pageNo.toString(), pageNo: pageNo.toString(),
pageSize: pageSize.toString(), pageSize: pageSize.toString(),
@ -381,10 +371,7 @@ class FingerprintListLogic extends BaseGetXController {
type = '0'; type = '0';
} }
final LoginEntity entity = await ApiRepository.to.deletFingerprintsData( final LoginEntity entity = await ApiRepository.to.deletFingerprintsData(
fingerprintId: fingerprintId, fingerprintId: fingerprintId, lockId: state.lockId.value.toString(), type: type, deleteType: '1');
lockId: state.lockId.value.toString(),
type: type,
deleteType: '1');
if (entity.errorCode!.codeIsSuccessful) { if (entity.errorCode!.codeIsSuccessful) {
if (state.isDeletAll == false) { if (state.isDeletAll == false) {
showToast('删除成功'.tr, something: () { showToast('删除成功'.tr, something: () {
@ -402,9 +389,7 @@ class FingerprintListLogic extends BaseGetXController {
late StreamSubscription _teamEvent; late StreamSubscription _teamEvent;
void _initRefreshAction() { void _initRefreshAction() {
_teamEvent = eventBus _teamEvent = eventBus.on<OtherTypeRefreshListEvent>().listen((OtherTypeRefreshListEvent event) async {
.on<OtherTypeRefreshListEvent>()
.listen((OtherTypeRefreshListEvent event) async {
// 立即刷新数据 // 立即刷新数据
await getFingerprintsListData(isRefresh: true); await getFingerprintsListData(isRefresh: true);
}); });
@ -415,8 +400,7 @@ class FingerprintListLogic extends BaseGetXController {
String keyTypeStr = ''; // String keyTypeStr = ''; //
// (fingerprintItemData.fingerprintType! != 1) ? (fingerprintItemData.endDate! < DateTime.now().millisecondsSinceEpoch ? "已失效" : "") : "" // (fingerprintItemData.fingerprintType! != 1) ? (fingerprintItemData.endDate! < DateTime.now().millisecondsSinceEpoch ? "已失效" : "") : ""
if (fingerprintItemData.fingerprintStatus == 1) { if (fingerprintItemData.fingerprintStatus == 1) {
if (fingerprintItemData.startDate! > if (fingerprintItemData.startDate! > DateTime.now().millisecondsSinceEpoch) {
DateTime.now().millisecondsSinceEpoch) {
keyTypeStr = '未生效'.tr; keyTypeStr = '未生效'.tr;
} }
} else if (fingerprintItemData.fingerprintStatus == 2) { } else if (fingerprintItemData.fingerprintStatus == 2) {
@ -428,8 +412,7 @@ class FingerprintListLogic extends BaseGetXController {
String getKeyDateType(FingerprintItemData fingerprintItemData) { String getKeyDateType(FingerprintItemData fingerprintItemData) {
String keyDateTypeStr = ''; // 永久:1;限时2，单次3，循环:4 String keyDateTypeStr = ''; // 永久:1;限时2，单次3，循环:4
if (fingerprintItemData.fingerprintType! == 1) { if (fingerprintItemData.fingerprintType! == 1) {
keyDateTypeStr = keyDateTypeStr = "${DateTool().dateToYMDHNString(fingerprintItemData.createDate.toString())} ${"永久".tr}";
"${DateTool().dateToYMDHNString(fingerprintItemData.createDate.toString())} ${"永久".tr}";
} else if (fingerprintItemData.fingerprintType! == 2) { } else if (fingerprintItemData.fingerprintType! == 2) {
keyDateTypeStr = keyDateTypeStr =
'${DateTool().dateToYMDHNString(fingerprintItemData.startDate.toString())} - ${DateTool().dateToYMDHNString(fingerprintItemData.endDate.toString())} ${'限时'.tr}'; '${DateTool().dateToYMDHNString(fingerprintItemData.startDate.toString())} - ${DateTool().dateToYMDHNString(fingerprintItemData.endDate.toString())} ${'限时'.tr}';
@ -442,11 +425,10 @@ class FingerprintListLogic extends BaseGetXController {
//刷新单条信息 //刷新单条信息
Future<void> refreshIndividualKeys({required int fingerprintId}) async { Future<void> refreshIndividualKeys({required int fingerprintId}) async {
final FingerprintEntity entity = final FingerprintEntity entity = await ApiRepository.to.getFingerprintsData(fingerprintId);
await ApiRepository.to.getFingerprintsData(fingerprintId);
if (entity.errorCode!.codeIsSuccessful) { if (entity.errorCode!.codeIsSuccessful) {
final int index = state.fingerprintItemListData.indexWhere( final int index =
(FingerprintItemData item) => item.fingerprintId == fingerprintId); state.fingerprintItemListData.indexWhere((FingerprintItemData item) => item.fingerprintId == fingerprintId);
state.fingerprintItemListData.removeAt(index); state.fingerprintItemListData.removeAt(index);
state.fingerprintItemListData.insert(index, entity.data!); state.fingerprintItemListData.insert(index, entity.data!);
} }

55
lib/main/lockDetail/lockSet/lockTime/lockTime_logic.dart
View File

@ -26,8 +26,7 @@ class LockTimeLogic extends BaseGetXController {
late StreamSubscription<Reply> _replySubscription; late StreamSubscription<Reply> _replySubscription;
void _initReplySubscription() { void _initReplySubscription() {
_replySubscription = _replySubscription = EventBusManager().eventBus!.on<Reply>().listen((Reply reply) {
EventBusManager().eventBus!.on<Reply>().listen((Reply reply) {
if (reply is TimingReply) { if (reply is TimingReply) {
_replyTiming(reply); _replyTiming(reply);
} }
@ -50,10 +49,8 @@ class LockTimeLogic extends BaseGetXController {
// 有效时间 // 有效时间
final List<int> indate = reply.data.sublist(150, 154); final List<int> indate = reply.data.sublist(150, 154);
int indateValue = (0xff & indate[0]) << 24 | int indateValue =
(0xff & indate[1]) << 16 | (0xff & indate[0]) << 24 | (0xff & indate[1]) << 16 | (0xff & indate[2]) << 8 | (0xFF & indate[3]);
(0xff & indate[2]) << 8 |
(0xFF & indate[3]);
// 检查时间戳是否无效或超出范围 // 检查时间戳是否无效或超出范围
if (indateValue == 0xffffffff || indateValue <= 0) { if (indateValue == 0xffffffff || indateValue <= 0) {
// 使用当前系统时间戳（秒） // 使用当前系统时间戳（秒）
@ -62,23 +59,19 @@ class LockTimeLogic extends BaseGetXController {
} }
// 验证时间戳是否在合理范围内（例如：2000年到2100年之间） // 验证时间戳是否在合理范围内（例如：2000年到2100年之间）
final DateTime dateTime = final DateTime dateTime = DateTime.fromMillisecondsSinceEpoch(indateValue * 1000);
DateTime.fromMillisecondsSinceEpoch(indateValue * 1000);
if (dateTime.year < 2000 || dateTime.year > 2100) { if (dateTime.year < 2000 || dateTime.year > 2100) {
AppLog.log('时间戳超出合理范围: $indateValue'); AppLog.log('时间戳超出合理范围: $indateValue');
indateValue = DateTime.now().millisecondsSinceEpoch ~/ 1000; indateValue = DateTime.now().millisecondsSinceEpoch ~/ 1000;
} }
AppLog.log( AppLog.log('====================indate:$indate indateValue:$indateValue');
'====================indate:$indate indateValue:$indateValue');
state.dateTime.value = DateTool().dateToYMDHNString('$indateValue'); state.dateTime.value = DateTool().dateToYMDHNString('$indateValue');
break; break;
case 0x06: case 0x06:
//需要鉴权 //需要鉴权
final List<String>? privateKey = final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
await Storage.getStringList(saveBluePrivateKey); final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
final List<int> getPrivateKeyList =
changeStringListToIntList(privateKey!);
IoSenderManage.senderGetStarLockStatuInfo( IoSenderManage.senderGetStarLockStatuInfo(
lockID: BlueManage().connectDeviceName, lockID: BlueManage().connectDeviceName,
@ -101,8 +94,7 @@ class LockTimeLogic extends BaseGetXController {
switch (status) { switch (status) {
case 0x00: case 0x00:
//成功 //成功
final String dataEime = final String dataEime = DateTool().dateToYMDHNString('${state.serverTime}');
DateTool().dateToYMDHNString('${state.serverTime}');
state.dateTime.value = dataEime; state.dateTime.value = dataEime;
@ -149,19 +141,15 @@ class LockTimeLogic extends BaseGetXController {
dismissEasyLoading(); dismissEasyLoading();
state.sureBtnState.value = 0; state.sureBtnState.value = 0;
}); });
BlueManage().blueSendData(BlueManage().connectDeviceName, BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
(BluetoothConnectionState connectionState) async {
if (connectionState == BluetoothConnectionState.connected) { if (connectionState == BluetoothConnectionState.connected) {
final List<String>? privateKey = final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
await Storage.getStringList(saveBluePrivateKey); final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
final List<int> getPrivateKeyList =
changeStringListToIntList(privateKey!);
final List<String>? token = await Storage.getStringList(saveBlueToken); final List<String>? token = await Storage.getStringList(saveBlueToken);
final List<int> getTokenList = changeStringListToIntList(token!); final List<int> getTokenList = changeStringListToIntList(token!);
final List<String>? signKey = final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
await Storage.getStringList(saveBlueSignKey);
final List<int> getSignKeyList = changeStringListToIntList(signKey!); final List<int> getSignKeyList = changeStringListToIntList(signKey!);
IoSenderManage.senderTimingCommand( IoSenderManage.senderTimingCommand(
@ -190,13 +178,10 @@ class LockTimeLogic extends BaseGetXController {
showBlueConnetctToastTimer(action: () { showBlueConnetctToastTimer(action: () {
dismissEasyLoading(); dismissEasyLoading();
}); });
BlueManage().blueSendData(BlueManage().connectDeviceName, BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState deviceConnectionState) async {
(BluetoothConnectionState deviceConnectionState) async {
if (deviceConnectionState == BluetoothConnectionState.connected) { if (deviceConnectionState == BluetoothConnectionState.connected) {
final List<String>? privateKey = final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
await Storage.getStringList(saveBluePrivateKey); final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
final List<int> getPrivateKeyList =
changeStringListToIntList(privateKey!);
IoSenderManage.senderGetStarLockStatuInfo( IoSenderManage.senderGetStarLockStatuInfo(
lockID: BlueManage().connectDeviceName, lockID: BlueManage().connectDeviceName,
@ -206,8 +191,7 @@ class LockTimeLogic extends BaseGetXController {
isBeforeAddUser: false, isBeforeAddUser: false,
privateKey: getPrivateKeyList, privateKey: getPrivateKeyList,
); );
} else if (deviceConnectionState == } else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
BluetoothConnectionState.disconnected) {
dismissEasyLoading(); dismissEasyLoading();
cancelBlueConnetctToastTimer(); cancelBlueConnetctToastTimer();
// if (state.ifCurrentScreen.value == true) { // if (state.ifCurrentScreen.value == true) {
@ -219,8 +203,7 @@ class LockTimeLogic extends BaseGetXController {
// 从网关获取时间 // 从网关获取时间
Future<void> getLockTimeFromGateway() async { Future<void> getLockTimeFromGateway() async {
final GetServerDatetimeEntity entity = final GetServerDatetimeEntity entity = await ApiRepository.to.getLockTimeFromGateway(
await ApiRepository.to.getLockTimeFromGateway(
lockId: state.lockSetInfoData.value.lockId.toString(), lockId: state.lockSetInfoData.value.lockId.toString(),
); );
if (entity.errorCode!.codeIsSuccessful) {} if (entity.errorCode!.codeIsSuccessful) {}
@ -228,10 +211,10 @@ class LockTimeLogic extends BaseGetXController {
// 从服务器获取锁的时间 开锁时传入 // 从服务器获取锁的时间 开锁时传入
Future<void> getServerDatetime(bool isSendTime) async { Future<void> getServerDatetime(bool isSendTime) async {
final GetServerDatetimeEntity entity = final GetServerDatetimeEntity entity = await ApiRepository.to.getServerDatetimeData(isUnShowLoading: false);
await ApiRepository.to.getServerDatetimeData(isUnShowLoading: false);
if (entity.errorCode!.codeIsSuccessful) { if (entity.errorCode!.codeIsSuccessful) {
state.serverTime = entity.data!.date! ~/ 1000; state.serverTime = entity.data!.date! ~/ 1000;
AppLog.log('msg:${state.serverTime}');
// AppLog.log("entity.data!.date! ~/ 1000:${entity.data!.date! ~/ 1000} DateTime.now().millisecondsSinceEpoch ~/ 1000:${DateTime.now().millisecondsSinceEpoch ~/ 1000} 服务器时间差:${state.differentialTime}"); // AppLog.log("entity.data!.date! ~/ 1000:${entity.data!.date! ~/ 1000} DateTime.now().millisecondsSinceEpoch ~/ 1000:${DateTime.now().millisecondsSinceEpoch ~/ 1000} 服务器时间差:${state.differentialTime}");
if (isSendTime == false) { if (isSendTime == false) {
getStarLockStatus(); getStarLockStatus();

2
lib/main/lockDetail/lockSet/speechLanguageSettings/speech_language_settings_logic.dart
View File

@ -257,7 +257,7 @@ class SpeechLanguageSettingsLogic extends BaseGetXController {
} }
break; break;
default: default:
showToast('获取设备型号失败'.tr); // showToast('获取设备型号失败'.tr);
break; break;
} }
} }

12
lib/main/lockDetail/lockSet/uploadData/uploadData_logic.dart
View File

@ -79,7 +79,7 @@ class UploadDataLogic extends BaseGetXController {
final int dataLength = reply.data[8]; final int dataLength = reply.data[8];
state.uploadPasswordDataList.addAll(reply.data.sublist(9, reply.data.length)); state.uploadPasswordDataList.addAll(reply.data.sublist(9, reply.data.length));
if (dataLength == 10) { if (dataLength == 10 || dataLength == 9) {
// 当数据是10的时候继续请求 // 当数据是10的时候继续请求
state.uploadPasswordPage = state.uploadPasswordPage + 1; state.uploadPasswordPage = state.uploadPasswordPage + 1;
@ -128,7 +128,7 @@ class UploadDataLogic extends BaseGetXController {
final int dataLength = reply.data[8]; final int dataLength = reply.data[8];
state.uploadCardDataList.addAll(reply.data.sublist(9, reply.data.length)); state.uploadCardDataList.addAll(reply.data.sublist(9, reply.data.length));
if (dataLength == 10) { if (dataLength == 10 || dataLength == 9) {
// 当数据是10的时候继续请求 // 当数据是10的时候继续请求
state.uploadCardPage = state.uploadCardPage + 1; state.uploadCardPage = state.uploadCardPage + 1;
@ -175,7 +175,7 @@ class UploadDataLogic extends BaseGetXController {
final int dataLength = reply.data[8]; final int dataLength = reply.data[8];
state.uploadFingerprintDataList.addAll(reply.data.sublist(9, reply.data.length)); state.uploadFingerprintDataList.addAll(reply.data.sublist(9, reply.data.length));
if (dataLength == 10) { if (dataLength == 10 || dataLength == 9) {
// 当数据是10的时候继续请求 // 当数据是10的时候继续请求
state.uploadFingerprintPage = state.uploadFingerprintPage + 1; state.uploadFingerprintPage = state.uploadFingerprintPage + 1;
@ -222,7 +222,7 @@ class UploadDataLogic extends BaseGetXController {
final int dataLength = reply.data[8]; final int dataLength = reply.data[8];
state.uploadFaceDataList.addAll(reply.data.sublist(9, reply.data.length)); state.uploadFaceDataList.addAll(reply.data.sublist(9, reply.data.length));
if (dataLength == 10) { if (dataLength == 10 || dataLength == 9) {
// 当数据是10的时候继续请求 // 当数据是10的时候继续请求
state.uploadFacePage = state.uploadFacePage + 1; state.uploadFacePage = state.uploadFacePage + 1;
@ -269,7 +269,7 @@ class UploadDataLogic extends BaseGetXController {
final int dataLength = reply.data[8]; final int dataLength = reply.data[8];
state.uploadPalmVeinDataList.addAll(reply.data.sublist(9, reply.data.length)); state.uploadPalmVeinDataList.addAll(reply.data.sublist(9, reply.data.length));
if (dataLength == 10) { if (dataLength == 10 || dataLength == 9) {
// 当数据是10的时候继续请求 // 当数据是10的时候继续请求
state.uploadPalmVeinPage = state.uploadPalmVeinPage + 1; state.uploadPalmVeinPage = state.uploadPalmVeinPage + 1;
@ -316,7 +316,7 @@ class UploadDataLogic extends BaseGetXController {
final int dataLength = reply.data[8]; final int dataLength = reply.data[8];
state.uploadRemoteControlDataList.addAll(reply.data.sublist(9, reply.data.length)); state.uploadRemoteControlDataList.addAll(reply.data.sublist(9, reply.data.length));
if (dataLength == 10) { if (dataLength == 10 || dataLength == 9) {
// 当数据是10的时候继续请求 // 当数据是10的时候继续请求
state.uploadRemoteControlPage = state.uploadRemoteControlPage + 1; state.uploadRemoteControlPage = state.uploadRemoteControlPage + 1;

22
lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_logic.dart
View File

@ -43,10 +43,26 @@ class GatewayConfigurationWifiLogic extends BaseGetXController {
Future<void> getGatewayConfiguration() async { Future<void> getGatewayConfiguration() async {
final GetGatewayConfigurationEntity entity = final GetGatewayConfigurationEntity entity =
await ApiRepository.to.getGatewayConfiguration(timeout: 60); await ApiRepository.to.getGatewayConfiguration(timeout: 60);
if (entity.errorCode!.codeIsSuccessful) { if (entity.errorCode!.codeIsSuccessful) {
state.getGatewayConfigurationStr = entity.data ?? ''; String configStr = entity.data ?? '';
// AppLog.log('state.getGatewayConfigurationStr:${state.getGatewayConfigurationStr}');
// 解析并添加时区偏移量
if (configStr.isNotEmpty) {
try {
Map<String, dynamic> config = jsonDecode(configStr);
config['timeZoneOffset'] = DateTime.now().timeZoneOffset.inSeconds;
state.getGatewayConfigurationStr = jsonEncode(config);
} catch (e) {
AppLog.log('处理网关配置时区信息失败: $e');
// 如果解析失败，仍然使用原始配置
state.getGatewayConfigurationStr = configStr;
}
} else {
state.getGatewayConfigurationStr = configStr;
}
AppLog.log('state.getGatewayConfigurationStr:${state.getGatewayConfigurationStr}');
} }
} }

4
lib/talk/starChart/views/guide/permission_guidance_page.dart
View File

@ -18,7 +18,7 @@ class _PermissionGuidancePageState extends State<PermissionGuidancePage> {
final List<Map<String, String>> _stepsData = [ final List<Map<String, String>> _stepsData = [
{ {
'image': 'images/guide/1.png', 'image': 'images/guide/matter.png',
'text': '步骤1：打开应用信息，点击通知管理选项', 'text': '步骤1：打开应用信息，点击通知管理选项',
}, },
{ {
@ -26,7 +26,7 @@ class _PermissionGuidancePageState extends State<PermissionGuidancePage> {
'text': '步骤2：下滑点击呼叫提醒的通知选项', 'text': '步骤2：下滑点击呼叫提醒的通知选项',
}, },
{ {
'image': 'images/guide/3.png', 'image': 'images/guide/tuya.png',
'text': '步骤3：选择在锁定屏幕上的选项设置', 'text': '步骤3：选择在锁定屏幕上的选项设置',
}, },
{ {