Merge branch 'develop_liyi' into canary_release

lib/login/login/starLock_login_logic.dart

@@ -136,6 +136,8 @@ class StarLockLoginLogic extends BaseGetXController {
             'login_res': '${entity.errorCode}--${entity.errorMsg}',
           });
         }
+      } else {
+        showToast('一键登录失败,请重试'.tr);
       }
     });
   }
@@ -215,6 +217,7 @@ class StarLockLoginLogic extends BaseGetXController {
 
 //刷新设备信息
   Future<void> flushedDeviceInfo() async {
+    eventBus.fire(AgreePrivacyAgreement());
     XSConstantMacro().getDeviceInfoData().then((Map<String, dynamic> data) {
       state.deviceInfoMap.value = data;
     }).catchError((dynamic error) {

lib/main/lockDetail/card/cardList/cardList_logic.dart

@@ -248,7 +248,7 @@ class CardListLogic extends BaseGetXController {
     if (isDemoMode == false) {
       _initReplySubscription();
 
-      _initRefreshAction();
+      // _initRefreshAction();
     }
     await getICCardListData(isRefresh: true);
   }

lib/main/lockDetail/face/faceList/faceList_logic.dart

@@ -430,7 +430,7 @@ class FaceListLogic extends BaseGetXController {
     if (isDemoMode == false) {
       _initReplySubscription();
 
-      _initRefreshAction();
+      // _initRefreshAction();
     }
   }
 

lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart

@@ -461,7 +461,6 @@ class FingerprintListLogic extends BaseGetXController {
       _initReplySubscription();
 
       // _initRefreshAction();
-      getFingerprintsListData(isRefresh: true);
     }
   }
 

lib/main/lockDetail/palm/palmList/palmList_logic.dart

@@ -233,7 +233,7 @@ class PalmListLogic extends BaseGetXController {
     if (isDemoMode == false) {
       _initReplySubscription();
 
-      _initRefreshAction();
+      // _initRefreshAction();
     }
   }
 

lib/tools/jverify_one_click_login.dart

@@ -95,6 +95,7 @@ class JverifyOneClickLoginManage {
   /// 判断当前网络环境是否可以发起认证
   Future<bool> checkVerifyEnable() async {
     final Map map = await jverify.checkVerifyEnable();
+    AppLog.log('一家登录 sdk 初始化结果:$map');
     final bool result = map[f_result_key];
     return result;
     // state.jverify.checkVerifyEnable().then((map) {
@@ -267,6 +268,9 @@ class JverifyOneClickLoginManage {
             action(event);
             // AppLog.log('获取到 loginAuthSyncApi 接口返回数据，code=${event.code},message = ${event.message},operator = ${event.operator}');
           });
+    } else {
+      // -10000 表示登录失败
+      action(JVListenerEvent.fromJson({'code': -10000, 'message': ''}));
     }
   }
 }