openharmony/applications_auth_widget
1
0
Fork 0
mirror of https://github.com/openharmony/applications_auth_widget.git synced 2026-07-19 22:03:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

静态告警修复

Browse Source 
Signed-off-by: sizhenzhen <sizhenzhen@h-partners.com>
This commit is contained in:
sizhenzhen
2026-03-12 10:39:37 +08:00
parent cb8b13d1dc
commit 3891cf6547
7 changed files with 23 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
entry/src/main/ets/common/components/FullScreen.ets
+1 -3
View File
@@ -21,7 +21,6 @@ import FuncUtils from '../utils/FuncUtils';
import LogUtils from '../utils/LogUtils';
import TimeUtils from '../utils/TimeUtils';
import NumKeyBoard from './NumkeyBoard';
import common from '@ohos.app.ability.common';
import UIExtensionContentSession from '@ohos.app.ability.UIExtensionContentSession';
const TAG = 'FullScreen';
@@ -292,8 +291,7 @@ export default struct FullScreen {
let promptText: string = '';
let freezingMillisecond = freezingTime;
if (freezingMillisecond > 0) {
promptText =
TimeUtils.getFreezingTimeNm(freezingMillisecond, (AppStorage.get('context') as common.ExtensionContext));
promptText = TimeUtils.getFreezingTimeNm(freezingMillisecond);
promptText = PLEASE_TRY + promptText + TRY_AGAIN;
setTimeout((t: number): void => this.countdown(t), INTERVAL, freezingTime - INTERVAL);
} else {
entry/src/main/ets/common/utils/TimeUtils.ts
+5 -5
View File
@@ -13,13 +13,13 @@
* limitations under the License.
*/
import common from '@ohos.app.ability.common';
import FuncUtils from './FuncUtils';
export class TimeUtils {
getFreezingTimeNm(freezingMillisecond: number, context: common.ExtensionContext): string {
const HOUR_NM = context?.resourceManager?.getStringSync($r('app.string.unified_authwidget_hour').id);
const MINUTE_NM = context?.resourceManager?.getStringSync($r('app.string.unified_authwidget_minutes').id);
const SECOND_NM = context?.resourceManager?.getStringSync($r('app.string.unified_authwidget_seconds').id);
getFreezingTimeNm(freezingMillisecond: number): string {
const HOUR_NM = FuncUtils.getResourceString($r('app.string.unified_authwidget_hour').id);
const MINUTE_NM = FuncUtils.getResourceString($r('app.string.unified_authwidget_minutes').id);
const SECOND_NM = FuncUtils.getResourceString($r('app.string.unified_authwidget_seconds').id);
const ONE_MINUTE = 60;
const RATE = 1000;
let minute = Math.floor(freezingMillisecond / (ONE_MINUTE * RATE));
entry/src/main/ets/pages/Index.ets
+1 -3
View File
@@ -25,7 +25,6 @@ import CustomPassword from './components/CustomPassword';
import FaceAuth from './components/FaceAuth';
import FingerprintAuth from './components/FingerprintAuth';
import PasswordAuth from './components/PasswordAuth';
import common from '@ohos.app.ability.common';
const DEFAULT_SIZE = 72;
const FIVE_SECOND = 5000;
@@ -262,8 +261,7 @@ struct Index {
if (this.isLandscape && this.underFingerPrint) {
Flex({ direction: FlexDirection.Row, justifyContent: FlexAlign.Center, alignItems: ItemAlign.End }) {
Column() {
Text((AppStorage.get('context') as common.ExtensionContext)?.resourceManager
.getStringSync($r('app.string.unified_authwidget_tip_verify_in_portrait_mode').id))
Text(FuncUtils.getResourceString($r('app.string.unified_authwidget_tip_verify_in_portrait_mode').id))
.draggable(false)
.fontColor($r('sys.color.ohos_id_color_text_primary_contrary'))
.fontSize($r('sys.float.ohos_id_text_size_body2'))
entry/src/main/ets/pages/components/FaceAuth.ets
+1 -2
View File
@@ -84,8 +84,7 @@ export default struct FaceAuth {
let promptText: string = '';
let freezingMillisecond = freezingTime;
if (freezingMillisecond > 0) {
promptText =
TimeUtils.getFreezingTimeNm(freezingMillisecond, (AppStorage.get('context') as common.ExtensionContext));
promptText = TimeUtils.getFreezingTimeNm(freezingMillisecond);
promptText = FuncUtils.getResourceString($r('app.string.unified_authwidget_many_failures').id) + promptText + TRY_AGAIN;
setTimeout((t: number): void => this.countTime(t), INTERVAL, freezingTime - INTERVAL);
} else {
entry/src/main/ets/pages/components/FingerprintAuth.ets
+1 -2
View File
@@ -342,8 +342,7 @@ export default struct FingerprintAuth {
let freezingMillisecond = freezingTime;
// O: freezing FINISH
if (freezingMillisecond > 0) {
promptText =
TimeUtils.getFreezingTimeNm(freezingMillisecond, (AppStorage.get('context') as common.ExtensionContext));
promptText = TimeUtils.getFreezingTimeNm(freezingMillisecond);
promptText = FuncUtils.getResourceString($r('app.string.unified_authwidget_many_failures').id) + promptText + TRY_AGAIN;
setTimeout((t: number): void => this.countTime(t), INTERVAL, freezingTime - INTERVAL);
} else {
entry/src/main/ets/pages/components/PasswordAuth.ets
+9 -14
View File
@@ -15,7 +15,6 @@
import account_osAccount from '@ohos.account.osAccount';
import UIExtensionContentSession from '@ohos.app.ability.UIExtensionContentSession';
import common from '@ohos.app.ability.common';
import PassWord from '../../common/components/PassWord';
import SixPassword from '../../common/components/SixPassword';
import AuthUtils from '../../common/utils/AuthUtils';
@@ -54,22 +53,18 @@ export default struct PasswordAuth {
const payload: CmdData = item.payload;
if (payload.type === Constants.noticeTypePin) {
if (payload.result && payload.result === Constants.authResultPinExpired) {
this.inputValue = (AppStorage.get('context') as common.ExtensionContext)?.resourceManager
.getStringSync($r('app.string.unified_authwidget_hint_pwd_error').id);
this.inputValue = FuncUtils.getResourceString($r('app.string.unified_authwidget_hint_pwd_error').id);
this.textValue = '';
return;
}
if (payload.remainAttempts && payload.remainAttempts < MAX_FAIL_TIMES) {
this.inputValue = (AppStorage.get('context') as common.ExtensionContext)?.resourceManager
.getStringSync($r('app.string.unified_authwidget_hint_pwd_error').id);
this.inputValue = FuncUtils.getResourceString($r('app.string.unified_authwidget_hint_pwd_error').id);
this.textValue = '';
// pin auth Remaining number
if (payload.remainAttempts < HINT_TIMES_BY_FAIL_LESS) {
this.inputValue = (AppStorage.get('context') as common.ExtensionContext)?.resourceManager
.getStringSync($r('app.string.unified_authwidget_pwd_error_can_try').id) +
payload.remainAttempts + (AppStorage.get('context') as common.ExtensionContext)?.resourceManager
.getStringSync($r('app.string.unified_authwidget_frequency').id);
this.inputValue = FuncUtils.getResourceString($r('app.string.unified_authwidget_pwd_error_can_try').id) +
payload.remainAttempts + FuncUtils.getResourceString($r('app.string.unified_authwidget_frequency').id);
}
if (num === 'first') {
this.inputValue = ' ';
@@ -129,14 +124,14 @@ export default struct PasswordAuth {
}
countTime(freezingTime: number): void {
const TRY_AGAIN = (AppStorage.get('context') as common.ExtensionContext)?.resourceManager.getStringSync($r('app.string.unified_authwidget_postretry').id);
const TRY_AGAIN = FuncUtils.getResourceString($r('app.string.unified_authwidget_postretry').id);
let promptText: string = '';
let freezingMillisecond = freezingTime;
if (freezingMillisecond > 0) {
promptText = TimeUtils.getFreezingTimeNm(freezingMillisecond, (AppStorage.get('context') as common.ExtensionContext));
promptText = (AppStorage.get('context') as common.ExtensionContext)?.resourceManager
.getStringSync($r('app.string.unified_authwidget_many_failures').id) + promptText + TRY_AGAIN;
setTimeout((t: number):void => this.countTime(t), INTERVAL, freezingTime - INTERVAL);
promptText = TimeUtils.getFreezingTimeNm(freezingMillisecond);
promptText =
FuncUtils.getResourceString($r('app.string.unified_authwidget_many_failures').id) + promptText + TRY_AGAIN;
setTimeout((t: number): void => this.countTime(t), INTERVAL, freezingTime - INTERVAL);
} else {
promptText = ' ';
this.isEdit = true;
entry/src/ohosTest/ets/test/jsunit/FuncUtils.test.ets
+5 -6
View File
@@ -20,7 +20,6 @@ import FuncUtils from '../../../../main/ets/common/utils/FuncUtils';
import LogUtils from '../../../../main/ets/common/utils/LogUtils';
import TimeUtils from '../../../../main/ets/common/utils/TimeUtils';
import WindowPrivacyUtils from '../../../../main/ets/common/utils/WindowPrivacyUtils';
import common from '@ohos.app.ability.common';
const TAG = 'FuncUtilsTest';
@@ -82,13 +81,13 @@ export default function FuncUtilsTest() {
done();
})
it('judgmentOverflowFunc_test', 0, function (done) {
it('judgmentOverflowFunc_test', 0, (done: Function) => {
FuncUtils.judgmentOverflow(Number.POSITIVE_INFINITY);
FuncUtils.judgmentOverflow(Number.NEGATIVE_INFINITY);
done();
})
it('sendNoticeFunc_test', 0, async function (done) {
it('sendNoticeFunc_test', 0, async (done: Function) => {
AuthUtils.getInstance().sendNotice('EVENT_AUTH_TYPE_READY', ['pin']);
AuthUtils.getInstance().sendNotice('EVENT_AUTH_TYPE_START', ['pin']);
done();
@@ -103,9 +102,9 @@ export default function FuncUtilsTest() {
done();
})
it('getFreezingTimeNmFunc_test', 0, async function (done) {
TimeUtils.getFreezingTimeNm(10000, globalThis.context);
TimeUtils.getFreezingTimeNm(100000, globalThis.context);
it('getFreezingTimeNmFunc_test', 0, async (done: Function) => {
TimeUtils.getFreezingTimeNm(10000);
TimeUtils.getFreezingTimeNm(100000);
done();
})