From 4a1993ac5d2b9347dbc14350a36c47916a3e9c1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BF=9E=E6=BC=AA?= Date: Mon, 12 May 2025 21:50:38 +0800 Subject: [PATCH] =?UTF-8?q?asweb=20menubar=E6=97=A5=E5=BF=97=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 连漪 --- .../interfaces/atomicserviceweb.js | 86 ++++++++----------- atomicserviceweb/source/atomicserviceweb.ets | 82 ++++++++---------- customappbar/interfaces/custom_app_bar.js | 10 ++- .../interfaces/custom_app_bar_forpc.js | 11 +-- customappbar/source/custom_app_bar.ets | 9 +- customappbar/source/custom_app_bar_forpc.ets | 11 +-- 6 files changed, 95 insertions(+), 114 deletions(-) diff --git a/atomicserviceweb/interfaces/atomicserviceweb.js b/atomicserviceweb/interfaces/atomicserviceweb.js index 0e948d9..18203e2 100644 --- a/atomicserviceweb/interfaces/atomicserviceweb.js +++ b/atomicserviceweb/interfaces/atomicserviceweb.js @@ -52,19 +52,21 @@ const authentication = globalThis.requireNapi('core.authentication', false, '', const paymentService = globalThis.requireNapi('core.payment.paymentService', false, '', 'hms'); const atomicServiceWebNapi = requireInternal('atomicservice.AtomicServiceWeb'); const hiAppEvent = globalThis.requireNapi('hiviewdfx.hiAppEvent'); +const hilog = requireNapi('hilog'); let atomicBasicEngine = null; +const LOG_TAG = 'AtomicServiceWeb'; function loadAtomicBasicEngine() { try { import('@hms:atomicservicedistribution.atomicbasicengine').then((z10) => { - console.log('AtomicServiceWeb loadAtomicBasicEngine success'); + hilog.info(0x3900, LOG_TAG, 'loadAtomicBasicEngine success'); atomicBasicEngine = z10; }).catch((y10) => { - console.error('AtomicServiceWeb loadAtomicBasicEngine error, message: ' + y10.message); + hilog.error(0x3900, LOG_TAG, `loadAtomicBasicEngine error, message: ${x10.message}`); }); } catch (x10) { - console.error('AtomicServiceWeb loadAtomicBasicEngine error, message: ' + x10.message); + hilog.error(0x3900, LOG_TAG, `loadAtomicBasicEngine error, message: ${x10.message}`); } } @@ -305,11 +307,11 @@ export class AtomicServiceWeb extends ViewPU { try { let h2 = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_APPLICATION); if (h2?.appInfo?.appProvisionType === 'debug') { - console.log(`AtomicServiceWeb setWebDebuggingAccess`); + hilog.info(0x3900, LOG_TAG, `setWebDebuggingAccess`); webView.WebviewController.setWebDebuggingAccess(true); } } catch (d2) { - console.error(`AtomicServiceWeb set Web Debug Mode failed, code is ${d2.code}, message is ${d2.message}`); + hilog.error(0x3900, LOG_TAG, `set Web Debug Mode failed, code is ${d2.code}, message is ${d2.message}`); } this.initDomainCheckLog(); HiAnalyticsUtil.reportComponentEvent(); @@ -347,7 +349,7 @@ export class AtomicServiceWeb extends ViewPU { try { this.onControllerAttached(); } catch (y10) { - console.error(`AtomicServiceWeb onControllerAttached failed, code is ${y10.code}, message is ${y10.message}`); + hilog.error(0x3900, LOG_TAG, `onControllerAttached failed, code is ${y10.code}, message is ${y10.message}`); } } }); @@ -360,7 +362,7 @@ export class AtomicServiceWeb extends ViewPU { try { return this.onLoadIntercept(m7); } catch (u7) { - console.error(`AtomicServiceWeb onLoadIntercept failed, code is ${u7.code}, message is ${u7.message}`); + hilog.error(0x3900, LOG_TAG, `onLoadIntercept failed, code is ${u7.code}, message is ${u7.message}`); return true; } } @@ -374,7 +376,7 @@ export class AtomicServiceWeb extends ViewPU { try { j6 && j6(e6); } catch (k7) { - console.error(`AtomicServiceWeb ${q5} failed, code is ${k7.code}, message is ${k7.message}`); + hilog.error(0x3900, LOG_TAG, `${q5} failed, code is ${k7.code}, message is ${k7.message}`); } } @@ -384,7 +386,7 @@ export class AtomicServiceWeb extends ViewPU { JAVA_SCRIPT_PROXY_API_NAME_LIST); } catch (d10) { let e10 = d10; - console.error(`AtomicServiceWeb registerJavaScriptProxy failed, code is ${e10.code}, message is ${e10.message}`); + hilog.error(0x3900, LOG_TAG, `registerJavaScriptProxy failed, code is ${e10.code}, message is ${e10.message}`); } } @@ -417,11 +419,11 @@ export class AtomicServiceWeb extends ViewPU { let t1 = 'webView'; q1 = this.cutUrl(q1); let res = atomicServiceWebNapi.checkUrl(w1, t1, q1); - console.debug(`AtomicServiceWeb checkUrl ret=${res === 0} url=${q1}`); + hilog.debug(0x3900, LOG_TAG, `AtomicServiceWeb checkUrl ret=${res === 0} url=${q1}`); return res === 0; } catch (j2) { let n2 = j2; - console.error(`AtomicServiceWeb checkUrl failed, code is ${n2.code}, message is ${n2.message}`); + hilog.error(0x3900, LOG_TAG, `checkUrl failed, code is ${n2.code}, message is ${n2.message}`); return false; } } @@ -430,9 +432,9 @@ export class AtomicServiceWeb extends ViewPU { try { let a9 = this.getAppId(); let b9 = this.isCheckDomainBlockListAvailable(); - console.debug('AtomicServiceWeb initDomainCheckLog appId=' + a9 + ' checkDomainBlockListAvailable=' + b9); + hilog.debug(0x3900, LOG_TAG, `initDomainCheckLog appId= ${a9} checkDomainBlockListAvailable = ${b9}`); } catch (z8) { - console.error('AtomicServiceWeb initDomainCheckLog error, message: ' + z8.message); + hilog.error(0x3900, LOG_TAG, `initDomainCheckLog error, message: ${z8.message}`); } } @@ -485,16 +487,16 @@ export class AtomicServiceWeb extends ViewPU { checkUrlNew(n8) { let o8 = this.getAppId(); if (!o8) { - console.error('AtomicServiceWeb checkUrlNew error, appId is invalid'); + hilog.error(0x3900, LOG_TAG, `checkUrlNew error, appId is invalid`); return false; } try { let q8 = this.cutUrl(n8); let r8 = atomicBasicEngine.default.checkDomainBlockList(q8, o8); - console.debug(`AtomicServiceWeb checkUrlNew ret=${!r8} url=${q8}`); + hilog.debug(0x3900, LOG_TAG, `checkUrlNew ret=${!r8} url=${q8}`); return !r8; } catch (p8) { - console.error(`AtomicServiceWeb checkUrlNew error, code: ${p8.code}, message: ${p8.message}`); + hilog.error(0x3900, LOG_TAG, `checkUrlNew error, code: ${p8.code}, message: ${p8.message}`); return true; } } @@ -521,10 +523,10 @@ export class AtomicServiceWeb extends ViewPU { try { let k8 = i8.substring(TEL_PROTOCOL.length); call.makeCall(k8).catch((l8) => { - console.error(`AtomicServiceWeb openMakeCall error, code: ${l8.code}, message: ${l8.message}`); + hilog.error(0x3900, LOG_TAG, `openMakeCall error, code: ${l8.code}, message: ${l8.message}`); }); } catch (j8) { - console.error(`AtomicServiceWeb openMakeCall error, code: ${j8.code}, message: ${j8.message}`); + hilog.error(0x3900, LOG_TAG, `openMakeCall error, code: ${j8.code}, message: ${j8.message}`); } } @@ -537,10 +539,10 @@ export class AtomicServiceWeb extends ViewPU { action: WANT_ACTION_SEND_TO_DATA, uri: f8 }).catch((h8) => { - console.error(`AtomicServiceWeb openSendMail error, code: ${h8.code}, message: ${h8.message}`); + hilog.error(0x3900, LOG_TAG, `openSendMail error, code: ${h8.code}, message: ${h8.message}`); }); } catch (g8) { - console.error(`AtomicServiceWeb openSendMail error, code: ${g8.code}, message: ${g8.message}`); + hilog.error(0x3900, LOG_TAG, `openSendMail error, code: ${g8.code}, message: ${g8.message}`); } } @@ -559,13 +561,13 @@ export class AtomicServiceWeb extends ViewPU { } let q8 = this.getAppId(); if (!q8) { - console.error('AtomicServiceWeb checkPermissionRequest error, appId is invalid'); + hilog.error(0x3900, LOG_TAG, `checkPermissionRequest error, appId is invalid`); return false; } for (let r8 of p8) { let s8 = WEB_PERMISSIONS[r8]; if (!s8) { - console.error('AtomicServiceWeb checkPermissionRequest error, permission is not support'); + hilog.error(0x3900, LOG_TAG, `checkPermissionRequest error, permission is not support`); return false; } if (!this.isPermissionUserGranted(s8)) { @@ -588,12 +590,12 @@ export class AtomicServiceWeb extends ViewPU { let n8 = abilityAccessCtrl.createAtManager() .checkAccessTokenSync(m8, j8); if (n8 !== abilityAccessCtrl.GrantStatus.PERMISSION_GRANTED) { - console.error(`AtomicServiceWeb isPermissionGranted permission ${j8} is not grant`); + hilog.error(0x3900, LOG_TAG, `isPermissionGranted permission ${j8} is not grant`); return false; } return true; } catch (k8) { - console.error(`AtomicServiceWeb isPermissionGranted error, code: ${k8.code}, message: ${k8.message}`); + hilog.error(0x3900, LOG_TAG, `isPermissionGranted error, code: ${k8.code}, message: ${k8.message}`); return false; } } @@ -601,15 +603,15 @@ export class AtomicServiceWeb extends ViewPU { isPermissionWhiteListAllow(f8, g8) { if (!atomicBasicEngine || !atomicBasicEngine.default || typeof atomicBasicEngine.default.checkAtomicServiceAllow !== 'function') { - console.error('AtomicServiceWeb isPermissionRequestAllow error, checkAtomicServiceAllow is not available'); + hilog.error(0x3900, LOG_TAG, `isPermissionRequestAllow error, checkAtomicServiceAllow is not available`); return false; } try { let i8 = atomicBasicEngine.default.checkAtomicServiceAllow(f8, g8, TYPE_AS_WEB); - console.debug(`AtomicServiceWeb isPermissionRequestAllow ret=${i8} permission=${g8}`); + hilog.debug(0x3900, LOG_TAG, `isPermissionRequestAllow ret=${i8} permission=${g8}`); return i8; } catch (h8) { - console.error(`AtomicServiceWeb isPermissionRequestAllow error, code: ${h8.code}, message: ${h8.message}`); + hilog.error(0x3900, LOG_TAG, `isPermissionRequestAllow error, code: ${h8.code}, message: ${h8.message}`); return false; } } @@ -737,7 +739,7 @@ class AtomicService { try { p9?.callback && p9?.callback(undefined, o9); } catch (f3) { - this.consoleError(`callback error, code is ${f3.code}, message is ${f3.message}`); + hilog.error(0x3900, LOG_TAG, `callback error, code is ${f3.code}, message is ${f3.message}`); } } @@ -747,7 +749,7 @@ class AtomicService { n9?.callback && n9?.callback(new AsError(m9.code ? m9.code : SYSTEM_INTERNAL_ERROR.code, m9.message ? m9.message : SYSTEM_INTERNAL_ERROR.message)); } catch (a3) { - this.consoleError(`callback error, code is ${a3.code}, message is ${a3.message}`); + hilog.error(0x3900, LOG_TAG, `callback error, code is ${a3.code}, message is ${a3.message}`); } } @@ -756,26 +758,10 @@ class AtomicService { try { l9?.callback && l9?.callback(k9); } catch (u2) { - this.consoleError(`callback error, code is ${u2.code}, message is ${u2.message}`); + hilog.error(0x3900, LOG_TAG, `callback error, code is ${u2.code}, message is ${u2.message}`); } } - consoleLog(j9) { - if (LOG_ENABLE) { - console.log(`${LOG_PREFIX} ${j9}`); - } - } - - consoleError(i9) { - if (LOG_ENABLE) { - console.error(`${LOG_PREFIX} ${i9}`); - } - } - - logOptions(g9, h9) { - this.consoleLog(`${g9} options=${JSON.stringify(h9)}`); - } - checkParamRequired(d9, e9, f9) { if (e9 === undefined || e9 === null || e9 === '') { this.errorWithCodeAndMsg(new AsError(PARAM_REQUIRED_ERROR_CODE, `Param ${d9} is required.`), f9); @@ -889,7 +875,7 @@ class AtomicService { try { this.onMessage(new OnMessageEvent(this.messageDataList)); } catch (q2) { - this.consoleError(`onMessage failed, code is ${q2.code}, message is ${q2.message}`); + hilog.error(0x3900, LOG_TAG, `onMessage failed, code is ${q2.code}, message is ${q2.message}`); } this.messageDataList = []; } @@ -1673,7 +1659,7 @@ class HiAnalyticsUtil { * @param content 打点参数json字符串 */ static writeEndEvent(time, content) { - console.info(`writeEndEvent -> time: ${time} ,content: ${content} `); + hilog.info(0x3900, LOG_TAG, `writeEndEvent -> time: ${time} ,content: ${content} `); let event = { domain: 'api_diagnostic', name: 'api_exec_end', @@ -1762,7 +1748,7 @@ class HiAnalyticsUtil { HiAnalyticsUtil.writeEndEvent(new Date().getTime(), content); } catch (err) { - console.error(`reportApiEvent -> reportApiEvent error, message: ${err.message}`); + hilog.error(0x3900, LOG_TAG, `reportApiEvent -> reportApiEvent error, message: ${err.message}`); } } /** @@ -1784,7 +1770,7 @@ class HiAnalyticsUtil { HiAnalyticsUtil.writeEndEvent(new Date().getTime(), content); } catch (err) { - console.error(`reportComponentEvent -> reportComponentEvent error, message: ${err.message}`); + hilog.error(0x3900, LOG_TAG, `reportComponentEvent -> reportComponentEvent error, message: ${err.message}`); } } } diff --git a/atomicserviceweb/source/atomicserviceweb.ets b/atomicserviceweb/source/atomicserviceweb.ets index 7772793..bd78f9d 100644 --- a/atomicserviceweb/source/atomicserviceweb.ets +++ b/atomicserviceweb/source/atomicserviceweb.ets @@ -34,7 +34,9 @@ import { call } from '@kit.TelephonyKit'; import { authentication } from '@kit.AccountKit'; import { paymentService } from '@kit.PaymentKit'; import { hiAppEvent } from '@kit.PerformanceAnalysisKit'; +import { hilog } from '@kit.PerformanceAnalysisKit'; +const LOG_TAG: string = 'AtomicServiceWeb'; let atomicBasicEngine: ESObject | null = null; /** @@ -43,13 +45,13 @@ let atomicBasicEngine: ESObject | null = null; function loadAtomicBasicEngine(): void { try { import('@hms.atomicservicedistribution.atomicbasicengine').then((ns: ESObject) => { - console.log('AtomicServiceWeb loadAtomicBasicEngine success'); + hilog.info(0x3900, LOG_TAG, 'loadAtomicBasicEngine success'); atomicBasicEngine = ns; }).catch((err: BusinessError) => { - console.error('AtomicServiceWeb loadAtomicBasicEngine error, message: ' + err.message); + hilog.error(0x3900, LOG_TAG, `loadAtomicBasicEngine error, message: ${err.message}`); }); } catch (err) { - console.error('AtomicServiceWeb loadAtomicBasicEngine error, message: ' + err.message); + hilog.error(0x3900, LOG_TAG, `loadAtomicBasicEngine error, message: ${err.message}`); } } @@ -186,11 +188,11 @@ export struct AtomicServiceWeb { let bundleInfo: bundleManager.BundleInfo = bundleManager.getBundleInfoForSelfSync( bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_APPLICATION); if (bundleInfo?.appInfo?.appProvisionType === 'debug') { - console.log(`AtomicServiceWeb setWebDebuggingAccess`); + hilog.info(0x3900, LOG_TAG, `setWebDebuggingAccess`); webView.WebviewController.setWebDebuggingAccess(true); } } catch (err) { - console.error(`AtomicServiceWeb set Web Debug Mode failed, code is ${err.code}, message is ${err.message}`); + hilog.error(0x3900, LOG_TAG, `set Web Debug Mode failed, code is ${err.code}, message is ${err.message}`); } this.initDomainCheckLog(); @@ -231,7 +233,7 @@ export struct AtomicServiceWeb { try { this.onControllerAttached(); } catch (error) { - console.error(`AtomicServiceWeb onControllerAttached failed, code is ${error.code}, message is ${error.message}`); + hilog.error(0x3900, LOG_TAG, `onControllerAttached failed, code is ${error.code}, message is ${error.message}`); } } }) @@ -244,7 +246,7 @@ export struct AtomicServiceWeb { try { return this.onLoadIntercept(event); } catch (error) { - console.error(`AtomicServiceWeb onLoadIntercept failed, code is ${error.code}, message is ${error.message}`); + hilog.error(0x3900, LOG_TAG, `onLoadIntercept failed, code is ${error.code}, message is ${error.message}`); return true; } } @@ -259,7 +261,7 @@ export struct AtomicServiceWeb { try { callback && callback(event); } catch (error) { - console.error(`AtomicServiceWeb ${method} failed, code is ${error.code}, message is ${error.message}`); + hilog.error(0x3900, LOG_TAG, `${method} failed, code is ${error.code}, message is ${error.message}`); } } @@ -269,7 +271,7 @@ export struct AtomicServiceWeb { JAVA_SCRIPT_PROXY_API_NAME_LIST); } catch (error) { let e: BusinessError = error as BusinessError; - console.error(`AtomicServiceWeb registerJavaScriptProxy failed, code is ${e.code}, message is ${e.message}`); + hilog.error(0x3900, LOG_TAG, `registerJavaScriptProxy failed, code is ${e.code}, message is ${e.message}`); } } @@ -308,10 +310,10 @@ export struct AtomicServiceWeb { try { let appId: string | null = this.getAppId(); let checkDomainBlockListAvailable: boolean = this.isCheckDomainBlockListAvailable(); - console.debug('AtomicServiceWeb initDomainCheckLog appId=' + appId + ' checkDomainBlockListAvailable=' + - checkDomainBlockListAvailable); + hilog.debug(0x3900, LOG_TAG, `initDomainCheckLog appId= ${appId} checkDomainBlockListAvailable = + ${checkDomainBlockListAvailable}`); } catch (err) { - console.error('AtomicServiceWeb initDomainCheckLog error, message: ' + err.message); + hilog.error(0x3900, LOG_TAG, `initDomainCheckLog error, message: ${err.message}`); } } @@ -382,16 +384,16 @@ export struct AtomicServiceWeb { checkUrlNew(url: string): boolean { let appId: string | null = this.getAppId(); if (!appId) { - console.error('AtomicServiceWeb checkUrlNew error, appId is invalid'); + hilog.error(0x3900, LOG_TAG, `checkUrlNew error, appId is invalid`); return false; } try { let shortUrl: string = this.cutUrl(url); let isInDomainBlockList: boolean = atomicBasicEngine.default.checkDomainBlockList(shortUrl, appId); - console.debug(`AtomicServiceWeb checkUrlNew ret=${!isInDomainBlockList} url=${shortUrl}`); + hilog.debug(0x3900, LOG_TAG, `checkUrlNew ret=${!isInDomainBlockList} url=${shortUrl}`); return !isInDomainBlockList; } catch (err) { - console.error(`AtomicServiceWeb checkUrlNew error, code: ${err.code}, message: ${err.message}`); + hilog.error(0x3900, LOG_TAG, `checkUrlNew error, code: ${err.code}, message: ${err.message}`); // 黑名单接口调用失败，放通管控 return true; } @@ -427,10 +429,10 @@ export struct AtomicServiceWeb { try { let phoneNumber: string = url.substring(TEL_PROTOCOL.length); call.makeCall(phoneNumber).catch((err: BusinessError) => { - console.error(`AtomicServiceWeb openMakeCall error, code: ${err.code}, message: ${err.message}`); + hilog.error(0x3900, LOG_TAG, `openMakeCall error, code: ${err.code}, message: ${err.message}`); }); } catch (err) { - console.error(`AtomicServiceWeb openMakeCall error, code: ${err.code}, message: ${err.message}`); + hilog.error(0x3900, LOG_TAG, `openMakeCall error, code: ${err.code}, message: ${err.message}`); } } @@ -446,10 +448,10 @@ export struct AtomicServiceWeb { action: WANT_ACTION_SEND_TO_DATA, uri: url }).catch((err: BusinessError) => { - console.error(`AtomicServiceWeb openSendMail error, code: ${err.code}, message: ${err.message}`); + hilog.error(0x3900, LOG_TAG, `openSendMail error, code: ${err.code}, message: ${err.message}`); }); } catch (err) { - console.error(`AtomicServiceWeb openSendMail error, code: ${err.code}, message: ${err.message}`); + hilog.error(0x3900, LOG_TAG, `openSendMail error, code: ${err.code}, message: ${err.message}`); } } @@ -474,13 +476,13 @@ export struct AtomicServiceWeb { } let appId: string | null = this.getAppId(); if (!appId) { - console.error('AtomicServiceWeb checkPermissionRequest error, appId is invalid'); + hilog.error(0x3900, LOG_TAG, `checkPermissionRequest error, appId is invalid`); return false; } for (let resource of accessibleResource) { let permission: string = WEB_PERMISSIONS[resource]; if (!permission) { - console.error('AtomicServiceWeb checkPermissionRequest error, permission is not support'); + hilog.error(0x3900, LOG_TAG, `checkPermissionRequest error, permission is not support`); return false; } if (!this.isPermissionUserGranted(permission)) { @@ -507,12 +509,12 @@ export struct AtomicServiceWeb { let grantStatus: abilityAccessCtrl.GrantStatus = abilityAccessCtrl.createAtManager() .checkAccessTokenSync(tokenId, permission as Permissions); if (grantStatus !== abilityAccessCtrl.GrantStatus.PERMISSION_GRANTED) { - console.error(`AtomicServiceWeb isPermissionGranted permission ${permission} is not grant`); + hilog.error(0x3900, LOG_TAG, `isPermissionGranted permission ${permission} is not grant`); return false; } return true; } catch (err) { - console.error(`AtomicServiceWeb isPermissionGranted error, code: ${err.code}, message: ${err.message}`); + hilog.error(0x3900, LOG_TAG, `isPermissionGranted error, code: ${err.code}, message: ${err.message}`); return false; } } @@ -523,15 +525,15 @@ export struct AtomicServiceWeb { private isPermissionWhiteListAllow(appId: string, permission: string): boolean { if (!atomicBasicEngine || !atomicBasicEngine.default || typeof atomicBasicEngine.default.checkAtomicServiceAllow !== 'function') { - console.error('AtomicServiceWeb isPermissionRequestAllow error, checkAtomicServiceAllow is not available'); + hilog.error(0x3900, LOG_TAG, `isPermissionRequestAllow error, checkAtomicServiceAllow is not available`); return false; } try { let isAllow: boolean = atomicBasicEngine.default.checkAtomicServiceAllow(appId, permission, TYPE_AS_WEB); - console.debug(`AtomicServiceWeb isPermissionRequestAllow ret=${isAllow} permission=${permission}`); + hilog.error(0x3900, LOG_TAG, `isPermissionRequestAllow ret=${isAllow} permission=${permission}`); return isAllow; } catch (err) { - console.error(`AtomicServiceWeb isPermissionRequestAllow error, code: ${err.code}, message: ${err.message}`); + hilog.error(0x3900, LOG_TAG, `isPermissionRequestAllow error, code: ${err.code}, message: ${err.message}`); return false; } } @@ -660,7 +662,7 @@ class AtomicService { try { options?.callback && options?.callback(undefined, res); } catch (err) { - this.consoleError(`callback error, code is ${err.code}, message is ${err.message}`); + hilog.error(0x3900, LOG_TAG, `callback error, code is ${err.code}, message is ${err.message}`); } } @@ -670,7 +672,7 @@ class AtomicService { options?.callback && options?.callback(new AsError(err.code ? err.code : SYSTEM_INTERNAL_ERROR.code, err.message ? err.message : SYSTEM_INTERNAL_ERROR.message)); } catch (err) { - this.consoleError(`callback error, code is ${err.code}, message is ${err.message}`); + hilog.error(0x3900, LOG_TAG, `callback error, code is ${err.code}, message is ${err.message}`); } } @@ -679,24 +681,12 @@ class AtomicService { try { options?.callback && options?.callback(error); } catch (err) { - this.consoleError(`callback error, code is ${err.code}, message is ${err.message}`); - } - } - - consoleLog(msg: string): void { - if (LOG_ENABLE) { - console.log(`${LOG_PREFIX} ${msg}`); - } - } - - consoleError(msg: string): void { - if (LOG_ENABLE) { - console.error(`${LOG_PREFIX} ${msg}`); + hilog.error(0x3900, LOG_TAG, `callback error, code is ${err.code}, message is ${err.message}`); } } logOptions(name: string, options: BaseOptions): void { - this.consoleLog(`${name} options=${JSON.stringify(options)}`); + hilog.error(0x3900, LOG_TAG, `${name} options=${JSON.stringify(options)}`); } checkParamRequired(paramKey: string, paramValue: V, options: BaseOptions): boolean { @@ -812,7 +802,7 @@ class AtomicService { try { this.onMessage(new OnMessageEvent(this.messageDataList)); } catch (err) { - this.consoleError(`onMessage failed, code is ${err.code}, message is ${err.message}`); + hilog.error(0x3900, LOG_TAG, `onMessage failed, code is ${err.code}, message is ${err.message}`); } this.messageDataList = []; } @@ -1773,7 +1763,7 @@ class HiAnalyticsUtil { * @param content 打点参数json字符串 */ private static writeEndEvent(time: number, content: string): void { - console.info(`writeEndEvent -> time: ${time} ,content: ${content} `); + hilog.info(0x3900, LOG_TAG, `writeEndEvent -> time: ${time} ,content: ${content} `); let event: hiAppEvent.AppEventInfo = { domain: 'api_diagnostic', name: 'api_exec_end', @@ -1866,7 +1856,7 @@ class HiAnalyticsUtil { }); HiAnalyticsUtil.writeEndEvent(new Date().getTime(), content); } catch (err) { - console.error(`reportApiEvent -> reportApiEvent error, message: ${err.message}`); + hilog.error(0x3900, LOG_TAG, `reportApiEvent -> reportApiEvent error, message: ${err.message}`); } } /** @@ -1887,7 +1877,7 @@ class HiAnalyticsUtil { }); HiAnalyticsUtil.writeEndEvent(new Date().getTime(), content); } catch (err) { - console.error(`reportComponentEvent -> reportComponentEvent error, message: ${err.message}`); + hilog.error(0x3900, LOG_TAG, `reportComponentEvent -> reportComponentEvent error, message: ${err.message}`); } } } diff --git a/customappbar/interfaces/custom_app_bar.js b/customappbar/interfaces/custom_app_bar.js index b509c68..626784f 100644 --- a/customappbar/interfaces/custom_app_bar.js +++ b/customappbar/interfaces/custom_app_bar.js @@ -21,6 +21,8 @@ const display = requireNapi('display'); const mediaquery = requireNapi('mediaquery'); const LengthMetrics = requireNapi('arkui.node').LengthMetrics; const systemParameterEnhance = requireNapi('systemParameterEnhance'); +const hilog = requireNapi('hilog'); + const LOG_TAG = 'CustomAppBar'; const VIEW_WIDTH = 80; const VIEW_HEIGHT = 36; @@ -585,9 +587,9 @@ export class CustomAppBar extends ViewPU { getDeviceRadiusConfig() { try { this.deviceBorderRadius = systemParameterEnhance.getSync('const.product.device_radius'); - console.info(LOG_TAG, `read device_radius success, device_radius: ${this.deviceBorderRadius}`); + hilog.info(0x3900, LOG_TAG, `read device_radius success, device_radius: ${this.deviceBorderRadius}`); } catch (error) { - console.error(LOG_TAG, `read device_radius failed`); + hilog.error(0x3900, LOG_TAG, `read device_radius failed`); } } initBreakPointListener() { @@ -651,7 +653,7 @@ export class CustomAppBar extends ViewPU { } return getContext(this).resourceManager.getStringByNameSync(resName); } catch (err) { - console.error(LOG_TAG, `getAccessibilityDescription, error: ${err.toString()}`); + hilog.error(0x3900, LOG_TAG, `getAccessibilityDescription, error: ${err.toString()}`); } return ''; } @@ -670,7 +672,7 @@ export class CustomAppBar extends ViewPU { */ setCustomCallback(eventName, param) { if (param === null || param === '' || param === undefined) { - console.error(LOG_TAG, 'invalid params'); + hilog.error(0x3900, LOG_TAG, 'invalid params'); return; } if (eventName === ARKUI_APP_BAR_COLOR_CONFIGURATION) { diff --git a/customappbar/interfaces/custom_app_bar_forpc.js b/customappbar/interfaces/custom_app_bar_forpc.js index 2e34d81..e6574d2 100644 --- a/customappbar/interfaces/custom_app_bar_forpc.js +++ b/customappbar/interfaces/custom_app_bar_forpc.js @@ -21,6 +21,7 @@ const hilog = requireNapi('hilog'); const window = requireNapi('window'); const LengthMetrics = requireNapi('arkui.node').LengthMetrics; +const LOG_TAG = 'CustomAppBarForPC'; const BUTTON_WIDTH = 28; const VIEW_HEIGHT = 28; const IMAGE_SIZE = 16; @@ -271,7 +272,7 @@ export class CustomAppBarForPC extends ViewPU { let bundleFlags = bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_HAP_MODULE; try { bundleManager.getBundleInfoForSelf(bundleFlags).then((data) => { - hilog.info(0x0000, 'testTag', 'getBundleInfoForSelf successfully. Data: %{public}s', JSON.stringify(data.hapModulesInfo[0].deviceTypes)); + hilog.info(0x3900, LOG_TAG, 'getBundleInfoForSelf successfully. Data: %{public}s', JSON.stringify(data.hapModulesInfo[0].deviceTypes)); let devicetype = data.hapModulesInfo[0].deviceTypes; for (let i = 0; i < devicetype.length; i++) { if (devicetype[i] === '2in1') { @@ -280,12 +281,12 @@ export class CustomAppBarForPC extends ViewPU { } } }).catch((err) => { - hilog.error(0x0000, 'testTag', 'getBundleInfoForSelf failed. Cause: %{public}s', err.message); + hilog.error(0x3900, LOG_TAG, 'getBundleInfoForSelf failed. Cause: %{public}s', err.message); }); } catch (err) { let message = err.message; - hilog.error(0x0000, 'testTag', 'getBundleInfoForSelf failed: %{public}s', message); + hilog.error(0x3900, LOG_TAG, 'getBundleInfoForSelf failed: %{public}s', message); } let context = getContext(this); context?.windowStage?.getMainWindow().then(data => { @@ -294,7 +295,7 @@ export class CustomAppBarForPC extends ViewPU { this.windowClass?.setWindowTitleButtonVisible(false, false, false); this.updateMaximizeResource(this.windowClass?.getWindowStatus()); this.windowClass?.on('windowStatusChange', (windowStatusType) => { - console.info('windowStatusChange windowStatusType: ' + JSON.stringify(windowStatusType)); + hilog.info(0x3900, LOG_TAG, `windowStatusChange windowStatusType: ${windowStatusType}`); this.updateMaximizeResource(windowStatusType); }); if (!this.isAdaptPC) { @@ -302,7 +303,7 @@ export class CustomAppBarForPC extends ViewPU { } }).catch((err) => { if (err.code) { - console.error(`Failed to obtain the main window. Cause code: ${err.code}, message: ${err.message}`); + hilog.error(0x3900, LOG_TAG, `Failed to obtain the main window. Cause code: ${err.code}, message: ${err.message}`); } }); } diff --git a/customappbar/source/custom_app_bar.ets b/customappbar/source/custom_app_bar.ets index d094653..c968ba6 100644 --- a/customappbar/source/custom_app_bar.ets +++ b/customappbar/source/custom_app_bar.ets @@ -16,6 +16,7 @@ import { curves, display, LengthMetrics, mediaquery } from '@kit.ArkUI'; import { image } from '@kit.ImageKit'; import { systemParameterEnhance } from '@kit.BasicServicesKit'; +import { hilog } from '@kit.PerformanceAnalysisKit'; const LOG_TAG: string = 'CustomAppBar'; const VIEW_WIDTH: number = 80; @@ -189,9 +190,9 @@ export struct CustomAppBar { getDeviceRadiusConfig(): void { try { this.deviceBorderRadius = systemParameterEnhance.getSync('const.product.device_radius'); - console.info(LOG_TAG, ` read device_radius success, device_radius: ${this.deviceBorderRadius}`); + hilog.info(0x3900, LOG_TAG, ` read device_radius success, device_radius: ${this.deviceBorderRadius}`); } catch (error) { - console.error(LOG_TAG, `read device_radius failed`); + hilog.error(0x3900, LOG_TAG, `read device_radius failed`); } } @@ -258,7 +259,7 @@ export struct CustomAppBar { } return getContext(this).resourceManager.getStringByNameSync(resName); } catch (err) { - console.error(LOG_TAG, `getAccessibilityDescription, error: ${err.toString()}`); + hilog.error(0x3900, LOG_TAG, `getAccessibilityDescription, error: ${err.toString()}`); } return ''; } @@ -279,7 +280,7 @@ export struct CustomAppBar { */ setCustomCallback(eventName: string, param: string): void { if (param === null || param === '' || param === undefined) { - console.error(LOG_TAG, 'invalid params'); + hilog.error(0x3900, LOG_TAG, 'invalid params'); return; } if (eventName === ARKUI_APP_BAR_COLOR_CONFIGURATION) { diff --git a/customappbar/source/custom_app_bar_forpc.ets b/customappbar/source/custom_app_bar_forpc.ets index 1113cbb..bc335fa 100644 --- a/customappbar/source/custom_app_bar_forpc.ets +++ b/customappbar/source/custom_app_bar_forpc.ets @@ -18,6 +18,7 @@ import { BusinessError } from '@kit.BasicServicesKit'; import { hilog } from '@kit.PerformanceAnalysisKit'; import { LengthMetrics, window } from '@kit.ArkUI'; +const LOG_TAG: string = 'CustomAppBarForPC'; const BUTTON_WIDTH: number = 28; const VIEW_HEIGHT: number = 28; const IMAGE_SIZE: number = 16; @@ -98,7 +99,7 @@ export struct CustomAppBarForPC { let bundleFlags = bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_HAP_MODULE; try { bundleManager.getBundleInfoForSelf(bundleFlags).then((data) => { - hilog.info(0x0000, 'testTag', 'getBundleInfoForSelf successfully. Data: %{public}s', + hilog.info(0x3900, LOG_TAG, 'getBundleInfoForSelf successfully. Data: %{public}s', JSON.stringify(data.hapModulesInfo[0].deviceTypes)); let devicetype = data.hapModulesInfo[0].deviceTypes; for (let i = 0; i < devicetype.length; i++) { @@ -108,11 +109,11 @@ export struct CustomAppBarForPC { } } }).catch((err: BusinessError) => { - hilog.error(0x0000, 'testTag', 'getBundleInfoForSelf failed. Cause: %{public}s', err.message); + hilog.error(0x3900, LOG_TAG, 'getBundleInfoForSelf failed. Cause: %{public}s', err.message); }); } catch (err) { let message = (err as BusinessError).message; - hilog.error(0x0000, 'testTag', 'getBundleInfoForSelf failed: %{public}s', message); + hilog.error(0x3900, LOG_TAG, 'getBundleInfoForSelf failed: %{public}s', message); } let context = getContext(this) as common.UIAbilityContext; @@ -123,7 +124,7 @@ export struct CustomAppBarForPC { this.windowClass?.setWindowTitleButtonVisible(false, false, false); this.updateMaximizeResource(this.windowClass?.getWindowStatus()); this.windowClass?.on('windowStatusChange', (windowStatusType) => { - console.info('windowStatusChange windowStatusType: ' + JSON.stringify(windowStatusType)); + hilog.info(0x3900, LOG_TAG, `windowStatusChange windowStatusType: ${windowStatusType}`); this.updateMaximizeResource(windowStatusType); }); if (!this.isAdaptPC) { @@ -132,7 +133,7 @@ export struct CustomAppBarForPC { } ).catch((err: BusinessError) => { if (err.code) { - console.error(`Failed to obtain the main window. Cause code: ${err.code}, message: ${err.message}`); + hilog.error(0x3900, LOG_TAG, `Failed to obtain the main window. Cause code: ${err.code}, message: ${err.message}`); } }); } -- Gitee