From e32b2191f37e2bb66941c130c4cb5c83adb32fa3 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Thu, 6 Mar 2025 15:43:50 +0800 Subject: [PATCH 1/4] build trigger From 1dd9da1bef70fc94ecbd3a373d02344fbeb66196 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Mon, 31 Mar 2025 15:00:14 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix=EF=BC=9A=E3=80=90=E5=BC=80=E9=94=81?= =?UTF-8?q?=E9=A1=B5-=E5=AF=86=E7=A0=81-=E4=BF=AE=E6=94=B9=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=AF=86=E7=A0=81=E4=B8=BA=E5=B7=B2=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E5=AF=86=E7=A0=81=E4=B8=80=E7=9B=B4=E8=BD=AC=E5=9C=88?= =?UTF-8?q?=E6=97=A0=E6=8F=90=E7=A4=BA=EF=BC=8C=E4=B9=8B=E5=89=8D=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/blue/io_reply.dart | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/blue/io_reply.dart b/lib/blue/io_reply.dart index be395c47..856eb0d9 100755 --- a/lib/blue/io_reply.dart +++ b/lib/blue/io_reply.dart @@ -1,11 +1,10 @@ - import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; import '../app_settings/app_settings.dart'; import 'io_type.dart'; -abstract class Reply{ +abstract class Reply { Reply.parseData(this.commandType, List dataDetail); CommandType? commandType; @@ -13,10 +12,10 @@ abstract class Reply{ //command key flag int status = 0; List data = []; - static String logTag= '锁 -> App，指令订阅类型 :'; + static String logTag = '锁 -> App，指令订阅类型 :'; - void errorWithStstus(int status){ - switch(status){ + void errorWithStstus(int status) { + switch (status) { case 0x00: // 成功 AppLog.log('$logTag ${commandType?.typeName} 0x00 成功'); @@ -39,7 +38,7 @@ abstract class Reply{ case 0x04: // 用户未登记 AppLog.log('$logTag ${commandType!.typeName} 0x04 用户未登记'); - // showErrorMessage('用户未登记'); + showErrorMessage('用户未登记'.tr); break; case 0x05: // 参数错误 @@ -133,7 +132,7 @@ abstract class Reply{ } } - void showErrorMessage(String message){ + void showErrorMessage(String message) { EasyLoading.showToast(message, duration: 2000.milliseconds); } From fae8e9872fcddb5b397e6c3043aba117529a1d3f Mon Sep 17 00:00:00 2001 From: Liuyf Date: Mon, 31 Mar 2025 16:09:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix=EF=BC=9A=E3=80=90=E5=BC=80=E9=94=81?= =?UTF-8?q?=E9=A1=B5-=E5=9B=BE=E6=A0=87=E7=BA=BF=E4=B8=8A=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=BA=94=E6=98=AF=E7=BB=BF=E8=89=B2=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=EF=BC=8C=E7=8E=B0=E4=B8=BA=E9=BB=91=E8=89=B2=E3=80=82=E5=8F=A6?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92=E5=BA=94=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lockDetail/lockDetail_page.dart | 34 ++++++++----------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/lib/main/lockDetail/lockDetail/lockDetail_page.dart index fc69d86b..3d0e818a 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -1262,16 +1262,13 @@ class _LockDetailPageState extends State SizedBox( width: 42.w, height: 42.h, - child: FlavorsImg( - black: true, - child: Image.asset(iconUrl, - width: 42.w, - height: 42.w, - color: bottomBtnisEable - ? AppColors.mainColor - : AppColors.lockDetailBottomBtnUneable, - fit: BoxFit.fitWidth), - ), + child: Image.asset(iconUrl, + width: 42.w, + height: 42.w, + color: bottomBtnisEable + ? AppColors.mainColor + : AppColors.lockDetailBottomBtnUneable, + fit: BoxFit.fitWidth), ), SizedBox(height: 5.h), Expanded( @@ -1295,16 +1292,13 @@ class _LockDetailPageState extends State SizedBox( width: 42.w, height: 42.w, - child: FlavorsImg( - black: true, - child: Image.asset(iconUrl, - width: 42.w, - height: 42.w, - color: bottomBtnisEable - ? AppColors.mainColor - : AppColors.lockDetailBottomBtnUneable, - fit: BoxFit.fitWidth), - ), + child: Image.asset(iconUrl, + width: 42.w, + height: 42.w, + color: bottomBtnisEable + ? AppColors.mainColor + : AppColors.lockDetailBottomBtnUneable, + fit: BoxFit.fitWidth), ), SizedBox(height: 15.h), Text( From ec3d4109b1c107caa409bcb08c43ae507ca46167 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Mon, 31 Mar 2025 17:20:55 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix=EF=BC=9A=E3=80=90=E5=BC=80=E9=94=81?= =?UTF-8?q?=E9=A1=B5-=E8=AE=BE=E7=BD=AE-=E5=8F=8C=E9=87=8D=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=20=E8=BF=98=E6=9C=AA=E8=B0=83=E8=AF=95=20=E5=BB=BA?= =?UTF-8?q?=E8=AE=AE=E9=9A=90=E8=97=8F=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart | 3 ++- lib/main_local.dart | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart b/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart index 6760a1c0..4d8fac0e 100755 --- a/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart +++ b/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart @@ -362,7 +362,8 @@ class _LockSetPageState extends State //todo: 双重认证、双锁联动国际化、API接口 //双重认证 Obx(() => Visibility( - visible: state.lockFeature.value.doubleAuthentication == 1, + //state.lockFeature.value.doubleAuthentication == 1, + visible: false, child: CommonItem( leftTitel: '双重认证'.tr, rightTitle: '', diff --git a/lib/main_local.dart b/lib/main_local.dart index bd256362..9e30d007 100755 --- a/lib/main_local.dart +++ b/lib/main_local.dart @@ -4,7 +4,7 @@ import 'flavors.dart'; import 'main.dart' as runner; Future main() async { - F.appFlavor = Flavor.sky; + F.appFlavor = Flavor.xhj; // AppLog.log('local调用了main函数'); await runner.main(); }