From afcb031bd0ca3a11047995b986fa609b326c4757 Mon Sep 17 00:00:00 2001 From: liyi Date: Fri, 18 Apr 2025 10:46:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=90=8E=E5=88=97=E8=A1=A8=E5=87=BA=E7=8E=B0=E5=A4=9A=E6=9D=A1?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/main/lockDetail/card/cardList/cardList_logic.dart | 2 +- lib/main/lockDetail/face/faceList/faceList_logic.dart | 2 +- .../fingerprint/fingerprintList/fingerprintList_logic.dart | 1 - lib/main/lockDetail/palm/palmList/palmList_logic.dart | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/main/lockDetail/card/cardList/cardList_logic.dart b/lib/main/lockDetail/card/cardList/cardList_logic.dart index 022ff0fb..2fc2e376 100755 --- a/lib/main/lockDetail/card/cardList/cardList_logic.dart +++ b/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); } diff --git a/lib/main/lockDetail/face/faceList/faceList_logic.dart b/lib/main/lockDetail/face/faceList/faceList_logic.dart index 9781a916..a1499556 100755 --- a/lib/main/lockDetail/face/faceList/faceList_logic.dart +++ b/lib/main/lockDetail/face/faceList/faceList_logic.dart @@ -430,7 +430,7 @@ class FaceListLogic extends BaseGetXController { if (isDemoMode == false) { _initReplySubscription(); - _initRefreshAction(); + // _initRefreshAction(); } } diff --git a/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart b/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart index 3c886df8..d65269cd 100755 --- a/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart +++ b/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart @@ -461,7 +461,6 @@ class FingerprintListLogic extends BaseGetXController { _initReplySubscription(); // _initRefreshAction(); - getFingerprintsListData(isRefresh: true); } } diff --git a/lib/main/lockDetail/palm/palmList/palmList_logic.dart b/lib/main/lockDetail/palm/palmList/palmList_logic.dart index b18e3609..8d15fa33 100755 --- a/lib/main/lockDetail/palm/palmList/palmList_logic.dart +++ b/lib/main/lockDetail/palm/palmList/palmList_logic.dart @@ -233,7 +233,7 @@ class PalmListLogic extends BaseGetXController { if (isDemoMode == false) { _initReplySubscription(); - _initRefreshAction(); + // _initRefreshAction(); } } From 4242ac0a80cdba1bca55b11a9522f0c6644d1160 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Mon, 21 Apr 2025 18:40:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=B8=80=E9=94=AE=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=B2=A1=E6=9C=89=E8=A7=A6=E5=8F=91=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E6=89=A7=E8=A1=8C=E4=B8=80=E9=94=AE=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=A4=B1=E8=B4=A5=E5=90=8E=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E4=BB=BB=E4=BD=95=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/login/login/starLock_login_logic.dart | 3 +++ lib/tools/jverify_one_click_login.dart | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/lib/login/login/starLock_login_logic.dart b/lib/login/login/starLock_login_logic.dart index f6130c6b..01453fba 100755 --- a/lib/login/login/starLock_login_logic.dart +++ b/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 flushedDeviceInfo() async { + eventBus.fire(AgreePrivacyAgreement()); XSConstantMacro().getDeviceInfoData().then((Map data) { state.deviceInfoMap.value = data; }).catchError((dynamic error) { diff --git a/lib/tools/jverify_one_click_login.dart b/lib/tools/jverify_one_click_login.dart index 94993d6d..d0a01f5b 100644 --- a/lib/tools/jverify_one_click_login.dart +++ b/lib/tools/jverify_one_click_login.dart @@ -95,6 +95,7 @@ class JverifyOneClickLoginManage { /// 判断当前网络环境是否可以发起认证 Future 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': ''})); } } }