diff --git a/entry/src/main/ets/pages/components/FaceAuth.ets b/entry/src/main/ets/pages/components/FaceAuth.ets index 28b0641ce49c161b80550d5d0bb73be14831af41..c2c9a217bb0b576a348ee054983df53a21fc6b6d 100644 --- a/entry/src/main/ets/pages/components/FaceAuth.ets +++ b/entry/src/main/ets/pages/components/FaceAuth.ets @@ -191,18 +191,18 @@ export default struct FaceAuth { } else { if (((AppStorage.get('wantParams') as WantParams)?.navigationButtonText as string)) { if ([DialogType.FACE_FINGER_NAVIGATION].includes(this.dialogType)) { - AuthUtils.getInstance() - .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFace, Constants.noticeTypeFinger]); AuthUtils.getInstance() .sendNotice(Constants.noticeEventUserNavigation, [Constants.noticeTypeFace, Constants.noticeTypeFinger]); + AuthUtils.getInstance() + .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFace, Constants.noticeTypeFinger]); } else { - AuthUtils.getInstance().sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFace]); AuthUtils.getInstance().sendNotice(Constants.noticeEventUserNavigation, [Constants.noticeTypeFace]); + AuthUtils.getInstance().sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFace]); } } else { if (this.skipLockedBiometricAuth) { - AuthUtils.getInstance().sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFace]); AuthUtils.getInstance().sendNotice(Constants.noticeEventCancel, [Constants.noticeTypeFace]); + AuthUtils.getInstance().sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFace]); (AppStorage.get('session') as UIExtensionContentSession)?.terminateSelf(); } } @@ -407,10 +407,10 @@ export default struct FaceAuth { this.prompt = (AppStorage.get('context') as common.ExtensionContext)?.resourceManager .getStringSync($r('app.string.unified_authwidget_hint_fp_verify_success').id) if (payload.tipType === UserAuthTipType.SINGLE_AUTH_RESULT) { - AuthUtils.getInstance() - .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFace, Constants.noticeTypeFinger]); AuthUtils.getInstance() .sendNotice(Constants.noticeEventCancel, [Constants.noticeTypeFace, Constants.noticeTypeFinger]); + AuthUtils.getInstance() + .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFace, Constants.noticeTypeFinger]); } (AppStorage.get('session') as UIExtensionContentSession)?.terminateSelf(); } @@ -468,9 +468,9 @@ export default struct FaceAuth { .backgroundColor(Color.Transparent) .onClick(() => { this.textValue = ''; + this.handleCancel(); AuthUtils.getInstance() .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypePin]); - this.handleCancel(); }) }.width(Constants.halfContainerWidth) @@ -517,9 +517,9 @@ export default struct FaceAuth { Button($r('app.string.unified_authwidget_cancel'), { stateEffect: true }) .id('cancelBtnSixPinFaceAuth') .onClick(() => { + this.handleCancel(); AuthUtils.getInstance() .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypePin]); - this.handleCancel(); this.textValue = ''; }) .backgroundColor(Color.Transparent) @@ -737,10 +737,10 @@ export default struct FaceAuth { .fontWeight(FontWeight.Medium) .backgroundColor(Color.Transparent) .onClick(() => { + this.handleCancel(); AuthUtils.getInstance() .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFace, Constants.noticeTypeFinger]); - this.handleCancel(); this.textValue = ''; }) }.width(Constants.halfContainerWidth) @@ -863,10 +863,10 @@ export default struct FaceAuth { .fontWeight(FontWeight.Medium) .backgroundColor(Color.Transparent) .onClick(() => { + this.handleCancel(); AuthUtils.getInstance() .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFace, Constants.noticeTypeFinger]); - this.handleCancel(); this.textValue = ''; }) }.width(Constants.halfContainerWidth) @@ -888,10 +888,10 @@ export default struct FaceAuth { .backgroundColor(Color.Transparent) .onClick(() => { AuthUtils.getInstance() - .sendNotice(Constants.noticeEventWidgetReleased, + .sendNotice(Constants.noticeEventUserNavigation, [Constants.noticeTypeFace, Constants.noticeTypeFinger]); AuthUtils.getInstance() - .sendNotice(Constants.noticeEventUserNavigation, + .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFace, Constants.noticeTypeFinger]); (AppStorage.get('session') as UIExtensionContentSession)?.terminateSelf(); }) @@ -992,6 +992,7 @@ export default struct FaceAuth { .fontWeight(FontWeight.Medium) .backgroundColor(Color.Transparent) .onClick(() => { + this.handleCancel(); if (this.dialogType === DialogType.ALL) { AuthUtils.getInstance() .sendNotice(Constants.noticeEventWidgetReleased, @@ -1000,7 +1001,6 @@ export default struct FaceAuth { AuthUtils.getInstance() .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFace]); } - this.handleCancel(); }) }.width(Constants.halfContainerWidth) @@ -1050,10 +1050,10 @@ export default struct FaceAuth { .fontWeight(FontWeight.Medium) .backgroundColor(Color.Transparent) .onClick(() => { + this.handleCancel(); this.textValue = ''; AuthUtils.getInstance() .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypePin]); - this.handleCancel(); }) }.width(Constants.halfContainerWidth) @@ -1093,9 +1093,9 @@ export default struct FaceAuth { Button($r('app.string.unified_authwidget_cancel'), { stateEffect: true }) .id('cancelBtnSixPinFaceAuth') .onClick(() => { + this.handleCancel(); AuthUtils.getInstance() .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypePin]); - this.handleCancel(); this.textValue = ''; }) .backgroundColor(Color.Transparent) @@ -1189,9 +1189,9 @@ export default struct FaceAuth { Button($r('app.string.unified_authwidget_cancel'), { stateEffect: true }) .id('cancelBtnAllFace') .onClick(() => { + this.handleCancel(); AuthUtils.getInstance() .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFace]); - this.handleCancel(); }) .backgroundColor(Color.Transparent) .height($r('app.float.btn_height')) @@ -1216,9 +1216,9 @@ export default struct FaceAuth { .fontWeight(FontWeight.Medium) .backgroundColor(Color.Transparent) .onClick(() => { + this.handleCancel(); AuthUtils.getInstance() .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFace]); - this.handleCancel(); }) }.width(Constants.halfContainerWidth) @@ -1230,10 +1230,10 @@ export default struct FaceAuth { Column() { Button((AppStorage.get('wantParams') as WantParams)?.navigationButtonText as string) .onClick(() => { - AuthUtils.getInstance() - .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFace]); AuthUtils.getInstance() .sendNotice(Constants.noticeEventUserNavigation, [Constants.noticeTypeFace]); + AuthUtils.getInstance() + .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFace]); (AppStorage.get('session') as UIExtensionContentSession)?.terminateSelf(); }) .margin({ right: $r('app.float.content_padding') }) diff --git a/entry/src/main/ets/pages/components/FingerprintAuth.ets b/entry/src/main/ets/pages/components/FingerprintAuth.ets index 8102f7f9c9bd009eaa1f9ce3255b09b1f1e73b76..5908716b75ff1943c6cd9428880c29478e8a5138 100644 --- a/entry/src/main/ets/pages/components/FingerprintAuth.ets +++ b/entry/src/main/ets/pages/components/FingerprintAuth.ets @@ -187,8 +187,8 @@ export default struct FingerprintAuth { } } if (remainAttempts === AUTH_LOCK && lockoutDuration) { - AuthUtils.getInstance().sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFinger]); AuthUtils.getInstance().sendNotice(Constants.noticeEventCancel, [Constants.noticeTypeFinger]); + AuthUtils.getInstance().sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFinger]); this.countTime(lockoutDuration); this.textValue = ''; this.toPin(); @@ -241,21 +241,21 @@ export default struct FingerprintAuth { } else { this.state = SIX_PIN; } - AuthUtils.getInstance().sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFinger]); AuthUtils.getInstance().sendNotice(Constants.noticeEventCancel, [Constants.noticeTypeFinger]); + AuthUtils.getInstance().sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFinger]); this.toPin(); } if ((AppStorage.get('wantParams') as WantParams)?.navigationButtonText as string && this.skipLockedBiometricAuth) { - AuthUtils.getInstance().sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFinger]); AuthUtils.getInstance() .sendNotice(Constants.noticeEventUserNavigation, [Constants.noticeTypeFinger]); + AuthUtils.getInstance().sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFinger]); (AppStorage.get('session') as UIExtensionContentSession)?.terminateSelf(); return; } if (this.dialogType === DialogType.FINGER && this.skipLockedBiometricAuth) { - AuthUtils.getInstance().sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFinger]); AuthUtils.getInstance().sendNotice(Constants.noticeEventCancel, [Constants.noticeTypeFinger]); + AuthUtils.getInstance().sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFinger]); (AppStorage.get('session') as UIExtensionContentSession)?.terminateSelf(); return; } @@ -430,9 +430,9 @@ export default struct FingerprintAuth { .fontWeight(FontWeight.Medium) .backgroundColor(Color.Transparent) .onClick(() => { + this.handleCancel(); AuthUtils.getInstance() .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFinger]); - this.handleCancel(); this.textValue = ''; }) }.width(Constants.halfContainerWidth) @@ -469,9 +469,9 @@ export default struct FingerprintAuth { Button($r('app.string.unified_authwidget_cancel'), { stateEffect: true }) .id('cancelDefBtnState3FingerprintAuth') .onClick(() => { + this.handleCancel(); AuthUtils.getInstance() .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFinger]); - this.handleCancel(); }) .backgroundColor(Color.Transparent) .height($r('app.float.btn_height')) @@ -497,9 +497,9 @@ export default struct FingerprintAuth { .fontWeight(FontWeight.Medium) .backgroundColor(Color.Transparent) .onClick(() => { + this.handleCancel(); AuthUtils.getInstance() .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFinger]); - this.handleCancel(); }) }.width(Constants.halfContainerWidth) @@ -511,10 +511,10 @@ export default struct FingerprintAuth { Column() { Button((AppStorage.get('wantParams') as WantParams)?.navigationButtonText as string) .onClick(() => { - AuthUtils.getInstance() - .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFinger]); AuthUtils.getInstance() .sendNotice(Constants.noticeEventUserNavigation, [Constants.noticeTypeFinger]); + AuthUtils.getInstance() + .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFinger]); (AppStorage.get('session') as UIExtensionContentSession)?.terminateSelf(); }) .margin({ right: $r('app.float.content_padding') }) @@ -550,9 +550,9 @@ export default struct FingerprintAuth { .fontWeight(FontWeight.Medium) .backgroundColor(Color.Transparent) .onClick(() => { + this.handleCancel(); AuthUtils.getInstance() .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypePin]); - this.handleCancel(); this.textValue = ''; }) }.width(Constants.halfContainerWidth) @@ -590,9 +590,9 @@ export default struct FingerprintAuth { Button($r('app.string.unified_authwidget_cancel'), { stateEffect: true }) .id('cancelState6FingerprintAuth') .onClick(() => { + this.handleCancel(); AuthUtils.getInstance() .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypePin]); - this.handleCancel(); this.textValue = ''; }) .backgroundColor(Color.Transparent) @@ -635,9 +635,9 @@ export default struct FingerprintAuth { .fontWeight(FontWeight.Medium) .backgroundColor(Color.Transparent) .onClick(() => { + this.handleCancel(); AuthUtils.getInstance() .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypePin]); - this.handleCancel(); this.textValue = ''; }) }.width(Constants.halfContainerWidth) @@ -685,9 +685,9 @@ export default struct FingerprintAuth { Button($r('app.string.unified_authwidget_cancel'), { stateEffect: true }) .id('sixPassCancel') .onClick(() => { + this.handleCancel(); AuthUtils.getInstance() .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypePin]); - this.handleCancel(); this.textValue = ''; }) .backgroundColor(Color.Transparent) @@ -763,9 +763,9 @@ export default struct FingerprintAuth { .fontWeight(FontWeight.Medium) .backgroundColor(Color.Transparent) .onClick(() => { + this.handleCancel(); AuthUtils.getInstance() .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFinger]); - this.handleCancel(); this.textValue = ''; }) }.width(Constants.halfContainerWidth) @@ -938,9 +938,9 @@ export default struct FingerprintAuth { Button($r('app.string.unified_authwidget_cancel'), { stateEffect: true }) .id('cancelDefBtnState1FingerprintAuth') .onClick(() => { + this.handleCancel(); AuthUtils.getInstance() .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFinger]); - this.handleCancel(); }) .backgroundColor(Color.Transparent) .height($r('app.float.btn_height')) @@ -966,9 +966,9 @@ export default struct FingerprintAuth { .fontWeight(FontWeight.Medium) .backgroundColor(Color.Transparent) .onClick(() => { + this.handleCancel(); AuthUtils.getInstance() .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFinger]); - this.handleCancel(); }) }.width(Constants.halfContainerWidth) @@ -980,10 +980,10 @@ export default struct FingerprintAuth { Column() { Button(((AppStorage.get('wantParams') as WantParams)?.navigationButtonText as string)) .onClick(() => { - AuthUtils.getInstance() - .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFinger]); AuthUtils.getInstance() .sendNotice(Constants.noticeEventUserNavigation, [Constants.noticeTypeFinger]); + AuthUtils.getInstance() + .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFinger]); (AppStorage.get('session') as UIExtensionContentSession)?.terminateSelf(); }) .id('navigationButtonTextFingerprintAuth') @@ -1028,10 +1028,10 @@ export default struct FingerprintAuth { .fontSize($r('sys.float.ohos_id_text_size_body1')) .fontWeight(FontWeight.Medium) .onClick(() => { - AuthUtils.getInstance() - .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFinger]); AuthUtils.getInstance() .sendNotice(Constants.noticeEventUserNavigation, [Constants.noticeTypeFinger]); + AuthUtils.getInstance() + .sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypeFinger]); (AppStorage.get('session') as UIExtensionContentSession)?.terminateSelf(); }) } diff --git a/entry/src/main/ets/pages/components/PasswordAuth.ets b/entry/src/main/ets/pages/components/PasswordAuth.ets index 8721c0046c806b79a158b1068615f2998df03a0e..fb3673ef3331d1b36ad19dc91736f1577c63ee29 100644 --- a/entry/src/main/ets/pages/components/PasswordAuth.ets +++ b/entry/src/main/ets/pages/components/PasswordAuth.ets @@ -84,7 +84,6 @@ export default struct PasswordAuth { return; } if (payload.result === 0) { - AuthUtils.getInstance().sendNotice(Constants.noticeEventWidgetReleased, [Constants.noticeTypePin]); (AppStorage.get('session') as UIExtensionContentSession)?.terminateSelf(); } this.inputValue = ' ';