1、修复添加遥控问题

2、修复上传数据显示超过总数的问题
3、添加版本号回归测试

lib/main/lockDetail/lockDetail/lockDetail_page.dart

@@ -1,14 +1,12 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:intl/intl.dart' as intl;
 import 'package:star_lock/app_settings/app_colors.dart';
 import 'package:star_lock/flavors.dart';
-import 'package:star_lock/main/lockDetail/lockDetail/lockDetail_list_page.dart';
 import 'package:star_lock/main/lockDetail/lockDetail/lockDetail_state.dart';
 import 'package:star_lock/main/lockMian/lockMain/lockMain_logic.dart';
 import 'package:star_lock/tools/aliyunRealNameAuth/aliyunRealNameAuthHandle.dart';
@@ -19,13 +17,10 @@ import 'package:star_lock/widget/flavors_img.dart';
 import '../../../appRouters.dart';
 import '../../../app_settings/app_settings.dart';
 import '../../../blue/blue_manage.dart';
-import '../../../blue/io_tool/io_tool.dart';
 import '../../../common/XSConstantMacro/XSConstantMacro.dart';
 import '../../../tools/appRouteObserver.dart';
-import '../../../tools/commonDataManage.dart';
 import '../../../tools/dateTool.dart';
 import '../../../tools/eventBusEventManage.dart';
-import '../../../tools/storage.dart';
 import '../../../translations/trans_lib.dart';
 import '../../lockMian/entity/lockListInfo_entity.dart';
 import 'lockDetail_logic.dart';

lib/main/lockDetail/lockSet/uploadData/uploadData_logic.dart

@@ -7,6 +7,7 @@ import 'package:star_lock/login/login/entity/LoginEntity.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 import 'package:star_lock/tools/commonDataManage.dart';
 
+import '../../../../app_settings/app_settings.dart';
 import '../../../../blue/blue_manage.dart';
 import '../../../../blue/io_protocol/io_updataLockCardList.dart';
 import '../../../../blue/io_protocol/io_updataLockFaceList.dart';
