From d6dba6e3dd02e7d78eb58d48f12810b4b9d0708f Mon Sep 17 00:00:00 2001 From: DaisyWu <18682150237@163.com> Date: Fri, 9 May 2025 13:39:05 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix:=20=E2=80=9C=E4=B8=8A=E4=BC=A0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=88=90=E5=8A=9F=E5=90=8E=EF=BC=8C=E6=8C=87=E7=BA=B9?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B2=A1=E6=98=BE=E7=A4=BA=E5=87=BA=E6=9D=A5?= =?UTF-8?q?=EF=BC=8C=E5=BF=85=E9=A1=BB=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E6=89=8D=E6=98=BE=E7=A4=BA=E2=80=9D=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fingerprintList_logic.dart | 5 +- .../lockSet/uploadData/uploadData_logic.dart | 292 +++++++++++------- 2 files changed, 180 insertions(+), 117 deletions(-) diff --git a/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart b/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart index d65269cd..f2a1a7d9 100755 --- a/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart +++ b/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart @@ -405,6 +405,7 @@ class FingerprintListLogic extends BaseGetXController { _teamEvent = eventBus .on() .listen((OtherTypeRefreshListEvent event) async { + // 立即刷新数据 await getFingerprintsListData(isRefresh: true); }); } @@ -459,8 +460,10 @@ class FingerprintListLogic extends BaseGetXController { final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { _initReplySubscription(); + _initRefreshAction(); - // _initRefreshAction(); + // 初始加载数据 + await getFingerprintsListData(isRefresh: true); } } diff --git a/lib/main/lockDetail/lockSet/uploadData/uploadData_logic.dart b/lib/main/lockDetail/lockSet/uploadData/uploadData_logic.dart index 3fea8596..b032bb97 100644 --- a/lib/main/lockDetail/lockSet/uploadData/uploadData_logic.dart +++ b/lib/main/lockDetail/lockSet/uploadData/uploadData_logic.dart @@ -1,4 +1,3 @@ - import 'dart:async'; import 'package:flutter_blue_plus/flutter_blue_plus.dart'; @@ -7,6 +6,8 @@ import 'package:star_lock/blue/io_protocol/io_updataLockRemoteControlList.dart'; import 'package:star_lock/login/login/entity/LoginEntity.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import 'package:star_lock/tools/commonDataManage.dart'; +import 'package:star_lock/tools/eventBusEventManage.dart'; +import 'package:star_lock/tools/storage.dart'; import '../../../../app_settings/app_settings.dart'; import '../../../../blue/blue_manage.dart'; @@ -21,48 +22,56 @@ import '../../../../blue/io_tool/io_tool.dart'; import '../../../../blue/io_tool/manager_event_bus.dart'; import '../../../../blue/sender_manage.dart'; import '../../../../network/api_repository.dart'; -import '../../../../tools/storage.dart'; import 'uploadData_state.dart'; -class UploadDataLogic extends BaseGetXController{ - UploadDataState state = UploadDataState(); +class UploadDataLogic extends BaseGetXController { + final UploadDataState state = UploadDataState(); // 监听蓝牙协议返回结果 late StreamSubscription _replySubscription; void _initReplySubscription() { - _replySubscription = EventBusManager().eventBus!.on().listen((Reply reply) async { + _replySubscription = + EventBusManager().eventBus!.on().listen((Reply reply) async { // 上传数据获取锁密码列表 - if (reply is UpdataLockPasswordListReply && (state.ifCurrentScreen.value == true)) { + if (reply is UpdataLockPasswordListReply && + (state.ifCurrentScreen.value == true)) { _replyUpdataLockPasswordListReply(reply); } // 上传数据获取锁卡列表 - if (reply is UpdataLockCardListReply && (state.ifCurrentScreen.value == true)) { + if (reply is UpdataLockCardListReply && + (state.ifCurrentScreen.value == true)) { _replyUpdataLockCardListReply(reply); } // 上传数据获取锁指纹列表 - if (reply is UpdataLockFingerprintListReply && (state.ifCurrentScreen.value == true)) { + if (reply is UpdataLockFingerprintListReply && + (state.ifCurrentScreen.value == true)) { _replyUpdataLockFingerprintListReply(reply); } // 上传数据获取锁人脸列表 - if (reply is UpdataLockFaceListReply && (state.ifCurrentScreen.value == true)) { + if (reply is UpdataLockFaceListReply && + (state.ifCurrentScreen.value == true)) { _replyUpdataLockFaceListReply(reply); } // 上传数据获取锁掌静脉列表 - if (reply is UpdataLockPalmVeinListReply && (state.ifCurrentScreen.value == true)) { + if (reply is UpdataLockPalmVeinListReply && + (state.ifCurrentScreen.value == true)) { _replyUpdataLockPalmVeinListReply(reply); } // 上传数据获取锁遥控 - if (reply is UpdataLockRemoteControlListReply && (state.ifCurrentScreen.value == true)) { + if (reply is UpdataLockRemoteControlListReply && + (state.ifCurrentScreen.value == true)) { _replyUpdataLockRemoteControlListReply(reply); } // 上传数据获取锁设置 - if (reply is UpdataLockSetReply && (state.ifCurrentScreen.value == true) && (state.ifSeletUpdataBtnState == true)) { + if (reply is UpdataLockSetReply && + (state.ifCurrentScreen.value == true) && + (state.ifSeletUpdataBtnState == true)) { _replyUpdataLockSetReply(reply); } }); @@ -71,21 +80,22 @@ class UploadDataLogic extends BaseGetXController{ // 上传数据获取锁密码列表 Future _replyUpdataLockPasswordListReply(Reply reply) async { final int status = reply.data[2]; - switch(status){ + switch (status) { case 0x00: - //成功 + //成功 cancelBlueConnetctToastTimer(); final int dataLength = reply.data[8]; - state.uploadPasswordDataList.addAll(reply.data.sublist(9, reply.data.length)); - if(dataLength == 10){ + state.uploadPasswordDataList + .addAll(reply.data.sublist(9, reply.data.length)); + if (dataLength == 10) { // 当数据是10的时候继续请求 state.uploadPasswordPage = state.uploadPasswordPage + 1; final List token = reply.data.sublist(3, 7); showEasyLoading(); updataLockPasswordList(token, state.uploadPasswordPage); - }else{ + } else { // dismissEasyLoading(); // 当数据不是10的时候解析数据上传 @@ -95,12 +105,15 @@ class UploadDataLogic extends BaseGetXController{ // }else{ // // 如果不是空的解析数据上传 state.indexCount.value = state.indexCount.value + 1; - _lockDataUpload(uploadType:2, recordType:2, records:state.uploadPasswordDataList); + _lockDataUpload( + uploadType: 2, + recordType: 2, + records: state.uploadPasswordDataList); // } } break; case 0x06: - //无权限 + //无权限 final List token = reply.data.sublist(3, 7); final List saveStrList = changeIntListToStringList(token); Storage.setStringList(saveBlueToken, saveStrList); @@ -120,14 +133,15 @@ class UploadDataLogic extends BaseGetXController{ // 上传数据获取锁卡列表 Future _replyUpdataLockCardListReply(Reply reply) async { final int status = reply.data[2]; - switch(status){ + switch (status) { case 0x00: //成功 cancelBlueConnetctToastTimer(); final int dataLength = reply.data[8]; - state.uploadCardDataList.addAll(reply.data.sublist(9, reply.data.length)); - if(dataLength == 10){ + state.uploadCardDataList + .addAll(reply.data.sublist(9, reply.data.length)); + if (dataLength == 10) { // 当数据是10的时候继续请求 state.uploadCardPage = state.uploadCardPage + 1; @@ -135,7 +149,7 @@ class UploadDataLogic extends BaseGetXController{ showEasyLoading(); updataLockCardList(token, state.uploadCardPage); - }else{ + } else { // // 当数据不是10的时候解析数据上传 // if(state.uploadCardDataList.isEmpty){ // // 如果是空的直接上传下一个 @@ -143,12 +157,13 @@ class UploadDataLogic extends BaseGetXController{ // }else{ // // 如果不是空的解析数据上传 state.indexCount.value = state.indexCount.value + 1; - _lockDataUpload(uploadType:2, recordType:3, records:state.uploadCardDataList); + _lockDataUpload( + uploadType: 2, recordType: 3, records: state.uploadCardDataList); // } } break; case 0x06: - //无权限 + //无权限 final List token = reply.data.sublist(3, 7); final List saveStrList = changeIntListToStringList(token); Storage.setStringList(saveBlueToken, saveStrList); @@ -167,14 +182,15 @@ class UploadDataLogic extends BaseGetXController{ // 上传数据获取锁指纹列表 Future _replyUpdataLockFingerprintListReply(Reply reply) async { final int status = reply.data[2]; - switch(status){ + switch (status) { case 0x00: - //成功 + //成功 cancelBlueConnetctToastTimer(); final int dataLength = reply.data[8]; - state.uploadFingerprintDataList.addAll(reply.data.sublist(9, reply.data.length)); - if(dataLength == 10){ + state.uploadFingerprintDataList + .addAll(reply.data.sublist(9, reply.data.length)); + if (dataLength == 10) { // 当数据是10的时候继续请求 state.uploadFingerprintPage = state.uploadFingerprintPage + 1; @@ -182,7 +198,7 @@ class UploadDataLogic extends BaseGetXController{ showEasyLoading(); updataLockFingerprintList(token, state.uploadFingerprintPage); - }else{ + } else { // // 当数据不是10的时候解析数据上传 // if(state.uploadFingerprintDataList.isEmpty){ // // 如果是空的直接上传下一个 @@ -190,12 +206,15 @@ class UploadDataLogic extends BaseGetXController{ // }else{ // // 如果不是空的解析数据上传 state.indexCount.value = state.indexCount.value + 1; - _lockDataUpload(uploadType:2, recordType:4, records:state.uploadFingerprintDataList); + _lockDataUpload( + uploadType: 2, + recordType: 4, + records: state.uploadFingerprintDataList); // } } break; case 0x06: - //无权限 + //无权限 final List token = reply.data.sublist(3, 7); final List saveStrList = changeIntListToStringList(token); Storage.setStringList(saveBlueToken, saveStrList); @@ -214,14 +233,15 @@ class UploadDataLogic extends BaseGetXController{ // 上传数据获取锁人脸列表解析 Future _replyUpdataLockFaceListReply(Reply reply) async { final int status = reply.data[2]; - switch(status){ + switch (status) { case 0x00: //成功 cancelBlueConnetctToastTimer(); final int dataLength = reply.data[8]; - state.uploadFaceDataList.addAll(reply.data.sublist(9, reply.data.length)); - if(dataLength == 10){ + state.uploadFaceDataList + .addAll(reply.data.sublist(9, reply.data.length)); + if (dataLength == 10) { // 当数据是10的时候继续请求 state.uploadFacePage = state.uploadFacePage + 1; @@ -229,20 +249,21 @@ class UploadDataLogic extends BaseGetXController{ showEasyLoading(); updataLockFaceList(token, state.uploadFacePage); - }else{ + } else { // // 当数据不是10的时候解析数据上传 // if(state.uploadFaceDataList.isEmpty){ // // 如果是空的直接上传下一个 // getUpdataLockPalmVeinList(); // }else{ - // 如果不是空的解析数据上传 + // 如果不是空的解析数据上传 state.indexCount.value = state.indexCount.value + 1; - _lockDataUpload(uploadType:2, recordType:5, records:state.uploadFaceDataList); + _lockDataUpload( + uploadType: 2, recordType: 5, records: state.uploadFaceDataList); // } } break; case 0x06: - //无权限 + //无权限 final List token = reply.data.sublist(3, 7); final List saveStrList = changeIntListToStringList(token); Storage.setStringList(saveBlueToken, saveStrList); @@ -261,14 +282,15 @@ class UploadDataLogic extends BaseGetXController{ // 上传数据获取锁掌静脉列表解析 Future _replyUpdataLockPalmVeinListReply(Reply reply) async { final int status = reply.data[2]; - switch(status){ + switch (status) { case 0x00: //成功 cancelBlueConnetctToastTimer(); final int dataLength = reply.data[8]; - state.uploadPalmVeinDataList.addAll(reply.data.sublist(9, reply.data.length)); - if(dataLength == 10){ + state.uploadPalmVeinDataList + .addAll(reply.data.sublist(9, reply.data.length)); + if (dataLength == 10) { // 当数据是10的时候继续请求 state.uploadPalmVeinPage = state.uploadPalmVeinPage + 1; @@ -276,7 +298,7 @@ class UploadDataLogic extends BaseGetXController{ showEasyLoading(); updataLockPalmVeinList(token, state.uploadPalmVeinPage); - }else{ + } else { // // 当数据不是10的时候解析数据上传 // if(state.uploadPalmVeinDataList.isEmpty){ // // 不需要上传 如果是空的直接上传下一个 @@ -284,12 +306,15 @@ class UploadDataLogic extends BaseGetXController{ // }else{ // // 如果不是空的解析数据上传 state.indexCount.value = state.indexCount.value + 1; - _lockDataUpload(uploadType:2, recordType:6, records:state.uploadPalmVeinDataList); + _lockDataUpload( + uploadType: 2, + recordType: 6, + records: state.uploadPalmVeinDataList); // } } break; case 0x06: - //无权限 + //无权限 final List token = reply.data.sublist(3, 7); final List saveStrList = changeIntListToStringList(token); Storage.setStringList(saveBlueToken, saveStrList); @@ -308,14 +333,15 @@ class UploadDataLogic extends BaseGetXController{ // 上传数据获取锁遥控列表解析 Future _replyUpdataLockRemoteControlListReply(Reply reply) async { final int status = reply.data[2]; - switch(status){ + switch (status) { case 0x00: //成功 cancelBlueConnetctToastTimer(); final int dataLength = reply.data[8]; - state.uploadRemoteControlDataList.addAll(reply.data.sublist(9, reply.data.length)); - if(dataLength == 10){ + state.uploadRemoteControlDataList + .addAll(reply.data.sublist(9, reply.data.length)); + if (dataLength == 10) { // 当数据是10的时候继续请求 state.uploadRemoteControlPage = state.uploadRemoteControlPage + 1; @@ -323,7 +349,7 @@ class UploadDataLogic extends BaseGetXController{ showEasyLoading(); updataLockRemoteControlList(token, state.uploadRemoteControlPage); - }else{ + } else { // // 当数据不是10的时候解析数据上传 // if(state.uploadPalmVeinDataList.isEmpty){ // // 不需要上传 如果是空的直接上传下一个 @@ -331,12 +357,15 @@ class UploadDataLogic extends BaseGetXController{ // }else{ // // 如果不是空的解析数据上传 state.indexCount.value = state.indexCount.value + 1; - _lockDataUpload(uploadType:2, recordType:7, records:state.uploadRemoteControlDataList); + _lockDataUpload( + uploadType: 2, + recordType: 7, + records: state.uploadRemoteControlDataList); // } } break; case 0x06: - //无权限 + //无权限 final List token = reply.data.sublist(3, 7); final List saveStrList = changeIntListToStringList(token); Storage.setStringList(saveBlueToken, saveStrList); @@ -355,17 +384,19 @@ class UploadDataLogic extends BaseGetXController{ // 上传数据获取锁设置解析 Future _replyUpdataLockSetReply(Reply reply) async { final int status = reply.data[2]; - switch(status){ + switch (status) { case 0x00: //成功 state.indexCount.value = state.indexCount.value + 1; cancelBlueConnetctToastTimer(); - state.uploadLockSetDataList.addAll(reply.data.sublist(7, reply.data.length)); - _lockDataUpload(uploadType:1, recordType:0, records:state.uploadLockSetDataList); + state.uploadLockSetDataList + .addAll(reply.data.sublist(7, reply.data.length)); + _lockDataUpload( + uploadType: 1, recordType: 0, records: state.uploadLockSetDataList); break; case 0x06: - //无权限 + //无权限 final List token = reply.data.sublist(3, 7); final List saveStrList = changeIntListToStringList(token); Storage.setStringList(saveBlueToken, saveStrList); @@ -383,18 +414,19 @@ class UploadDataLogic extends BaseGetXController{ // 上传数据获取锁密码列表 Future getUpdataLockPasswordList() async { - if(state.sureBtnState.value == 1){ + if (state.sureBtnState.value == 1) { return; } state.sureBtnState.value = 1; showEasyLoading(); - showBlueConnetctToastTimer(action: (){ + showBlueConnetctToastTimer(action: () { dismissEasyLoading(); AppLog.log('上传密码列表获取超时 关闭加载菊花'); state.sureBtnState.value = 0; }); - BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async { + BlueManage().blueSendData(BlueManage().connectDeviceName, + (BluetoothConnectionState connectionState) async { if (connectionState == BluetoothConnectionState.connected) { final List? token = await Storage.getStringList(saveBlueToken); final List getTokenList = changeStringListToIntList(token!); @@ -405,7 +437,7 @@ class UploadDataLogic extends BaseGetXController{ dismissEasyLoading(); cancelBlueConnetctToastTimer(); state.sureBtnState.value = 0; - if(state.ifCurrentScreen.value == true){ + if (state.ifCurrentScreen.value == true) { showBlueConnetctToast(); } } @@ -414,7 +446,8 @@ class UploadDataLogic extends BaseGetXController{ // 公共的获取密码列表 Future updataLockPasswordList(List token, int page) async { - final List? privateKey = await Storage.getStringList(saveBluePrivateKey); + final List? privateKey = + await Storage.getStringList(saveBluePrivateKey); final List getPrivateKeyList = changeStringListToIntList(privateKey!); final List? signKey = await Storage.getStringList(saveBlueSignKey); @@ -428,19 +461,19 @@ class UploadDataLogic extends BaseGetXController{ token: token, needAuthor: 1, signKey: signKeyDataList, - privateKey: getPrivateKeyList - ); + privateKey: getPrivateKeyList); } // 上传数据获取锁Card列表 Future getUpdataLockCardList() async { showEasyLoading(); - showBlueConnetctToastTimer(action: (){ + showBlueConnetctToastTimer(action: () { dismissEasyLoading(); state.indexCount.value = 0; state.sureBtnState.value = 0; }); - BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async { + BlueManage().blueSendData(BlueManage().connectDeviceName, + (BluetoothConnectionState connectionState) async { if (connectionState == BluetoothConnectionState.connected) { final List? token = await Storage.getStringList(saveBlueToken); final List getTokenList = changeStringListToIntList(token!); @@ -451,7 +484,7 @@ class UploadDataLogic extends BaseGetXController{ cancelBlueConnetctToastTimer(); state.sureBtnState.value = 0; state.indexCount.value = 0; - if(state.ifCurrentScreen.value == true){ + if (state.ifCurrentScreen.value == true) { showBlueConnetctToast(); } } @@ -460,7 +493,8 @@ class UploadDataLogic extends BaseGetXController{ // 公共的获取Card列表 Future updataLockCardList(List token, int page) async { - final List? privateKey = await Storage.getStringList(saveBluePrivateKey); + final List? privateKey = + await Storage.getStringList(saveBluePrivateKey); final List getPrivateKeyList = changeStringListToIntList(privateKey!); final List? signKey = await Storage.getStringList(saveBlueSignKey); @@ -474,19 +508,19 @@ class UploadDataLogic extends BaseGetXController{ token: token, needAuthor: 1, signKey: signKeyDataList, - privateKey: getPrivateKeyList - ); + privateKey: getPrivateKeyList); } // 上传数据获取锁指纹列表 Future getUpdataLockFingerprintList() async { showEasyLoading(); - showBlueConnetctToastTimer(action: (){ + showBlueConnetctToastTimer(action: () { dismissEasyLoading(); state.indexCount.value = 0; state.sureBtnState.value = 0; }); - BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async { + BlueManage().blueSendData(BlueManage().connectDeviceName, + (BluetoothConnectionState connectionState) async { if (connectionState == BluetoothConnectionState.connected) { final List? token = await Storage.getStringList(saveBlueToken); final List getTokenList = changeStringListToIntList(token!); @@ -497,7 +531,7 @@ class UploadDataLogic extends BaseGetXController{ cancelBlueConnetctToastTimer(); state.sureBtnState.value = 0; state.indexCount.value = 0; - if(state.ifCurrentScreen.value == true){ + if (state.ifCurrentScreen.value == true) { showBlueConnetctToast(); } } @@ -506,7 +540,8 @@ class UploadDataLogic extends BaseGetXController{ // 公共的获取指纹列表 Future updataLockFingerprintList(List token, int page) async { - final List? privateKey = await Storage.getStringList(saveBluePrivateKey); + final List? privateKey = + await Storage.getStringList(saveBluePrivateKey); final List getPrivateKeyList = changeStringListToIntList(privateKey!); final List? signKey = await Storage.getStringList(saveBlueSignKey); @@ -520,19 +555,19 @@ class UploadDataLogic extends BaseGetXController{ token: token, needAuthor: 1, signKey: signKeyDataList, - privateKey: getPrivateKeyList - ); + privateKey: getPrivateKeyList); } // 上传数据获取锁人脸列表 Future getUpdataLockFaceList() async { showEasyLoading(); - showBlueConnetctToastTimer(action: (){ + showBlueConnetctToastTimer(action: () { dismissEasyLoading(); state.indexCount.value = 0; state.sureBtnState.value = 0; }); - BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async { + BlueManage().blueSendData(BlueManage().connectDeviceName, + (BluetoothConnectionState connectionState) async { if (connectionState == BluetoothConnectionState.connected) { final List? token = await Storage.getStringList(saveBlueToken); final List getTokenList = changeStringListToIntList(token!); @@ -543,7 +578,7 @@ class UploadDataLogic extends BaseGetXController{ cancelBlueConnetctToastTimer(); state.sureBtnState.value = 0; state.indexCount.value = 0; - if(state.ifCurrentScreen.value == true){ + if (state.ifCurrentScreen.value == true) { showBlueConnetctToast(); } } @@ -552,7 +587,8 @@ class UploadDataLogic extends BaseGetXController{ // 公共的获取人脸列表 Future updataLockFaceList(List token, int page) async { - final List? privateKey = await Storage.getStringList(saveBluePrivateKey); + final List? privateKey = + await Storage.getStringList(saveBluePrivateKey); final List getPrivateKeyList = changeStringListToIntList(privateKey!); final List? signKey = await Storage.getStringList(saveBlueSignKey); @@ -566,20 +602,19 @@ class UploadDataLogic extends BaseGetXController{ token: token, needAuthor: 1, signKey: signKeyDataList, - privateKey: getPrivateKeyList - ); + privateKey: getPrivateKeyList); } - // 上传数据获取锁掌静脉列表 Future getUpdataLockPalmVeinList() async { showEasyLoading(); - showBlueConnetctToastTimer(action: (){ + showBlueConnetctToastTimer(action: () { dismissEasyLoading(); state.indexCount.value = 0; state.sureBtnState.value = 0; }); - BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async { + BlueManage().blueSendData(BlueManage().connectDeviceName, + (BluetoothConnectionState connectionState) async { if (connectionState == BluetoothConnectionState.connected) { final List? token = await Storage.getStringList(saveBlueToken); final List getTokenList = changeStringListToIntList(token!); @@ -590,7 +625,7 @@ class UploadDataLogic extends BaseGetXController{ cancelBlueConnetctToastTimer(); state.sureBtnState.value = 0; state.indexCount.value = 0; - if(state.ifCurrentScreen.value == true){ + if (state.ifCurrentScreen.value == true) { showBlueConnetctToast(); } } @@ -599,7 +634,8 @@ class UploadDataLogic extends BaseGetXController{ // 公共的获取掌静脉列表 Future updataLockPalmVeinList(List token, int page) async { - final List? privateKey = await Storage.getStringList(saveBluePrivateKey); + final List? privateKey = + await Storage.getStringList(saveBluePrivateKey); final List getPrivateKeyList = changeStringListToIntList(privateKey!); final List? signKey = await Storage.getStringList(saveBlueSignKey); @@ -613,30 +649,31 @@ class UploadDataLogic extends BaseGetXController{ token: token, needAuthor: 1, signKey: signKeyDataList, - privateKey: getPrivateKeyList - ); + privateKey: getPrivateKeyList); } // 上传数据获取锁遥控列表 Future getUpdataLockRemoteControlList() async { showEasyLoading(); - showBlueConnetctToastTimer(action: (){ + showBlueConnetctToastTimer(action: () { dismissEasyLoading(); state.indexCount.value = 0; state.sureBtnState.value = 0; }); - BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async { + BlueManage().blueSendData(BlueManage().connectDeviceName, + (BluetoothConnectionState connectionState) async { if (connectionState == BluetoothConnectionState.connected) { final List? token = await Storage.getStringList(saveBlueToken); final List getTokenList = changeStringListToIntList(token!); - updataLockRemoteControlList(getTokenList, state.uploadRemoteControlPage); + updataLockRemoteControlList( + getTokenList, state.uploadRemoteControlPage); } else if (connectionState == BluetoothConnectionState.disconnected) { dismissEasyLoading(); cancelBlueConnetctToastTimer(); state.sureBtnState.value = 0; state.indexCount.value = 0; - if(state.ifCurrentScreen.value == true){ + if (state.ifCurrentScreen.value == true) { showBlueConnetctToast(); } } @@ -645,7 +682,8 @@ class UploadDataLogic extends BaseGetXController{ // 公共的获取遥控列表 Future updataLockRemoteControlList(List token, int page) async { - final List? privateKey = await Storage.getStringList(saveBluePrivateKey); + final List? privateKey = + await Storage.getStringList(saveBluePrivateKey); final List getPrivateKeyList = changeStringListToIntList(privateKey!); final List? signKey = await Storage.getStringList(saveBlueSignKey); @@ -659,19 +697,19 @@ class UploadDataLogic extends BaseGetXController{ token: token, needAuthor: 1, signKey: signKeyDataList, - privateKey: getPrivateKeyList - ); + privateKey: getPrivateKeyList); } // 上传数据获取设置 Future getUpdataLockSet() async { showEasyLoading(); - showBlueConnetctToastTimer(action: (){ + showBlueConnetctToastTimer(action: () { dismissEasyLoading(); state.indexCount.value = 0; state.sureBtnState.value = 0; }); - BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async { + BlueManage().blueSendData(BlueManage().connectDeviceName, + (BluetoothConnectionState connectionState) async { if (connectionState == BluetoothConnectionState.connected) { final List? token = await Storage.getStringList(saveBlueToken); final List getTokenList = changeStringListToIntList(token!); @@ -682,7 +720,7 @@ class UploadDataLogic extends BaseGetXController{ cancelBlueConnetctToastTimer(); state.sureBtnState.value = 0; state.indexCount.value = 0; - if(state.ifCurrentScreen.value == true){ + if (state.ifCurrentScreen.value == true) { showBlueConnetctToast(); } } @@ -691,7 +729,8 @@ class UploadDataLogic extends BaseGetXController{ // 公共的上传锁设置 Future updataLockSet(List token) async { - final List? privateKey = await Storage.getStringList(saveBluePrivateKey); + final List? privateKey = + await Storage.getStringList(saveBluePrivateKey); final List getPrivateKeyList = changeStringListToIntList(privateKey!); final List? signKey = await Storage.getStringList(saveBlueSignKey); @@ -703,32 +742,29 @@ class UploadDataLogic extends BaseGetXController{ token: token, needAuthor: 1, signKey: signKeyDataList, - privateKey: getPrivateKeyList - ); + privateKey: getPrivateKeyList); } // 锁数据上传服务器 - Future _lockDataUpload({ - required int uploadType, - required int recordType, - required List records - }) async{ + Future _lockDataUpload( + {required int uploadType, + required int recordType, + required List records}) async { final LoginEntity entity = await ApiRepository.to.lockDataUpload( lockId: CommonDataManage().currentKeyInfo.lockId!, - uploadType:uploadType, + uploadType: uploadType, recordType: recordType, - records:records, - isUnShowLoading: false - ); - if(entity.errorCode!.codeIsSuccessful){ - if(uploadType == 1){ + records: records, + isUnShowLoading: false); + if (entity.errorCode!.codeIsSuccessful) { + if (uploadType == 1) { // 1设置 state.indexCount.value = 0; state.sureBtnState.value = 0; showToast('上传成功'.tr); - }else{ + } else { // 2开门方式 - switch(recordType){ + switch (recordType) { // case 1: // // 电子钥匙 // @@ -761,13 +797,38 @@ class UploadDataLogic extends BaseGetXController{ break; } } - }else{ + } else { state.indexCount.value = 0; state.sureBtnState.value = 0; dismissEasyLoading(); } } + // 上传数据成功后的回调 + void onUploadSuccess() { + // 发送事件通知指纹列表刷新 + eventBus.fire(OtherTypeRefreshListEvent()); + // 返回上一页 + Get.back(); + } + + // 在上传数据成功的地方调用 + Future uploadData() async { + try { + // ... existing upload code ... + + // 假设这是上传成功的标志 + bool uploadSuccess = true; // 这里需要根据实际的上传结果来设置 + + if (uploadSuccess) { + onUploadSuccess(); + } + } catch (e) { + // 处理错误 + print('Upload failed: $e'); + } + } + @override void onReady() { super.onReady(); @@ -783,5 +844,4 @@ class UploadDataLogic extends BaseGetXController{ _replySubscription.cancel(); } - -} \ No newline at end of file +} From 130cc8f1336c189c82c8206b948fa2567eca0b21 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Fri, 23 May 2025 19:02:47 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/Gemfile | 2 +- ios/Gemfile | 1 + pubspec.lock | 80 +++++-------------------------------------------- 3 files changed, 10 insertions(+), 73 deletions(-) diff --git a/android/Gemfile b/android/Gemfile index cdd3a6b3..edb07877 100644 --- a/android/Gemfile +++ b/android/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" gem "fastlane" - +gem 'nkf', '0.2.0' plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') eval_gemfile(plugins_path) if File.exist?(plugins_path) diff --git a/ios/Gemfile b/ios/Gemfile index 21cb5dfc..96415b71 100644 --- a/ios/Gemfile +++ b/ios/Gemfile @@ -3,5 +3,6 @@ source "https://rubygems.org" gem "fastlane" gem 'cocoapods', '1.14.3' gem 'public_suffix', '~> 4.0' +gem 'nkf', '0.2.0' plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') eval_gemfile(plugins_path) if File.exist?(plugins_path) diff --git a/pubspec.lock b/pubspec.lock index b1ead27d..b099b594 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -24,30 +24,6 @@ packages: relative: true source: path version: "0.0.1" - amap_flutter_base: - dependency: transitive - description: - name: amap_flutter_base - sha256: "9ef2439b8de7100cdd1b4357701b8ca8c059c0f2d9d0257b81750bbf0c6f53bb" - url: "https://pub.dev" - source: hosted - version: "3.0.0" - amap_flutter_location: - dependency: "direct main" - description: - name: amap_flutter_location - sha256: f35ff00e196d579608e0bc28ccbc1f6f53787644702f947de941f775769cc701 - url: "https://pub.dev" - source: hosted - version: "3.0.0" - amap_flutter_map: - dependency: "direct main" - description: - name: amap_flutter_map - sha256: "9cebb0b2f5fc7d3ae0427e99c41edc883e8f5459f6a28bc850f0f9e16918cf2f" - url: "https://pub.dev" - source: hosted - version: "3.0.0" app_settings: dependency: "direct main" description: @@ -573,6 +549,14 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_app_badger: + dependency: "direct main" + description: + name: flutter_app_badger + sha256: "64d4a279bab862ed28850431b9b446b9820aaae0bf363322d51077419f930fa8" + url: "https://pub.dev" + source: hosted + version: "1.5.0" flutter_blue_plus: dependency: "direct main" description: @@ -788,30 +772,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.1" - google_maps: - dependency: transitive - description: - name: google_maps - sha256: "47eef3836b49bb030d5cb3afc60b8451408bf34cf753e571b645d6529eb4251a" - url: "https://pub.dev" - source: hosted - version: "7.1.0" - google_maps_flutter: - dependency: "direct main" - description: - name: google_maps_flutter - sha256: c1972cbad779bc5346c49045f26ae45550a0958b1cbca5b524dd3c8954995d28 - url: "https://pub.dev" - source: hosted - version: "2.6.1" - google_maps_flutter_android: - dependency: transitive - description: - name: google_maps_flutter_android - sha256: "0bcadb80eba39afda77dede89a6caafd3b68f2786b90491eceea4a01c3db181c" - url: "https://pub.dev" - source: hosted - version: "2.8.0" google_maps_flutter_ios: dependency: "direct overridden" description: @@ -828,14 +788,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.9.5" - google_maps_flutter_web: - dependency: transitive - description: - name: google_maps_flutter_web - sha256: f3155c12119d8a5c2732fdf39ceb5cc095bc662059a03b4ea23294ecebe1d199 - url: "https://pub.dev" - source: hosted - version: "0.5.8" html: dependency: transitive description: @@ -973,14 +925,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.6.7" - js_wrapping: - dependency: transitive - description: - name: js_wrapping - sha256: e385980f7c76a8c1c9a560dfb623b890975841542471eade630b2871d243851c - url: "https://pub.dev" - source: hosted - version: "0.7.4" json_annotation: dependency: transitive description: @@ -1381,14 +1325,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.27.7" - sanitize_html: - dependency: transitive - description: - name: sanitize_html - sha256: "12669c4a913688a26555323fb9cec373d8f9fbe091f2d01c40c723b33caa8989" - url: "https://pub.dev" - source: hosted - version: "2.1.0" scrollable_positioned_list: dependency: transitive description: From ab327e1a4f83191f6c633cbfeb06cc8b5c3d2251 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Fri, 23 May 2025 19:20:41 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/Gemfile.lock | 1 + ios/Gemfile.lock | 1 + 2 files changed, 2 insertions(+) diff --git a/android/Gemfile.lock b/android/Gemfile.lock index 554a5952..ec32c3b5 100644 --- a/android/Gemfile.lock +++ b/android/Gemfile.lock @@ -216,6 +216,7 @@ PLATFORMS DEPENDENCIES fastlane fastlane-plugin-pgyer + nkf (= 0.2.0) BUNDLED WITH 1.17.2 diff --git a/ios/Gemfile.lock b/ios/Gemfile.lock index 8882903d..e8a3ba4d 100644 --- a/ios/Gemfile.lock +++ b/ios/Gemfile.lock @@ -282,6 +282,7 @@ DEPENDENCIES cocoapods (= 1.14.3) fastlane fastlane-plugin-pgyer + nkf (= 0.2.0) public_suffix (~> 4.0) BUNDLED WITH From f770a11e68c9b2a533ffbdb799b4cbe67393eccd Mon Sep 17 00:00:00 2001 From: Liuyf Date: Mon, 26 May 2025 11:23:35 +0800 Subject: [PATCH 4/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eeb98d56..c287c9f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,6 +63,9 @@ variables: - ls -li - export NEXT_VERSION="$(cat app_new.version)" # - flutter pub get + - export PATH="/opt/homebrew/bin:$PATH" + - eval "$(rbenv init -)" + - bundle config mirror.https://rubygems.org https://gems.ruby-china.com - bundle install --gemfile android/Gemfile --quiet cache: paths: @@ -74,6 +77,9 @@ variables: - ls -li - export NEXT_VERSION="$(cat app_new.version)" # - flutter pub get + - export PATH="/opt/homebrew/bin:$PATH" + - eval "$(rbenv init -)" + - bundle config mirror.https://rubygems.org https://gems.ruby-china.com - bundle install --gemfile ios/Gemfile --quiet cache: paths: From 9f9c31862ec41944979576947627d57658091626 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Mon, 26 May 2025 11:55:16 +0800 Subject: [PATCH 5/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c287c9f7..e656594f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,9 +63,9 @@ variables: - ls -li - export NEXT_VERSION="$(cat app_new.version)" # - flutter pub get - - export PATH="/opt/homebrew/bin:$PATH" - - eval "$(rbenv init -)" - - bundle config mirror.https://rubygems.org https://gems.ruby-china.com +# - export PATH="/opt/homebrew/bin:$PATH" +# - eval "$(rbenv init -)" +# - bundle config mirror.https://rubygems.org https://gems.ruby-china.com - bundle install --gemfile android/Gemfile --quiet cache: paths: @@ -77,9 +77,9 @@ variables: - ls -li - export NEXT_VERSION="$(cat app_new.version)" # - flutter pub get - - export PATH="/opt/homebrew/bin:$PATH" - - eval "$(rbenv init -)" - - bundle config mirror.https://rubygems.org https://gems.ruby-china.com +# - export PATH="/opt/homebrew/bin:$PATH" +# - eval "$(rbenv init -)" +# - bundle config mirror.https://rubygems.org https://gems.ruby-china.com - bundle install --gemfile ios/Gemfile --quiet cache: paths: From 09f75dbd4ad5effbaaefc6411a056b6a6d140c01 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Mon, 26 May 2025 11:57:28 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e656594f..c287c9f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,9 +63,9 @@ variables: - ls -li - export NEXT_VERSION="$(cat app_new.version)" # - flutter pub get -# - export PATH="/opt/homebrew/bin:$PATH" -# - eval "$(rbenv init -)" -# - bundle config mirror.https://rubygems.org https://gems.ruby-china.com + - export PATH="/opt/homebrew/bin:$PATH" + - eval "$(rbenv init -)" + - bundle config mirror.https://rubygems.org https://gems.ruby-china.com - bundle install --gemfile android/Gemfile --quiet cache: paths: @@ -77,9 +77,9 @@ variables: - ls -li - export NEXT_VERSION="$(cat app_new.version)" # - flutter pub get -# - export PATH="/opt/homebrew/bin:$PATH" -# - eval "$(rbenv init -)" -# - bundle config mirror.https://rubygems.org https://gems.ruby-china.com + - export PATH="/opt/homebrew/bin:$PATH" + - eval "$(rbenv init -)" + - bundle config mirror.https://rubygems.org https://gems.ruby-china.com - bundle install --gemfile ios/Gemfile --quiet cache: paths: From 261a0363e5aa8d047f5015df3b22a19da4067a42 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Mon, 26 May 2025 12:05:01 +0800 Subject: [PATCH 7/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/Gemfile.lock | 69 +++++++++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 30 deletions(-) diff --git a/android/Gemfile.lock b/android/Gemfile.lock index ec32c3b5..66db029a 100644 --- a/android/Gemfile.lock +++ b/android/Gemfile.lock @@ -9,21 +9,23 @@ GEM public_suffix (>= 2.0.2, < 7.0) artifactory (3.0.17) atomos (0.1.3) - aws-eventstream (1.3.0) - aws-partitions (1.979.0) - aws-sdk-core (3.209.1) + aws-eventstream (1.3.2) + aws-partitions (1.1107.0) + aws-sdk-core (3.224.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) + aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) + base64 jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.94.0) - aws-sdk-core (~> 3, >= 3.207.0) + logger + aws-sdk-kms (1.101.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.166.0) - aws-sdk-core (~> 3, >= 3.207.0) + aws-sdk-s3 (1.186.1) + aws-sdk-core (~> 3, >= 3.216.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sigv4 (1.10.0) + aws-sigv4 (1.11.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) base64 (0.2.0) @@ -33,7 +35,7 @@ GEM commander (4.6.0) highline (~> 2.0.0) declarative (0.0.20) - digest-crc (0.6.5) + digest-crc (0.7.0) rake (>= 12.0.0, < 14.0.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) @@ -59,8 +61,8 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) @@ -68,8 +70,8 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.1) faraday (~> 1.0) - fastimage (2.3.1) - fastlane (2.222.0) + fastimage (2.4.0) + fastlane (2.227.2) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -85,6 +87,7 @@ GEM faraday-cookie_jar (~> 0.0.6) faraday_middleware (~> 1.0) fastimage (>= 2.1.0, < 3.0.0) + fastlane-sirp (>= 1.0.0) gh_inspector (>= 1.1.2, < 2.0.0) google-apis-androidpublisher_v3 (~> 0.3) google-apis-playcustomapp_v1 (~> 0.1) @@ -108,9 +111,11 @@ GEM tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.3.0) + xcpretty (~> 0.4.1) xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) fastlane-plugin-pgyer (0.2.9) + fastlane-sirp (1.0.0) + sysrandom (~> 1.0) gh_inspector (1.1.3) google-apis-androidpublisher_v3 (0.54.0) google-apis-core (>= 0.11.0, < 2.a) @@ -149,23 +154,26 @@ GEM os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) highline (2.0.3) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) - httpclient (2.8.3) + httpclient (2.9.0) + mutex_m jmespath (1.6.2) - json (2.7.2) - jwt (2.9.1) + json (2.7.6) + jwt (2.10.1) base64 + logger (1.7.0) mini_magick (4.13.2) mini_mime (1.1.5) multi_json (1.15.0) multipart-post (2.4.1) - nanaimo (0.3.0) + mutex_m (0.3.0) + nanaimo (0.4.0) naturally (2.2.1) nkf (0.2.0) - optparse (0.5.0) + optparse (0.6.0) os (1.1.4) - plist (3.7.1) + plist (3.7.2) public_suffix (5.1.1) rake (13.2.1) representable (3.2.0) @@ -173,10 +181,10 @@ GEM trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.3.7) - rouge (2.0.7) + rexml (3.4.1) + rouge (3.28.0) ruby2_keywords (0.0.5) - rubyzip (2.3.2) + rubyzip (2.4.1) security (0.1.5) signet (0.18.0) addressable (~> 2.8) @@ -186,6 +194,7 @@ GEM simctl (1.6.10) CFPropertyList naturally + sysrandom (1.0.5) terminal-notifier (2.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -198,15 +207,15 @@ GEM unf (0.2.0) unicode-display_width (2.6.0) word_wrap (1.0.0) - xcodeproj (1.25.0) + xcodeproj (1.27.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.3.0) - rexml (>= 3.3.2, < 4.0) - xcpretty (0.3.0) - rouge (~> 2.0.7) + nanaimo (~> 0.4.0) + rexml (>= 3.3.6, < 4.0) + xcpretty (0.4.1) + rouge (~> 3.28.0) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) From 5d0da71780ed03a2e7ead5346f8bb81278adcd30 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Mon, 26 May 2025 14:15:27 +0800 Subject: [PATCH 8/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/fastlane/Fastfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 3591770d..4f8650e0 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -89,7 +89,8 @@ platform :ios do sh("flutter","pub","get") end Dir.chdir ".." do - sh("bundle", "exec" ,"pod", "install") + #sh("bundle", "exec" ,"pod", "install") + sh("pod", "install") end Dir.chdir "../.." do sh("flutter", "build", "ios", "--no-tree-shake-icons", "--no-codesign", "--release", "--flavor", "#{flavor}", "-t", "lib/main_#{flavor}_#{env}.dart", "--build-number=#{build_number}", "--build-name=#{build_version}")