Merge branch 'canary_release' into develop_liyi

lib/blue/io_reply.dart

@@ -1,4 +1,3 @@
-
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:get/get.dart';
 
@@ -39,7 +38,7 @@ abstract class Reply{
       case 0x04:
         // 用户未登记
         AppLog.log('$logTag ${commandType!.typeName} 0x04 用户未登记');
-        // showErrorMessage('用户未登记');
+        showErrorMessage('用户未登记'.tr);
         break;
       case 0x05:
         // 参数错误

lib/main/lockDetail/lockDetail/lockDetail_page.dart

@@ -1262,8 +1262,6 @@ class _LockDetailPageState extends State<LockDetailPage>
                   SizedBox(
                     width: 42.w,
                     height: 42.h,
-                    child: FlavorsImg(
-                      black: true,
                     child: Image.asset(iconUrl,
                         width: 42.w,
                         height: 42.w,
@@ -1272,7 +1270,6 @@ class _LockDetailPageState extends State<LockDetailPage>
                             : AppColors.lockDetailBottomBtnUneable,
                         fit: BoxFit.fitWidth),
                   ),
-                  ),
                   SizedBox(height: 5.h),
                   Expanded(
                       child: Text(name,
@@ -1295,8 +1292,6 @@ class _LockDetailPageState extends State<LockDetailPage>
                   SizedBox(
                     width: 42.w,
                     height: 42.w,
-                    child: FlavorsImg(
-                      black: true,
                     child: Image.asset(iconUrl,
                         width: 42.w,
                         height: 42.w,
@@ -1305,7 +1300,6 @@ class _LockDetailPageState extends State<LockDetailPage>
                             : AppColors.lockDetailBottomBtnUneable,
                         fit: BoxFit.fitWidth),
                   ),
-                  ),
                   SizedBox(height: 15.h),
                   Text(
                     name,

lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart

@@ -362,7 +362,8 @@ class _LockSetPageState extends State<LockSetPage>
       //todo: 双重认证、双锁联动国际化、API接口
       //双重认证
       Obx(() => Visibility(
-          visible: state.lockFeature.value.doubleAuthentication == 1,
+          //state.lockFeature.value.doubleAuthentication == 1,
+          visible: false,
           child: CommonItem(
               leftTitel: '双重认证'.tr,
               rightTitle: '',

lib/main_local.dart

@@ -4,7 +4,7 @@ import 'flavors.dart';
 import 'main.dart' as runner;
 
 Future<void> main() async {
-  F.appFlavor = Flavor.sky;
+  F.appFlavor = Flavor.xhj;
   // AppLog.log('local调用了main函数');
   await runner.main();
 }