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); } 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( 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(); }