@@ -72,7 +73,6 @@ class UploadDataLogic extends BaseGetXController{
     switch(status){
       case 0x00:
       //成功
-        state.indexCount.value = state.indexCount.value + 1;
         cancelBlueConnetctToastTimer();
 
         final int dataLength = reply.data[8];
@@ -82,9 +82,10 @@ class UploadDataLogic extends BaseGetXController{
           state.uploadPasswordPage = state.uploadPasswordPage + 1;
 
           final List<int> token = reply.data.sublist(3, 7);
+          showEasyLoading();
           updataLockPasswordList(token, state.uploadPasswordPage);
         }else{
-          dismissEasyLoading();
+          // dismissEasyLoading();
 
           // 当数据不是10的时候解析数据上传
           // if(state.uploadPasswordDataList.isEmpty){
@@ -92,6 +93,7 @@ class UploadDataLogic extends BaseGetXController{
           //   getUpdataLockCardList();
           // }else{
           //   // 如果不是空的解析数据上传
+          state.indexCount.value = state.indexCount.value + 1;
             _lockDataUpload(uploadType:2, recordType:2, records:state.uploadPasswordDataList);
           // }
         }
@@ -105,6 +107,7 @@ class UploadDataLogic extends BaseGetXController{
         updataLockPasswordList(token, state.uploadPasswordPage);
         break;
       default:
+        AppLog.log('上传密码列表失败 关闭加载菊花');
         dismissEasyLoading();
         state.sureBtnState.value = 0;
         state.indexCount.value = 0;
@@ -118,9 +121,7 @@ class UploadDataLogic extends BaseGetXController{
     final int status = reply.data[2];
     switch(status){
       case 0x00:
-      //成功
+        //成功
-        state.indexCount.value = state.indexCount.value + 1;
-        dismissEasyLoading();
         cancelBlueConnetctToastTimer();
 
         final int dataLength = reply.data[8];
@@ -130,6 +131,8 @@ class UploadDataLogic extends BaseGetXController{
           state.uploadCardPage = state.uploadCardPage + 1;
 
           final List<int> token = reply.data.sublist(3, 7);
+
+          showEasyLoading();
           updataLockCardList(token, state.uploadCardPage);
         }else{
           // // 当数据不是10的时候解析数据上传
@@ -138,6 +141,7 @@ class UploadDataLogic extends BaseGetXController{
           //   getUpdataLockFingerprintList();
           // }else{
           //   // 如果不是空的解析数据上传
+          state.indexCount.value = state.indexCount.value + 1;
             _lockDataUpload(uploadType:2, recordType:3, records:state.uploadCardDataList);
           // }
         }
@@ -165,8 +169,6 @@ class UploadDataLogic extends BaseGetXController{
     switch(status){
       case 0x00:
       //成功
-        state.indexCount.value = state.indexCount.value + 1;
-        dismissEasyLoading();
         cancelBlueConnetctToastTimer();
 
         final int dataLength = reply.data[8];
@@ -176,6 +178,8 @@ class UploadDataLogic extends BaseGetXController{
           state.uploadFingerprintPage = state.uploadFingerprintPage + 1;
 
           final List<int> token = reply.data.sublist(3, 7);
+
+          showEasyLoading();
           updataLockFingerprintList(token, state.uploadFingerprintPage);
         }else{
           // // 当数据不是10的时候解析数据上传
@@ -184,6 +188,7 @@ class UploadDataLogic extends BaseGetXController{
           //   getUpdataLockFaceList();
           // }else{
           //   // 如果不是空的解析数据上传
+          state.indexCount.value = state.indexCount.value + 1;
             _lockDataUpload(uploadType:2, recordType:4, records:state.uploadFingerprintDataList);
           // }
         }
@@ -210,9 +215,7 @@ class UploadDataLogic extends BaseGetXController{
     final int status = reply.data[2];
     switch(status){
       case 0x00:
-      //成功
+        //成功
-        state.indexCount.value = state.indexCount.value + 1;
-        dismissEasyLoading();
         cancelBlueConnetctToastTimer();
 
         final int dataLength = reply.data[8];
@@ -222,6 +225,8 @@ class UploadDataLogic extends BaseGetXController{
           state.uploadFacePage = state.uploadFacePage + 1;
 
           final List<int> token = reply.data.sublist(3, 7);
+
+          showEasyLoading();
           updataLockFaceList(token, state.uploadFacePage);
         }else{
           // // 当数据不是10的时候解析数据上传
@@ -230,6 +235,7 @@ class UploadDataLogic extends BaseGetXController{
           //   getUpdataLockPalmVeinList();
           // }else{
             // 如果不是空的解析数据上传
+          state.indexCount.value = state.indexCount.value + 1;
             _lockDataUpload(uploadType:2, recordType:5, records:state.uploadFaceDataList);
           // }
         }
@@ -256,9 +262,7 @@ class UploadDataLogic extends BaseGetXController{
     final int status = reply.data[2];
     switch(status){
       case 0x00:
-      //成功
+        //成功
-        state.indexCount.value = state.indexCount.value + 1;
-        dismissEasyLoading();
         cancelBlueConnetctToastTimer();
 
         final int dataLength = reply.data[8];
@@ -268,6 +272,8 @@ class UploadDataLogic extends BaseGetXController{
           state.uploadPalmVeinPage = state.uploadPalmVeinPage + 1;
 
           final List<int> token = reply.data.sublist(3, 7);
+
+          showEasyLoading();
           updataLockPalmVeinList(token, state.uploadPalmVeinPage);
         }else{
           // // 当数据不是10的时候解析数据上传
@@ -276,6 +282,7 @@ class UploadDataLogic extends BaseGetXController{
           //   getUpdataLockSet();
           // }else{
           //   // 如果不是空的解析数据上传
+          state.indexCount.value = state.indexCount.value + 1;
             _lockDataUpload(uploadType:2, recordType:6, records:state.uploadPalmVeinDataList);
           // }
         }
@@ -302,9 +309,7 @@ class UploadDataLogic extends BaseGetXController{
     final int status = reply.data[2];
     switch(status){
       case 0x00:
-      //成功
+        //成功
-        state.indexCount.value = state.indexCount.value + 1;
-        dismissEasyLoading();
         cancelBlueConnetctToastTimer();
 
         final int dataLength = reply.data[8];
@@ -314,6 +319,8 @@ class UploadDataLogic extends BaseGetXController{
           state.uploadRemoteControlPage = state.uploadRemoteControlPage + 1;
 
           final List<int> token = reply.data.sublist(3, 7);
+
+          showEasyLoading();
           updataLockRemoteControlList(token, state.uploadRemoteControlPage);
         }else{
           // // 当数据不是10的时候解析数据上传
@@ -322,6 +329,7 @@ class UploadDataLogic extends BaseGetXController{
           //   getUpdataLockSet();
           // }else{
           //   // 如果不是空的解析数据上传
+          state.indexCount.value = state.indexCount.value + 1;
           _lockDataUpload(uploadType:2, recordType:7, records:state.uploadRemoteControlDataList);
           // }
         }
@@ -348,9 +356,8 @@ class UploadDataLogic extends BaseGetXController{
     final int status = reply.data[2];
     switch(status){
       case 0x00:
-      //成功
+        //成功
         state.indexCount.value = state.indexCount.value + 1;
-        dismissEasyLoading();
         cancelBlueConnetctToastTimer();
 
         state.uploadLockSetDataList.addAll(reply.data.sublist(7, reply.data.length));
@@ -383,6 +390,7 @@ class UploadDataLogic extends BaseGetXController{
     showEasyLoading();
     showBlueConnetctToastTimer(action: (){
       dismissEasyLoading();
+      AppLog.log('上传密码列表获取超时 关闭加载菊花');
       state.sureBtnState.value = 0;
     });
     BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
@@ -392,6 +400,7 @@ class UploadDataLogic extends BaseGetXController{
 
         updataLockPasswordList(getTokenList, state.uploadPasswordPage);
       } else if (connectionState == BluetoothConnectionState.disconnected) {
+        AppLog.log('上传密码列表连接失败 关闭加载菊花');
         dismissEasyLoading();
         cancelBlueConnetctToastTimer();
         state.sureBtnState.value = 0;
@@ -754,6 +763,7 @@ class UploadDataLogic extends BaseGetXController{
     }else{
       state.indexCount.value = 0;
       state.sureBtnState.value = 0;
+      dismissEasyLoading();
     }
   }
 

lib/tools/baseGetXController.dart

@@ -57,7 +57,9 @@ class BaseGetXController extends GetxController {
   void showEasyLoading() => EasyLoading.show();
 
   void dismissEasyLoading() {
-    if (EasyLoading.isShow) EasyLoading.dismiss();
+    if (EasyLoading.isShow) {
+      EasyLoading.dismiss();
+    }
   }
 
   void showTitleEasyLoading(String showContent) =>

pubspec.yaml

@@ -79,8 +79,9 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # 1.0.69+2024070302：xhj 线上环境，提交测试:周常 bug 修复
 # 1.0.70+2024072401：xhj 线上环境，提交测试:回归 bug
 # 1.0.70+2024072402：xhj 线上环境，提交测试:回归 bug
+# 1.0.71+2024072901：xhj 线上环境，提交测试:回归 bug
 
-version: 1.0.70+2024072402
+version: 1.0.71+2024072901
 
 environment:
   sdk: '>=2.12.0 <3.0.0'