diff --git a/ArkWebKit/ArkWebClipboard/build-profile.json5 b/ArkWebKit/ArkWebClipboard/build-profile.json5 index cdb0ee92784db908ecca9a70e401d494e38b677d..e84d1f851a1b6439c6a36dd3350ffa8ea1f46751 100644 --- a/ArkWebKit/ArkWebClipboard/build-profile.json5 +++ b/ArkWebKit/ArkWebClipboard/build-profile.json5 @@ -14,21 +14,7 @@ */ { "app": { - "signingConfigs": [ - { - "name": "default", - "type": "HarmonyOS", - "material": { - "certpath": "C:\\Users\\wangrongfei.ICS-VTBAFCLMWDF\\.ohos\\config\\default_ArkWebClipboard_XRWg3QlnEtyzg2lvV9fxB0T52ZNsTs2OuJ6BzG3JAM8=.cer", - "keyAlias": "debugKey", - "keyPassword": "0000001B802819DC69D0ECB72C90A6761856BCEF2379DD1A524BAADD507B24B197DE36366DF8479C9C050F", - "profile": "C:\\Users\\wangrongfei.ICS-VTBAFCLMWDF\\.ohos\\config\\default_ArkWebClipboard_XRWg3QlnEtyzg2lvV9fxB0T52ZNsTs2OuJ6BzG3JAM8=.p7b", - "signAlg": "SHA256withECDSA", - "storeFile": "C:\\Users\\wangrongfei.ICS-VTBAFCLMWDF\\.ohos\\config\\default_ArkWebClipboard_XRWg3QlnEtyzg2lvV9fxB0T52ZNsTs2OuJ6BzG3JAM8=.p12", - "storePassword": "0000001B8314451DC893A12FCD06A9E50A09625231C90DACCBBCD869FBB13B1B44742538F72298B7CC6263" - } - } - ], + "signingConfigs": [], "products": [ { "name": "default", diff --git a/ArkWebKit/ArkWebClipboard/entry/src/main/ets/pages/Index.ets b/ArkWebKit/ArkWebClipboard/entry/src/main/ets/pages/Index.ets index 06d96634f37d8fb77be40983d6a4ffdbc211f9b4..10b96bf6a3fb37f61ce41d169508c1a67d4b558d 100644 --- a/ArkWebKit/ArkWebClipboard/entry/src/main/ets/pages/Index.ets +++ b/ArkWebKit/ArkWebClipboard/entry/src/main/ets/pages/Index.ets @@ -14,12 +14,7 @@ */ import { BusinessError } from '@kit.BasicServicesKit'; -import { common } from '@kit.AbilityKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_WebClipboard]' -const DOMAIN = 0xF811 -const BUNDLE = 'WebClipboard_' //Column space const COLUMN_SPACE: Length = 10; @@ -34,7 +29,7 @@ struct Index { url: 'pages/WebClipboard', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE + `pushUrl failed, code is ${error.code}, message is ${error.message}`) + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`) }) }) Button('clipboard event') @@ -43,7 +38,7 @@ struct Index { url: 'pages/WebClipboardEvent', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE + `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -53,7 +48,7 @@ struct Index { url: 'pages/WebCopyOptions', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE + `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) diff --git a/ArkWebKit/ArkWebCreatePdf/entry/src/main/ets/pages/Index.ets b/ArkWebKit/ArkWebCreatePdf/entry/src/main/ets/pages/Index.ets index f0e4646bb758a1711e262da267d11dec5aece429..30d9c14a443406686fdfc5fef8ac8c722c1d8539 100644 --- a/ArkWebKit/ArkWebCreatePdf/entry/src/main/ets/pages/Index.ets +++ b/ArkWebKit/ArkWebCreatePdf/entry/src/main/ets/pages/Index.ets @@ -15,11 +15,6 @@ import { BusinessError } from '@kit.BasicServicesKit'; import { common } from '@kit.AbilityKit'; -import hilog from '@ohos.hilog'; - -const TAG = '[Sample_WebCreatePdf]' -const DOMAIN = 0xF811 -const BUNDLE = 'WebCreatePdf_' @Entry @Component @@ -34,7 +29,7 @@ struct Index { url: 'pages/WebCreatePdfCallback', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE + `pushUrl failed, code is ${error.code}, message is ${error.message}`) + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`) }) }) Button('createPdfPromise') @@ -45,7 +40,7 @@ struct Index { url: 'pages/WebCreatePdfPromise', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE + `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) }.height('100%') diff --git a/ArkWebKit/ArkWebCreatePdf/entry/src/main/ets/pages/WebCreatePdfCallback.ets b/ArkWebKit/ArkWebCreatePdf/entry/src/main/ets/pages/WebCreatePdfCallback.ets index a90fe2656cf6950ec62ce626d2f1c4f3953b52f8..667486e60bd8a06670e771928764884d7e1d12d9 100644 --- a/ArkWebKit/ArkWebCreatePdf/entry/src/main/ets/pages/WebCreatePdfCallback.ets +++ b/ArkWebKit/ArkWebCreatePdf/entry/src/main/ets/pages/WebCreatePdfCallback.ets @@ -18,11 +18,6 @@ import { fileIo as fs } from '@kit.CoreFileKit'; import { webview } from '@kit.ArkWeb'; import { BusinessError } from '@kit.BasicServicesKit'; import { common } from '@kit.AbilityKit'; -import hilog from '@ohos.hilog'; - -const TAG = '[Sample_WebCreatePdf]' -const DOMAIN = 0xF811 -const BUNDLE = 'WebCreatePdf_' @Entry @Component @@ -52,17 +47,16 @@ struct Index { let filePath = context.filesDir + '/test.pdf'; let file = fs.openSync(filePath, fs.OpenMode.READ_WRITE | fs.OpenMode.CREATE); fs.write(file.fd, result.pdfArrayBuffer().buffer).then((writeLen: number) => { - hilog.info(DOMAIN, TAG, BUNDLE + 'createPDF write data to file succeed and size is:' + writeLen); + console.info('createPDF write data to file succeed and size is:' + writeLen); }).catch((err: BusinessError) => { - hilog.error(DOMAIN, TAG, - BUNDLE + 'createPDF write data to file failed with error message: ' + err.message + - ', error code: ' + err.code); + console.error('createPDF write data to file failed with error message: ' + err.message + + ', error code: ' + err.code); }).finally(() => { // 关闭file fs.closeSync(file); }); } catch (resError) { - hilog.error(DOMAIN, TAG, BUNDLE + + console.error( `ErrorCode: ${(error as BusinessError).code}, Message: ${(error as BusinessError).message}`); } }); diff --git a/ArkWebKit/ArkWebCreatePdf/entry/src/main/ets/pages/WebCreatePdfPromise.ets b/ArkWebKit/ArkWebCreatePdf/entry/src/main/ets/pages/WebCreatePdfPromise.ets index f955c369040fa44ab9d807805c021e7d67b12469..0c885db97853087fca42d33eba98dbae463ea5e5 100644 --- a/ArkWebKit/ArkWebCreatePdf/entry/src/main/ets/pages/WebCreatePdfPromise.ets +++ b/ArkWebKit/ArkWebCreatePdf/entry/src/main/ets/pages/WebCreatePdfPromise.ets @@ -18,11 +18,6 @@ import { fileIo as fs } from '@kit.CoreFileKit'; import { webview } from '@kit.ArkWeb'; import { BusinessError } from '@kit.BasicServicesKit'; import { common } from '@kit.AbilityKit'; -import hilog from '@ohos.hilog'; - -const TAG = '[Sample_WebCreatePdf]' -const DOMAIN = 0xF811 -const BUNDLE = 'WebCreatePdf_' @Entry @Component @@ -51,17 +46,16 @@ struct Index { let filePath = context.filesDir + '/test.pdf'; let file = fs.openSync(filePath, fs.OpenMode.READ_WRITE | fs.OpenMode.CREATE); fs.write(file.fd, result.pdfArrayBuffer().buffer).then((writeLen: number) => { - hilog.info(DOMAIN, TAG, BUNDLE + 'createPDF write data to file succeed and size is:' + writeLen); + console.info('createPDF write data to file succeed and size is:' + writeLen); }).catch((err: BusinessError) => { - hilog.error(DOMAIN, TAG, - BUNDLE + 'createPDF write data to file failed with error message: ' + err.message + - ', error code: ' + err.code); + console.error('createPDF write data to file failed with error message: ' + err.message + + ', error code: ' + err.code); }).finally(() => { // 关闭file fs.closeSync(file); }); } catch (resError) { - hilog.error(DOMAIN, TAG, BUNDLE + + console.error( `ErrorCode: ${(resError as BusinessError).code}, Message: ${(resError as BusinessError).message}`); } }) diff --git a/ArkWebKit/ArkWebDataDetector/entry/src/main/ets/pages/Index.ets b/ArkWebKit/ArkWebDataDetector/entry/src/main/ets/pages/Index.ets index b8435fe20274f909eec3ace8471ca994845a730a..6a681de488f6d1602a3b9c48b3f20baaf6f91308 100644 --- a/ArkWebKit/ArkWebDataDetector/entry/src/main/ets/pages/Index.ets +++ b/ArkWebKit/ArkWebDataDetector/entry/src/main/ets/pages/Index.ets @@ -14,11 +14,6 @@ */ import { BusinessError } from '@kit.BasicServicesKit'; -import hilog from '@ohos.hilog'; - -const TAG = '[Sample_Date_Detector]' -const DOMAIN = 0xF811 -const BUNDLE = 'DateDetector_' const COLUMN_SPACE: number = 10; @Entry @@ -32,7 +27,7 @@ struct Index { url: 'pages/WebDataDetectorHighlighting', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE + `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) Button('Long Press') @@ -42,7 +37,7 @@ struct Index { url: 'pages/WebDataDetectorLongPress', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE + `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) }.height('100%') diff --git a/ArkWebKit/ArkWebDebuggingWithDevtools/entry/src/main/ets/pages/Index.ets b/ArkWebKit/ArkWebDebuggingWithDevtools/entry/src/main/ets/pages/Index.ets index 77e166a7b8e3823512b9379f3978aa22ffd2401b..f2c0ccfaabfa0d2638f2a087b04be5c7de2e37d2 100644 --- a/ArkWebKit/ArkWebDebuggingWithDevtools/entry/src/main/ets/pages/Index.ets +++ b/ArkWebKit/ArkWebDebuggingWithDevtools/entry/src/main/ets/pages/Index.ets @@ -14,12 +14,6 @@ */ import { BusinessError } from '@kit.BasicServicesKit'; -import { common } from '@kit.AbilityKit'; -import hilog from '@ohos.hilog'; - -const TAG = '[Sample_Web_Debugging]' -const DOMAIN = 0xF811 -const BUNDLE = 'WebDebugging_' const COLUMN_SPACE: number = 10; @Entry @Component @@ -32,7 +26,7 @@ struct Index { url: 'pages/WebDebuggingWithWiFi', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE + `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) Button('debugging USB') @@ -41,7 +35,7 @@ struct Index { url: 'pages/WebDebuggingWithUSB', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE + `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) }.height('100%') diff --git a/ArkWebKit/ArkWebDebuggingWithDevtools/entry/src/main/ets/pages/WebDebuggingWithWiFi.ets b/ArkWebKit/ArkWebDebuggingWithDevtools/entry/src/main/ets/pages/WebDebuggingWithWiFi.ets index ffc09e3b0183cb66aba29c0420f0fdaae4471d88..efd3e34a729581c879ccfc0451cb9574551d4daa 100644 --- a/ArkWebKit/ArkWebDebuggingWithDevtools/entry/src/main/ets/pages/WebDebuggingWithWiFi.ets +++ b/ArkWebKit/ArkWebDebuggingWithDevtools/entry/src/main/ets/pages/WebDebuggingWithWiFi.ets @@ -15,11 +15,6 @@ // [Start web_Debugging_Wireless] import { webview } from '@kit.ArkWeb'; import { BusinessError } from '@kit.BasicServicesKit'; -import hilog from '@ohos.hilog'; - -const TAG = '[Sample_DebuggingWireless]' -const DOMAIN = 0xF811 -const BUNDLE = 'TextMenuItem_' const DEBUGGING_PORT: number = 8888; @Entry @@ -32,8 +27,7 @@ struct WebComponent { // 配置Web开启无线调试模式，指定TCP Socket的端口。 webview.WebviewController.setWebDebuggingAccess(true, DEBUGGING_PORT); } catch (error) { - hilog.error(DOMAIN, TAG, - BUNDLE + `ErrorCode: ${(error as BusinessError).code}, Message: ${(error as BusinessError).message}`); + console.error(`ErrorCode: ${(error as BusinessError).code}, Message: ${(error as BusinessError).message}`); } } diff --git a/ArkWebKit/ArkWebMenu/build-profile.json5 b/ArkWebKit/ArkWebMenu/build-profile.json5 index 70fc5f86211a744ec7361750f6a908d602dc32f8..e84d1f851a1b6439c6a36dd3350ffa8ea1f46751 100644 --- a/ArkWebKit/ArkWebMenu/build-profile.json5 +++ b/ArkWebKit/ArkWebMenu/build-profile.json5 @@ -14,21 +14,7 @@ */ { "app": { - "signingConfigs": [ - { - "name": "default", - "type": "HarmonyOS", - "material": { - "certpath": "C:\\Users\\wangrongfei.ICS-VTBAFCLMWDF\\.ohos\\config\\default_ArkWebMenu_mN1lMyhK4or8rqJmJzZvt0CbnulWUSLLyCZjJsM3rlw=.cer", - "keyAlias": "debugKey", - "keyPassword": "0000001BA6AF5182E25A93202A2142E9736634290FDA501A303E00AC8607BC4242688724B061EECB8C6052", - "profile": "C:\\Users\\wangrongfei.ICS-VTBAFCLMWDF\\.ohos\\config\\default_ArkWebMenu_mN1lMyhK4or8rqJmJzZvt0CbnulWUSLLyCZjJsM3rlw=.p7b", - "signAlg": "SHA256withECDSA", - "storeFile": "C:\\Users\\wangrongfei.ICS-VTBAFCLMWDF\\.ohos\\config\\default_ArkWebMenu_mN1lMyhK4or8rqJmJzZvt0CbnulWUSLLyCZjJsM3rlw=.p12", - "storePassword": "0000001B3DAF6136BEDAE121DB8581EB341431D522D7D21282DE76B8159625CA00702B1088D4263D0CC7CB" - } - } - ], + "signingConfigs": [], "products": [ { "name": "default", diff --git a/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/Index.ets b/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/Index.ets index 8261d4161a29bdf3b9ba471a201d3eaeaf4bfe0c..0d7962560c79f09365870a707354c5451715c605 100644 --- a/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/Index.ets +++ b/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/Index.ets @@ -15,11 +15,7 @@ import { BusinessError } from '@kit.BasicServicesKit'; import { common } from '@kit.AbilityKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_WebMenu]' -const DOMAIN = 0xF811 -const BUNDLE = 'WebMenu_' //Column space const COLUMN_SPACE: Length = 10; @Entry @@ -33,7 +29,7 @@ struct Index { url: 'pages/WebTextMenuItem', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE + `pushUrl failed, code is ${error.code}, message is ${error.message}`) + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`) }) }) Button('contextMenu') @@ -42,7 +38,7 @@ struct Index { url: 'pages/WebContextMenu', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE + `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -52,7 +48,7 @@ struct Index { url: 'pages/WebBindSelectionMenu', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE + `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -62,7 +58,7 @@ struct Index { url: 'pages/WebPreviewBuilder', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE + `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -72,7 +68,7 @@ struct Index { url: 'pages/WebSaveImage', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE + `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -82,7 +78,7 @@ struct Index { url: 'pages/WebEditMenuOptions', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE + `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -92,7 +88,7 @@ struct Index { url: 'pages/WebScanQRCode', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE + `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -102,7 +98,7 @@ struct Index { url: 'pages/WebDisableLongPress', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE + `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) }.height('100%') diff --git a/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebBindSelectionMenu.ets b/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebBindSelectionMenu.ets index 82dfa701e2d096aefd60bed022530baadf3e4abb..46b4b98a4e945e7b8705efeef304e456bfd689f1 100644 --- a/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebBindSelectionMenu.ets +++ b/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebBindSelectionMenu.ets @@ -15,9 +15,6 @@ // [Start web_BindSelectionMenu] import { webview } from '@kit.ArkWeb'; -//substring index -const SUBSTRING_INDEX: number = 19; - interface PreviewBuilderParam { previewImage: Resource | string | undefined; width: number; @@ -46,12 +43,12 @@ struct WebComponent { @Builder MenuBuilder() { Menu() { - MenuItem({ content: $r('app.string.copy'), }) + MenuItem({ content: 'Copy', }) .onClick(() => { this.result?.copy(); this.result?.closeContextMenu(); }) - MenuItem({ content: $r('app.string.all'), }) + MenuItem({ content: 'Select All', }) .onClick(() => { this.result?.selectAll(); this.result?.closeContextMenu(); @@ -83,7 +80,7 @@ struct WebComponent { this.previewWidth = this.uiContext!.px2vp(event.param.getPreviewWidth()); this.previewHeight = this.uiContext!.px2vp(event.param.getPreviewHeight()); if (event.param.getSourceUrl().indexOf('resource://rawfile/') == 0) { - this.previewImage = $rawfile(event.param.getSourceUrl().substr(SUBSTRING_INDEX)); + this.previewImage = $rawfile(event.param.getSourceUrl().substr(19)); } else { this.previewImage = event.param.getSourceUrl(); } diff --git a/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebContextMenu.ets b/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebContextMenu.ets index 374346d415c85a8554e33f675154941e6137fa58..02cef5354963195be64374c5b08e8a6fe9dce5a9 100644 --- a/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebContextMenu.ets +++ b/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebContextMenu.ets @@ -13,22 +13,11 @@ * limitations under the License. */ // [Start web_ContextMenu] +// xxx.ets import { webview } from '@kit.ArkWeb'; import { pasteboard } from '@kit.BasicServicesKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_ContextMenu]' -const DOMAIN = 0xF811 -const BUNDLE = 'ContextMenu_' - -//MenuItem width -const MENUITEM_WIDTH: number = 100; -//MenuItem height -const MENUITEM_HEIGHT: number = 50; -//MenuBuilder width -const MENUBUILDER_WIDTH: number = 150; -//MenuBuilder height -const MENUBUILDER_HEIGHT: number = 300; +const TAG = 'ContextMenu'; @Entry @Component @@ -48,46 +37,46 @@ struct WebComponent { Menu() { // 展示菜单Menu中具体的item菜单项。 MenuItem({ - content: $r('app.string.copy_image'), + content: 'Copy Image', }) - .width(MENUITEM_WIDTH) - .height(MENUITEM_HEIGHT) + .width(100) + .height(50) .onClick(() => { this.result?.copyImage(); this.showMenu = false; }) MenuItem({ - content: $r('app.string.cut'), + content: 'Cut', }) - .width(MENUITEM_WIDTH) - .height(MENUITEM_HEIGHT) + .width(100) + .height(50) .onClick(() => { this.result?.cut(); this.showMenu = false; }) MenuItem({ - content: $r('app.string.copy'), + content: 'Copy', }) - .width(MENUITEM_WIDTH) - .height(MENUITEM_HEIGHT) + .width(100) + .height(50) .onClick(() => { this.result?.copy(); this.showMenu = false; }) MenuItem({ - content: $r('app.string.paste'), + content: 'Paste', }) - .width(MENUITEM_WIDTH) - .height(MENUITEM_HEIGHT) + .width(100) + .height(50) .onClick(() => { this.result?.paste(); this.showMenu = false; }) MenuItem({ - content: $r('app.string.copy_url'), + content: 'Copy link', }) - .width(MENUITEM_WIDTH) - .height(MENUITEM_HEIGHT) + .width(100) + .height(50) .onClick(() => { let pasteData = pasteboard.createData('text/plain', this.linkUrl); pasteboard.getSystemPasteboard().setData(pasteData, (error) => { @@ -98,17 +87,17 @@ struct WebComponent { this.showMenu = false; }) MenuItem({ - content: $r('app.string.all'), + content: '全选', }) - .width(MENUITEM_WIDTH) - .height(MENUITEM_HEIGHT) + .width(100) + .height(50) .onClick(() => { this.result?.selectAll(); this.showMenu = false; }) } - .width(MENUBUILDER_WIDTH) - .height(MENUBUILDER_HEIGHT) + .width(150) + .height(300) } build() { @@ -118,11 +107,11 @@ struct WebComponent { .onContextMenuShow((event) => { if (event) { this.result = event.result - hilog.info(DOMAIN, TAG, BUNDLE + 'x coord = ' + event.param.x()); - hilog.info(DOMAIN, TAG, BUNDLE + 'link url = ' + event.param.getLinkUrl()); + console.info('x coord = ' + event.param.x()); + console.info('link url = ' + event.param.getLinkUrl()); this.linkUrl = event.param.getLinkUrl(); } - hilog.info(DOMAIN, TAG, BUNDLE + `x: ${this.offsetX}, y: ${this.offsetY}`); + console.info(TAG, `x: ${this.offsetX}, y: ${this.offsetY}`); this.showMenu = true; this.offsetX = 0; this.offsetY = Math.max(this.uiContext!.px2vp(event?.param.y() ?? 0) - 0, 0); diff --git a/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebDisableLongPress.ets b/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebDisableLongPress.ets index d6996667f03bab5a2eed0915b1c7e257bf4fe728..ee96ad4c07fc4ab369a0ef3d9bae42ec4667ebca 100644 --- a/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebDisableLongPress.ets +++ b/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebDisableLongPress.ets @@ -14,6 +14,7 @@ */ // [Start web_Disable_long_press] import { webview } from '@kit.ArkWeb'; + @Entry @Component struct WebComponent { @@ -28,7 +29,7 @@ struct WebComponent { } onMenuItemClick(menuItem: TextMenuItem, textRange: TextRange): boolean { - return false;// 返回默认值false + return false; // 返回默认值false } @State editMenuOptions: EditMenuOptions = { onCreateMenu: this.onCreateMenu, onMenuItemClick: this.onMenuItemClick } diff --git a/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebEditMenuOptions.ets b/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebEditMenuOptions.ets index 3f3338bd2873c221280d4601230fd561b690ffb4..31000787bef93aa2301d550c8fef32d199389936 100644 --- a/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebEditMenuOptions.ets +++ b/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebEditMenuOptions.ets @@ -15,8 +15,6 @@ // [Start web_EditMenuOptions] import { webview } from '@kit.ArkWeb'; let selectText = ''; -//font Size -const FONT_SIZE: number = 20; class SelectClass { constructor() { @@ -45,13 +43,13 @@ struct WebComponent { }) .height('40%') Text('Click here to get the selected text.') - .fontSize(FONT_SIZE) + .fontSize(20) .onClick(() => { this.textStr = selectText; }) .height('10%') Text('Selected text is ' + this.textStr) - .fontSize(FONT_SIZE) + .fontSize(20) .height('10%') } } diff --git a/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebPreviewBuilder.ets b/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebPreviewBuilder.ets index 13450aa5d2e3abfdbec3b91d0489834bf7c1a069..57eac194bdb2d7ad2f2f5e99120ef3bb7d594fbd 100644 --- a/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebPreviewBuilder.ets +++ b/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebPreviewBuilder.ets @@ -16,23 +16,10 @@ import { webview } from '@kit.ArkWeb'; import { pasteboard } from '@kit.BasicServicesKit'; -//text padding -const TEXT_PADDING: Length = 5; -//progress total -const PROGRESS_TOTAL:number = 100; -//progress stroke width -const PROGRESS_STROKE_WIDTH:number = 3; -//substring index -const SUBSTRING_INDEX:number = 19; -//preview width -const PREVIEW_WIDTH:number = 500; -//preview height -const PREVIEW_HEIGHT:number = 400; - interface PreviewBuilderParam { width: number; height: number; - url: Resource | string | undefined; + url:Resource | string | undefined; } interface PreviewBuilderParamForImage { @@ -42,8 +29,7 @@ interface PreviewBuilderParamForImage { } -@Builder -function previewBuilderGlobalForImage($$: PreviewBuilderParamForImage) { +@Builder function previewBuilderGlobalForImage($$: PreviewBuilderParamForImage) { Column() { Image($$.previewImage) .objectFit(ImageFit.Fill) @@ -60,17 +46,17 @@ struct SelectionMenuLongPress { Column() { Stack(){ Text('') // 可选择是否展示url - .padding(TEXT_PADDING) + .padding(5) .width('100%') .textAlign(TextAlign.Start) .backgroundColor(Color.White) .copyOption(CopyOptions.LocalDevice) .maxLines(1) .textOverflow({overflow:TextOverflow.Ellipsis}) - Progress({ value: this.progressValue, total: PROGRESS_TOTAL, type: ProgressType.Linear }) // 展示进度条 - .style({ strokeWidth: PROGRESS_STROKE_WIDTH, enableSmoothEffect: true }) + Progress({ value: this.progressValue, total: 100, type: ProgressType.Linear }) // 展示进度条 + .style({ strokeWidth: 3, enableSmoothEffect: true }) .backgroundColor(Color.White) - .opacity(this.progressVisible ? 1 : 0) + .opacity(this.progressVisible?1:0) .backgroundColor(Color.White) }.alignContent(Alignment.Bottom) Web({src:$$.url,controller: new webview.WebviewController()}) @@ -107,13 +93,13 @@ struct SelectionMenuLongPress { @Builder LinkMenuBuilder() { Menu() { - MenuItem({ content: $r('app.string.copy_url'), }) + MenuItem({ content: 'Copy link', }) .onClick(() => { const pasteboardData = pasteboard.createData(pasteboard.MIMETYPE_TEXT_PLAIN, this.linkURL); const systemPasteboard = pasteboard.getSystemPasteboard(); systemPasteboard.setData(pasteboardData); }) - MenuItem({ content: $r('app.string.open_url') }) + MenuItem({content:'Open the link'}) .onClick(()=>{ this.controller.loadUrl(this.linkURL); }) @@ -122,7 +108,7 @@ struct SelectionMenuLongPress { @Builder ImageMenuBuilder() { Menu() { - MenuItem({ content: $r('app.string.copy_image'), }) + MenuItem({ content: 'Copy Image', }) .onClick(() => { this.result?.copyImage(); this.result?.closeContextMenu(); @@ -144,8 +130,8 @@ struct SelectionMenuLongPress { this.result?.closeContextMenu(); }, preview: this.PreviewBuilder({ - width: PREVIEW_WIDTH, - height: PREVIEW_HEIGHT, + width: 500, + height: 400, url:this.linkURL }), menuType: MenuType.PREVIEW_MENU, @@ -170,7 +156,7 @@ struct SelectionMenuLongPress { this.previewWidthImage = this.uiContext!.px2vp(event.param.getPreviewWidth()); this.previewHeightImage = this.uiContext!.px2vp(event.param.getPreviewHeight()); if (event.param.getSourceUrl().indexOf('resource://rawfile/') == 0) { - this.previewImage = $rawfile(event.param.getSourceUrl().substring(SUBSTRING_INDEX)); + this.previewImage = $rawfile(event.param.getSourceUrl().substring(19)); } else { this.previewImage = event.param.getSourceUrl(); } diff --git a/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebSaveImage.ets b/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebSaveImage.ets index 12b46a864c94ca677d1b56c736a500be8a9a0ff8..0440fea718fc3f937a80d4c6e7579f5737f928ef 100644 --- a/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebSaveImage.ets +++ b/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebSaveImage.ets @@ -19,19 +19,6 @@ import { fileIo as fs} from '@kit.CoreFileKit'; import { systemDateTime } from '@kit.BasicServicesKit'; import { http } from '@kit.NetworkKit'; import { photoAccessHelper } from '@kit.MediaLibraryKit'; -import hilog from '@ohos.hilog'; - -//margin top -const MARGIN_TOP: number = 20; -//margin bottom -const MARGIN_BOTTOM: number = 20; -//buffer size -const BUFSIZE: number = 4096; -//border radius -const BORDER_RADIUS: number = 10; -const TAG = '[Sample_WebSaveImage]' -const DOMAIN = 0xF811 -const BUNDLE = 'WebSaveImage_' @Entry @Component @@ -50,7 +37,7 @@ struct WebComponent { let srcFileDes = this.context.resourceManager.getRawFdSync(rawfilePath); let dstPath = this.context.filesDir + '/' +newFileName; let dest: fs.File = fs.openSync(dstPath, fs.OpenMode.CREATE | fs.OpenMode.READ_WRITE); - let bufsize = BUFSIZE; + let bufsize = 4096; let buf = new ArrayBuffer(bufsize); let off = 0; let len = 0; @@ -98,23 +85,23 @@ struct WebComponent { uri = await this.copyUrlPicToDir(this.imgUrl, `onlinePic${systemDateTime.getTime()}.png`); } let assetChangeRequest: photoAccessHelper.MediaAssetChangeRequest = - photoAccessHelper.MediaAssetChangeRequest.createImageAssetRequest(context, uri); + photoAccessHelper.MediaAssetChangeRequest.createImageAssetRequest(context, uri); await phAccessHelper.applyChanges(assetChangeRequest); } catch (err) { - hilog.error(DOMAIN, TAG, BUNDLE + `create asset failed with error: ${err.code}, ${err.message}`); + console.error(`create asset failed with error: ${err.code}, ${err.message}`); } } else { - hilog.error(DOMAIN, TAG, BUNDLE + `SaveButtonOnClickResult create asset failed`); + console.error(`SaveButtonOnClickResult create asset failed`); } this.showMenu = false; }) } - .margin({ top: MARGIN_TOP, bottom: MARGIN_BOTTOM }) + .margin({ top: 20, bottom: 20 }) .justifyContent(FlexAlign.Center) } .width('80') .backgroundColor(Color.White) - .borderRadius(BORDER_RADIUS) + .borderRadius(10) } build() { diff --git a/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebScanQRCode.ets b/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebScanQRCode.ets index 4c2e180701fc28afa7777214d493e98a1f6d72ba..697aab7791b57e3dab65fc109d43861cfdc501cc 100644 --- a/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebScanQRCode.ets +++ b/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebScanQRCode.ets @@ -21,15 +21,6 @@ import { http } from '@kit.NetworkKit'; import { scanCore, scanBarcode, detectBarcode } from '@kit.ScanKit'; import { BusinessError } from '@kit.BasicServicesKit'; -//font size -const FONT_SIZE: number = 20; -//buffer size -const BUFSIZE: number = 4096; -//MenuItem width -const MENUITEM_WIDTH: number = 200; -//MenuItem height -const MENUITEM_HEIGHT: number = 50; - @Entry @Component struct WebComponent { @@ -49,7 +40,7 @@ struct WebComponent { let srcFileDes = this.context.resourceManager.getRawFdSync(rawfilePath); let dstPath = this.context.filesDir + '/' +newFileName; let dest: fs.File = fs.openSync(dstPath, fs.OpenMode.CREATE | fs.OpenMode.READ_WRITE); - let bufsize = BUFSIZE; + let bufsize = 4096; let buf = new ArrayBuffer(bufsize); let off = 0; let len = 0; @@ -85,8 +76,8 @@ struct WebComponent { MenuItem({ content: 'Scan QR Code', }) - .width(MENUITEM_WIDTH) - .height(MENUITEM_HEIGHT) + .width(200) + .height(50) .onClick(async () => { try { let uri = ''; @@ -96,8 +87,8 @@ struct WebComponent { } else if (this.imgUrl?.includes('http') || this.imgUrl?.includes('https')) { uri = await this.copyUrlPicToDir(this.imgUrl, `onlinePic${systemDateTime.getTime()}.png`); } - let options: scanBarcode.ScanOptions = - { scanTypes: [scanCore.ScanType.ALL], enableMultiMode: true, enableAlbum: true } + let options: scanBarcode.ScanOptions = { scanTypes: [scanCore.ScanType.ALL], + enableMultiMode: true, enableAlbum: true } let inputImage: detectBarcode.InputImage = { uri: uri }; try { // 调用图片识码接口 @@ -136,7 +127,7 @@ struct WebComponent { .domStorageAccess(true) .height('40%') Text('Decode result is ' + this.decodeResult) - .fontSize(FONT_SIZE) + .fontSize(20) .height('10%') } } diff --git a/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebTextMenuItem.ets b/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebTextMenuItem.ets index 494a2a12176ed8a490046e45264b0d40dc29eda0..f87660aea048359d9cd008c4d9beb98be80e75f9 100644 --- a/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebTextMenuItem.ets +++ b/ArkWebKit/ArkWebMenu/entry/src/main/ets/pages/WebTextMenuItem.ets @@ -14,11 +14,6 @@ */ // [Start web_textMenuItem] import { webview } from '@kit.ArkWeb'; -import hilog from '@ohos.hilog'; - -const TAG = '[Sample_TextMenuItem]' -const DOMAIN = 0xF811 -const BUNDLE = 'TextMenuItem_' @Entry @Component @@ -57,22 +52,22 @@ struct WebComponent { onMenuItemClick(menuItem: TextMenuItem, textRange: TextRange): boolean { if (menuItem.id.equals(TextMenuItemId.CUT)) { // 用户自定义行为 - hilog.info(DOMAIN, TAG, BUNDLE + 'intercept id：CUT') + console.info('intercept id：CUT') return true; // 返回true不执行系统回调 } else if (menuItem.id.equals(TextMenuItemId.COPY)) { // 用户自定义行为 - hilog.info(DOMAIN, TAG, BUNDLE + 'Do not intercept id：COPY') + console.info('Do not intercept id：COPY') return false; // 返回false执行系统回调 } else if (menuItem.id.equals(TextMenuItemId.of('customItem1'))) { // 用户自定义行为 - hilog.info(DOMAIN, TAG, BUNDLE + 'intercept id：customItem1') - return true;// 用户自定义菜单选项返回true时点击后不关闭菜单，返回false时关闭菜单 - } else if (menuItem.id.equals(TextMenuItemId.of('customItem2'))){ + console.info('intercept id：customItem1') + return true; // 用户自定义菜单选项返回true时点击后不关闭菜单，返回false时关闭菜单 + } else if (menuItem.id.equals(TextMenuItemId.of('customItem2'))) { // 用户自定义行为 - hilog.info(DOMAIN, TAG, BUNDLE + 'intercept id：customItem2') + console.info('intercept id：customItem2') return true; } - return false;// 返回默认值false + return false; // 返回默认值false } @State editMenuOptions: EditMenuOptions = { onCreateMenu: this.onCreateMenu, onMenuItemClick: this.onMenuItemClick } diff --git a/ArkWebKit/ArkWebPictureInPicture/entry/src/ohosTest/ets/test/Ability.test.ets b/ArkWebKit/ArkWebPictureInPicture/entry/src/ohosTest/ets/test/Ability.test.ets index 3f37151c3a4cebfc44866dff039927dcec2e8bed..ea32c12351f173a5698f5d229188e06599705ab6 100644 --- a/ArkWebKit/ArkWebPictureInPicture/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/ArkWebKit/ArkWebPictureInPicture/entry/src/ohosTest/ets/test/Ability.test.ets @@ -16,11 +16,6 @@ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'; import { abilityDelegatorRegistry, Driver, ON } from '@kit.TestKit'; import { Want } from '@kit.AbilityKit'; -import hilog from '@ohos.hilog'; - -const TAG = '[Sample_WebPictureInPicture]' -const DOMAIN = 0xF811 -const BUNDLE = 'WebPictureInPicture_' const delegator: abilityDelegatorRegistry.AbilityDelegator = abilityDelegatorRegistry.getAbilityDelegator(); const bundleName = abilityDelegatorRegistry.getArguments().bundleName; @@ -52,7 +47,7 @@ export default function abilityTest() { // This API supports only one parameter: clear action function. }) it('testWebPictureInPicture001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE + 'uitest: testWebPictureInPicture001 begin'); + console.info('uitest: testWebPictureInPicture001 begin'); const driver = Driver.create(); await driver.delayMs(1000); @@ -68,7 +63,7 @@ export default function abilityTest() { await button2.click(); await driver.delayMs(1000); - hilog.info(DOMAIN, TAG, BUNDLE + 'uitest: testWebPictureInPicture001 end'); + console.info('uitest: testWebPictureInPicture001 end'); done(); }) }) diff --git a/ArkWebKit/ArkWebPictureInPicture/entry1/src/main/ets/pages/Index.ets b/ArkWebKit/ArkWebPictureInPicture/entry1/src/main/ets/pages/Index.ets index a78fe513b763b5efecff51ef4d74bbe923522bb9..a904f36a8dcbc777d42f7f006a5aa254c8fce666 100644 --- a/ArkWebKit/ArkWebPictureInPicture/entry1/src/main/ets/pages/Index.ets +++ b/ArkWebKit/ArkWebPictureInPicture/entry1/src/main/ets/pages/Index.ets @@ -15,11 +15,6 @@ // [Start web_full_screen] import { webview } from '@kit.ArkWeb'; -import hilog from '@ohos.hilog'; - -const TAG = '[Sample_WebFullScreen]' -const DOMAIN = 0xF811 -const BUNDLE = 'WebFullScreen_' @Entry @Component @@ -42,12 +37,12 @@ struct ShortWebPage { controller: this.controller }) .onFullScreenEnter((event) => { - hilog.info(DOMAIN, TAG, BUNDLE + "onFullScreenEnter..."); + console.info("onFullScreenEnter..."); // 当全屏的时候，isVisible标志位为false，组件状态为不可见，不参与布局、不进行占位 this.isVisible = false; }) .onFullScreenExit(() => { - hilog.info(DOMAIN, TAG, BUNDLE + "onFullScreenExit..."); + console.info("onFullScreenExit..."); // 当退出全屏的时候，isVisible标志位为true，组件状态为可见 this.isVisible = true; }) diff --git a/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/FixingPageFlickering.ets b/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/FixingPageFlickering.ets index 6ae45b1c0ed3ad138d3f8a426952dd487f80df49..451221ac01c8b8d14ef46adb569071f7b070e98c 100644 --- a/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/FixingPageFlickering.ets +++ b/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/FixingPageFlickering.ets @@ -13,10 +13,6 @@ * limitations under the License. */ import webview from '@ohos.web.webview'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_ProcessWeb]'; -const DOMAIN = 0xF811; -const BUNDLE = 'ProcessWeb_'; @Entry @Component struct FixingPageFlickering { @@ -26,12 +22,12 @@ struct FixingPageFlickering { // [Start FixingPageFlickeringButton] Web({ src: $rawfile('xxx.html'), controller: this.webController}) .backgroundColor(Color.Gray) - // [End FixingPageFlickeringButton] + // [End FixingPageFlickeringButton] .width('100%') .height('100%') .onPageEnd(() => { // 页面加载完成时的回调 - hilog.info(DOMAIN, TAG, BUNDLE, 'Web page loaded completely') + console.info('Web page loaded completely'); }) } .width('100%') diff --git a/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/Index.ets b/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/Index.ets index bfc916dff7224378c7f3c5e7c6b7287f40ccfe11..937728ce047d0eb4457f5065c87ffb59310fb5f7 100644 --- a/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/Index.ets +++ b/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/Index.ets @@ -13,10 +13,6 @@ * limitations under the License. */ import { BusinessError } from '@kit.BasicServicesKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_ProcessWeb]'; -const DOMAIN = 0xF811; -const BUNDLE = 'ProcessWeb_'; @Entry @Component struct Index { @@ -28,7 +24,7 @@ struct Index { url: 'pages/SetRenderProcessMode', }) .catch((error: BusinessError) => { - hilog.info(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.info(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -38,7 +34,7 @@ struct Index { url: 'pages/TerminateRenderProcess', }) .catch((error: BusinessError) => { - hilog.info(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.info(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -48,7 +44,7 @@ struct Index { url: 'pages/OnRenderExited', }) .catch((error: BusinessError) => { - hilog.info(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.info(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -58,7 +54,7 @@ struct Index { url: 'pages/OnRenderProcessNotResponding', }) .catch((error: BusinessError) => { - hilog.info(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.info(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -68,7 +64,7 @@ struct Index { url: 'pages/OnRenderProcessResponding', }) .catch((error: BusinessError) => { - hilog.info(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.info(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -78,7 +74,7 @@ struct Index { url: 'pages/WebComponentCreat', }) .catch((error: BusinessError) => { - hilog.info(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.info(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -88,7 +84,7 @@ struct Index { url: 'pages/FixingPageFlickering', }) .catch((error: BusinessError) => { - hilog.info(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.info(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) }.height('100%') diff --git a/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/OnRenderExited.ets b/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/OnRenderExited.ets index 89f7e386fda8ab05d93761039583671b0daa5f23..1fa6796e4d373f8df5ffa3ab5f07a84b78618615 100644 --- a/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/OnRenderExited.ets +++ b/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/OnRenderExited.ets @@ -14,10 +14,7 @@ */ // [Start onRenderExited] import { webview } from '@kit.ArkWeb'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_ProcessWeb]'; -const DOMAIN = 0xF811; -const BUNDLE = 'ProcessWeb_'; + @Entry @Component struct WebComponent { @@ -28,7 +25,7 @@ struct WebComponent { Web({ src: 'chrome://crash/', controller: this.controller }) .onRenderExited((event) => { if (event) { - hilog.info(DOMAIN, TAG, BUNDLE, 'reason:' + event.renderExitReason); + console.info('reason:' + event.renderExitReason); } }) } diff --git a/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/OnRenderProcessNotResponding.ets b/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/OnRenderProcessNotResponding.ets index 59f3dc40909b210c73c0a8a3cf7361fbe089a57d..e26046dd9d1cba2b693887793239518c851b001e 100644 --- a/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/OnRenderProcessNotResponding.ets +++ b/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/OnRenderProcessNotResponding.ets @@ -14,10 +14,7 @@ */ // [Start onRenderProcessNotResponding] import { webview } from '@kit.ArkWeb'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_ProcessWeb]'; -const DOMAIN = 0xF811; -const BUNDLE = 'ProcessWeb_'; + @Entry @Component struct WebComponent { @@ -27,7 +24,7 @@ struct WebComponent { Column() { Web({ src: 'www.example.com', controller: this.controller }) .onRenderProcessNotResponding((data) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'onRenderProcessNotResponding: [jsStack]= ' + data.jsStack + + console.info('onRenderProcessNotResponding: [jsStack]= ' + data.jsStack + ', [process]=' + data.pid + ', [reason]=' + data.reason); }) } diff --git a/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/OnRenderProcessResponding.ets b/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/OnRenderProcessResponding.ets index 1638ede3581b640b653ff310bc7b8aaa7dbe02ba..ccf2d7130c134a6effdb61975f3196a903449273 100644 --- a/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/OnRenderProcessResponding.ets +++ b/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/OnRenderProcessResponding.ets @@ -14,10 +14,7 @@ */ // [Start onRenderProcessResponding] import { webview } from '@kit.ArkWeb'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_ProcessWeb]'; -const DOMAIN = 0xF811; -const BUNDLE = 'ProcessWeb_'; + @Entry @Component struct WebComponent { @@ -27,7 +24,7 @@ struct WebComponent { Column() { Web({ src: 'www.example.com', controller: this.controller }) .onRenderProcessResponding(() => { - hilog.info(DOMAIN, TAG, BUNDLE, 'onRenderProcessResponding again'); + console.info('onRenderProcessResponding again'); }) } } diff --git a/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/SetRenderProcessMode.ets b/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/SetRenderProcessMode.ets index 950e78359ab45f599244610700a21cab68ccef79..bb3c7b467a7aef78797bbe463bb8e4bcf7b3f042 100644 --- a/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/SetRenderProcessMode.ets +++ b/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/SetRenderProcessMode.ets @@ -15,10 +15,7 @@ // [Start setRenderProcessMode] import { webview } from '@kit.ArkWeb'; import { BusinessError } from '@kit.BasicServicesKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_ProcessWeb]'; -const DOMAIN = 0xF811; -const BUNDLE = 'ProcessWeb_'; + @Entry @Component struct WebComponent { @@ -29,14 +26,14 @@ struct WebComponent { Button('getRenderProcessMode') .onClick(() => { let mode = webview.WebviewController.getRenderProcessMode(); - hilog.info(DOMAIN, TAG, BUNDLE, 'getRenderProcessMode: ' + mode); + console.info('getRenderProcessMode: ' + mode); }) Button('setRenderProcessMode') .onClick(() => { try { webview.WebviewController.setRenderProcessMode(webview.RenderProcessMode.MULTIPLE); } catch (error) { - hilog.error(DOMAIN, TAG, BUNDLE, `ErrorCode: ${(error as BusinessError).code}, Message: ${(error as BusinessError).message}`); + console.error(`ErrorCode: ${(error as BusinessError).code}, Message: ${(error as BusinessError).message}`); } }) Web({ src: 'www.example.com', controller: this.controller }) diff --git a/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/TerminateRenderProcess.ets b/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/TerminateRenderProcess.ets index 0e280f46249caee5995fbe463bce9a9e76cf6415..8283ec5f59b2d528d11490e07402afb9003b8fc9 100644 --- a/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/TerminateRenderProcess.ets +++ b/ArkWebKit/ProcessWeb/entry/src/main/ets/pages/TerminateRenderProcess.ets @@ -14,10 +14,7 @@ */ // [Start terminateRenderProcess] import { webview } from '@kit.ArkWeb'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_ProcessWeb]'; -const DOMAIN = 0xF811; -const BUNDLE = 'ProcessWeb_'; + @Entry @Component struct WebComponent { @@ -28,7 +25,7 @@ struct WebComponent { Button('terminateRenderProcess') .onClick(() => { let result = this.controller.terminateRenderProcess(); - hilog.info(DOMAIN, TAG, BUNDLE, 'terminateRenderProcess result: ' + result); + console.info('terminateRenderProcess result: ' + result); }) Web({ src: 'www.example.com', controller: this.controller }) } diff --git a/ArkWebKit/ProcessWeb/entry/src/ohosTest/ets/test/Ability.test.ets b/ArkWebKit/ProcessWeb/entry/src/ohosTest/ets/test/Ability.test.ets index 7c63364497a1f372e160a7df3e2cdb162733487a..e06f85e8cf4b6bb90b1302fbf2314d3d3115c68b 100644 --- a/ArkWebKit/ProcessWeb/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/ArkWebKit/ProcessWeb/entry/src/ohosTest/ets/test/Ability.test.ets @@ -16,17 +16,13 @@ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'; import { abilityDelegatorRegistry, Driver, ON } from '@kit.TestKit'; import { Want } from '@kit.AbilityKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_ProcessWeb]'; -const DOMAIN = 0xF811; -const BUNDLE = 'ProcessWeb_'; const delegator: abilityDelegatorRegistry.AbilityDelegator = abilityDelegatorRegistry.getAbilityDelegator(); const bundleName = abilityDelegatorRegistry.getArguments().bundleName; export default function abilityTest() { describe('ActsAbilityTest', () => { // Defines a test suite. Two parameters are supported: test suite name and test suite function. beforeAll(async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'ActsAbilityTest begin'); + console.info('ActsAbilityTest begin'); const want: Want = { bundleName: bundleName, abilityName: 'EntryAbility' @@ -34,7 +30,7 @@ export default function abilityTest() { await delegator.startAbility(want); const driver = Driver.create(); await driver.delayMs(1000); - hilog.info(DOMAIN, TAG, BUNDLE, 'get top ability'); + console.info('get top ability'); await driver.delayMs(1000); done(); @@ -58,7 +54,7 @@ export default function abilityTest() { // This API supports only one parameter: clear action function. }) it('processweb_setRenderProcessMode_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_setRenderProcessMode_001 begin'); + console.info('processweb_setRenderProcessMode_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('setRenderProcessModeButton')); @@ -75,14 +71,14 @@ export default function abilityTest() { const type = await driver.findComponent(ON.type('Web')); let src: string = await type.getText(); - hilog.info(DOMAIN, TAG, BUNDLE, 'src: ' + src); + console.info('src: ' + src); expect(src).assertContain('www.example.com'); - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_setRenderProcessMode_001 end'); + console.info('processweb_setRenderProcessMode_001 end'); done(); }) it('processweb_terminateRenderProcess_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_terminateRenderProcess_001 begin'); + console.info('processweb_terminateRenderProcess_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('terminateRenderProcessButton')); @@ -95,14 +91,14 @@ export default function abilityTest() { const type = await driver.findComponent(ON.type('Web')); let src: string = await type.getText(); - hilog.info(DOMAIN, TAG, BUNDLE, 'src: ' + src); + console.info('src: ' + src); expect(src).assertContain('www.example.com'); - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_terminateRenderProcess_001 end'); + console.info('processweb_terminateRenderProcess_001 end'); done(); }) it('processweb_onRenderExited_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_onRenderExited_001 begin'); + console.info('processweb_onRenderExited_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('onRenderExitedButton')); @@ -111,14 +107,14 @@ export default function abilityTest() { const type = await driver.findComponent(ON.type('Web')); let src: string = await type.getText(); - hilog.info(DOMAIN, TAG, BUNDLE, 'src: ' + src); + console.info('src: ' + src); expect(src).assertContain('chrome://crash/'); - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_onRenderExited_001 end'); + console.info('processweb_onRenderExited_001 end'); done(); }) it('processweb_onRenderProcessNotResponding_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_onRenderProcessNotResponding_001 begin'); + console.info('processweb_onRenderProcessNotResponding_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('onRenderProcessNotRespondingButton')); @@ -127,14 +123,14 @@ export default function abilityTest() { const type = await driver.findComponent(ON.type('Web')); let src: string = await type.getText(); - hilog.info(DOMAIN, TAG, BUNDLE, 'src: ' + src); + console.info('src: ' + src); expect(src).assertContain('www.example.com'); - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_onRenderProcessNotResponding_001 end'); + console.info('processweb_onRenderProcessNotResponding_001 end'); done(); }) it('processweb_onRenderProcessResponding_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_onRenderProcessResponding_001 begin'); + console.info('processweb_onRenderProcessResponding_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('onRenderProcessRespondingButton')); @@ -143,15 +139,15 @@ export default function abilityTest() { const type = await driver.findComponent(ON.type('Web')); let src: string = await type.getText(); - hilog.info(DOMAIN, TAG, BUNDLE, 'src: ' + src); + console.info('src: ' + src); expect(src).assertContain('www.example.com'); - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_onRenderProcessResponding_001 end'); + console.info('processweb_onRenderProcessResponding_001 end'); done(); }) it('processweb_WebComponentCreat_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_WebComponentCreat_001 begin'); + console.info('processweb_WebComponentCreat_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('WebComponentCreatButton')); @@ -160,15 +156,15 @@ export default function abilityTest() { const type = await driver.findComponent(ON.type('Web')); let src: string = await type.getText(); - hilog.info(DOMAIN, TAG, BUNDLE, 'src: ' + src); + console.info('src: ' + src); expect(src).assertContain('www.example.com'); - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_WebComponentCreat_001 end'); + console.info('processweb_WebComponentCreat_001 end'); done(); }) it('processweb_FixingPageFlickering_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_FixingPageFlickering_001 begin'); + console.info('processweb_FixingPageFlickering_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('FixingPageFlickeringButton')); @@ -177,9 +173,9 @@ export default function abilityTest() { const type = await driver.findComponent(ON.type('Web')); let src: string = await type.getText(); - hilog.info(DOMAIN, TAG, BUNDLE, 'src: ' + src); + console.info('src: ' + src); expect(src).assertContain('xxx.html'); - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_FixingPageFlickering_001 end'); + console.info('processweb_FixingPageFlickering_001 end'); done(); }) diff --git a/ArkWebKit/ShowWebPageDialog/AppScope/app.json5 b/ArkWebKit/ShowWebPageDialog/AppScope/app.json5 index dc4c80d7d16b17263e5ef4505df21f195140c04d..e9b236cead1ec5ac7ed89d4e108538d25d2cf414 100644 --- a/ArkWebKit/ShowWebPageDialog/AppScope/app.json5 +++ b/ArkWebKit/ShowWebPageDialog/AppScope/app.json5 @@ -14,7 +14,7 @@ */ { "app": { - "bundleName": "com.samples.myapplication", + "bundleName": "com.samples.showwebpageDialog", "vendor": "example", "versionCode": 1000000, "versionName": "1.0.0", diff --git a/ArkWebKit/ShowWebPageDialog/entry/src/main/ets/pages/AchieveAlertDialogPage1.ets b/ArkWebKit/ShowWebPageDialog/entry/src/main/ets/pages/AchieveAlertDialogPage1.ets index a23ad1e4601db6ab6b3d2d2a858377065343103d..df972a40f939adb08bb0fa3f09aa0dbb262484cf 100644 --- a/ArkWebKit/ShowWebPageDialog/entry/src/main/ets/pages/AchieveAlertDialogPage1.ets +++ b/ArkWebKit/ShowWebPageDialog/entry/src/main/ets/pages/AchieveAlertDialogPage1.ets @@ -14,36 +14,28 @@ */ // [Start AchieveAlertDialogPage1] import { webview } from '@kit.ArkWeb'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_ShowWebPageDialog]'; -const DOMAIN = 0xF811; -const BUNDLE = 'ShowWebPageDialog_'; + @Entry @Component struct Index { @State message: string = 'Hello World'; webviewController: webview.WebviewController = new webview.WebviewController(); uiContext: UIContext = this.getUIContext(); - context = this.getUIContext().getHostContext(); build() { Row() { Web({ src: $rawfile('test.html'), controller: this.webviewController }) .onAlert((event) => { if (event) { - hilog.info(DOMAIN, TAG, BUNDLE, 'event.url:' + event.url); - hilog.info(DOMAIN, TAG, BUNDLE, 'event.message:' + event.message); + console.info('event.url:' + event.url); + console.info('event.message:' + event.message); this.uiContext.showAlertDialog({ - // $r('app.string.from')需要替换为开发者所需的资源文件 - title: this.context?.resourceManager.getStringSync($r('app.string.from').id) + event.url + - // $r('app.string.warn')需要替换为开发者所需的资源文件 - this.context?.resourceManager.getStringSync($r('app.string.warn').id), + title: 'from' + event.url + 'warning', message: event.message, confirm:{ - // $r('app.string.notarize')需要替换为开发者所需的资源文件 - value: $r('app.string.notarize'), + value: 'confirm', action: () => { - hilog.info(DOMAIN, TAG, BUNDLE, 'Alert confirmed.'); + console.info('Alert confirmed.'); event.result.handleConfirm(); } }, diff --git a/ArkWebKit/ShowWebPageDialog/entry/src/main/ets/pages/AchieveAlertDialogPage2.ets b/ArkWebKit/ShowWebPageDialog/entry/src/main/ets/pages/AchieveAlertDialogPage2.ets index 7478f539c7bd2fd306114b860d64de9507fd2323..7903f1dec83346859d835e93b30f286d4537a71b 100644 --- a/ArkWebKit/ShowWebPageDialog/entry/src/main/ets/pages/AchieveAlertDialogPage2.ets +++ b/ArkWebKit/ShowWebPageDialog/entry/src/main/ets/pages/AchieveAlertDialogPage2.ets @@ -15,10 +15,6 @@ // [Start AchieveAlertDialogPage2] import { AlertDialog } from '@kit.ArkUI'; import { webview } from '@kit.ArkWeb'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_ShowWebPageDialog]'; -const DOMAIN = 0xF811; -const BUNDLE = 'ShowWebPageDialog_'; @Entry @Component @@ -34,11 +30,10 @@ struct AlertDialogPage { secondaryTitle: this.subtitle, content: this.message, primaryButton: { - // $r('app.string.notarize')需要替换为开发者所需的资源文件 - value: $r('app.string.notarize'), + value: 'confirm', role: ButtonRole.ERROR, action: () => { - hilog.info(DOMAIN, TAG, BUNDLE, 'Callback when the second button is clicked'); + console.info('Callback when the second button is clicked'); this.result?.handleConfirm(); } }, @@ -48,18 +43,14 @@ struct AlertDialogPage { this.dialogControllerAlert.close(); } }) - context = this.getUIContext().getHostContext(); build() { Column() { Web({ src: $rawfile('alert.html'), controller: this.webviewController }) .onAlert((event) => { if (event) { - hilog.info(DOMAIN, TAG, BUNDLE, 'event.url:' + event.url); - hilog.info(DOMAIN, TAG, BUNDLE, 'event.message:' + event.message); - // $r('app.string.from')需要替换为开发者所需的资源文件 - this.title = this.context?.resourceManager.getStringSync($r('app.string.from').id) + event.url + - // $r('app.string.warn')需要替换为开发者所需的资源文件 - this.context?.resourceManager.getStringSync($r('app.string.warn').id); + console.info('event.url:' + event.url); + console.info('event.message:' + event.message); + this.title = 'from' + event.url + 'warning'; this.message = event.message; this.result = event.result; this.dialogControllerAlert.open(); diff --git a/ArkWebKit/ShowWebPageDialog/entry/src/main/ets/pages/AchievePromptDialogPage.ets b/ArkWebKit/ShowWebPageDialog/entry/src/main/ets/pages/AchievePromptDialogPage.ets index d326623378050bb8f1511aec134b5b8011cb12b8..4b8cda752804ae6ffa4091f24c218f03e5202edd 100644 --- a/ArkWebKit/ShowWebPageDialog/entry/src/main/ets/pages/AchievePromptDialogPage.ets +++ b/ArkWebKit/ShowWebPageDialog/entry/src/main/ets/pages/AchievePromptDialogPage.ets @@ -15,10 +15,6 @@ // [Start AchievePromptDialogPage] import { CustomContentDialog } from '@kit.ArkUI'; import { webview } from '@kit.ArkWeb'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_ShowWebPageDialog]'; -const DOMAIN = 0xF811; -const BUNDLE = 'ShowWebPageDialog_'; @Entry @Component @@ -28,7 +24,6 @@ struct PromptDialog { @State result: JsResult | null = null; promptResult: string = ''; webviewController: webview.WebviewController = new webview.WebviewController(); - context = this.getUIContext().getHostContext(); dialogController: CustomDialogController = new CustomDialogController({ builder: CustomContentDialog({ primaryTitle: this.title, @@ -37,17 +32,15 @@ struct PromptDialog { }, buttons: [ { - // $r('app.string.cancel')需要替换为开发者所需的资源文件 - value: $r('app.string.cancel'), + value: 'cancel', buttonStyle: ButtonStyleMode.TEXTUAL, action: () => { - hilog.info(DOMAIN, TAG, BUNDLE, 'Callback when the button is clicked'); + console.info('Callback when the button is clicked'); this.result?.handleCancel(); } }, { - // $r('app.string.notarize')需要替换为开发者所需的资源文件 - value: $r('app.string.notarize'), + value: 'confirm', buttonStyle: ButtonStyleMode.TEXTUAL, action: () => { this.result?.handlePromptConfirm(this.promptResult); @@ -80,13 +73,10 @@ struct PromptDialog { Web({ src: $rawfile('prompt.html'), controller: this.webviewController }) .onPrompt((event) => { if (event) { - hilog.info(DOMAIN, TAG, BUNDLE, 'event.url:' + event.url); - hilog.info(DOMAIN, TAG, BUNDLE, 'event.message:' + event.message); - hilog.info(DOMAIN, TAG, BUNDLE, 'event.value:' + event.value); - // $r('app.string.from')需要替换为开发者所需的资源文件 - this.title = this.context?.resourceManager.getStringSync($r('app.string.from').id) + - // $r('app.string.info')需要替换为开发者所需的资源文件 - event.url + this.context?.resourceManager.getStringSync($r('app.string.info').id); + console.info('event.url:' + event.url); + console.info('event.message:' + event.message); + console.info('event.value:' + event.value); + this.title = 'from' + event.url + 'news'; this.message = event.message; this.promptResult = event.value; this.result = event.result; diff --git a/ArkWebKit/ShowWebPageDialog/entry/src/main/ets/pages/Index.ets b/ArkWebKit/ShowWebPageDialog/entry/src/main/ets/pages/Index.ets index 7485d77dd26f28d215ee078e3cf30eac00ba431e..58dbc928df531eeb74da637ac11e5c0697ff2c61 100644 --- a/ArkWebKit/ShowWebPageDialog/entry/src/main/ets/pages/Index.ets +++ b/ArkWebKit/ShowWebPageDialog/entry/src/main/ets/pages/Index.ets @@ -13,10 +13,6 @@ * limitations under the License. */ import { BusinessError } from '@kit.BasicServicesKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_ShowWebPageDialog]'; -const DOMAIN = 0xF811; -const BUNDLE = 'ShowWebPageDialog_'; @Entry @Component @@ -29,7 +25,7 @@ struct Index { url: 'pages/AchieveAlertDialogPage1', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -39,7 +35,7 @@ struct Index { url: 'pages/AchieveAlertDialogPage2', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -49,7 +45,7 @@ struct Index { url: 'pages/AchievePromptDialogPage', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) diff --git a/ArkWebKit/ShowWebPageDialog/entry/src/ohosTest/ets/test/Ability.test.ets b/ArkWebKit/ShowWebPageDialog/entry/src/ohosTest/ets/test/Ability.test.ets index f15d27a27c1c7cbb1c4e7e4f94b92b55229a3348..ff49c1fcc14a59248e914004869867453324d57e 100644 --- a/ArkWebKit/ShowWebPageDialog/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/ArkWebKit/ShowWebPageDialog/entry/src/ohosTest/ets/test/Ability.test.ets @@ -15,17 +15,13 @@ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'; import { abilityDelegatorRegistry, Driver, ON } from '@kit.TestKit'; import { Want } from '@kit.AbilityKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_ShowWebPageDialog]'; -const DOMAIN = 0xF811; -const BUNDLE = 'ShowWebPageDialog_'; const delegator: abilityDelegatorRegistry.AbilityDelegator = abilityDelegatorRegistry.getAbilityDelegator(); const bundleName = abilityDelegatorRegistry.getArguments().bundleName; export default function abilityTest() { describe('ActsAbilityTest1', () => { // Defines a test suite. Two parameters are supported: test suite name and test suite function. beforeAll(async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: ActsAbilityTest1 begin'); + console.info('uitest: ActsAbilityTest1 begin'); const want: Want = { bundleName: bundleName, abilityName: 'EntryAbility' @@ -33,7 +29,7 @@ export default function abilityTest() { await delegator.startAbility(want); const driver = Driver.create(); await driver.delayMs(1000); - hilog.info(DOMAIN, TAG, BUNDLE, 'get top ability'); + console.info('get top ability'); await driver.delayMs(1000); done(); @@ -59,7 +55,7 @@ export default function abilityTest() { // This API supports only one parameter: clear action function. }) it('processweb_AchieveAlertDialogPage1_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_AchieveAlertDialogPage1_001 begin'); + console.info('uitest: processweb_AchieveAlertDialogPage1_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('AchieveAlertDialogPage1Button')); @@ -72,13 +68,13 @@ export default function abilityTest() { const alertText = await driver.findComponent(ON.type('AlertDialog')); expect(alertText != null).assertEqual(true); - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_AchieveAlertDialogPage1_001 end'); + console.info('uitest: processweb_AchieveAlertDialogPage1_001 end'); done(); }) it('processweb_AchieveAlertDialogPage2_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_AchieveAlertDialogPage2_001 begin'); + console.info('uitest: processweb_AchieveAlertDialogPage2_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('AchieveAlertDialogPage2Button')); @@ -91,13 +87,13 @@ export default function abilityTest() { const alertText = await driver.findComponent(ON.type('Dialog')); expect(alertText != null).assertEqual(true); - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_AchieveAlertDialogPage2_001 end'); + console.info('uitest: processweb_AchieveAlertDialogPage2_001 end'); done(); }) it('processweb_AchievePromptDialogPage_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_AchievePromptDialogPage_001 begin'); + console.info('uitest: processweb_AchievePromptDialogPage_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('AchievePromptDialogPageButton')); @@ -110,7 +106,7 @@ export default function abilityTest() { const alertText = await driver.findComponent(ON.type('Dialog')); expect(alertText != null).assertEqual(true); - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_AchievePromptDialogPage_001 end'); + console.info('uitest: processweb_AchievePromptDialogPage_001 end'); done(); }) diff --git a/ArkWebKit/ShowWebPageDialog/entry2/src/main/ets/pages/AchieveConfirmDialogPage1.ets b/ArkWebKit/ShowWebPageDialog/entry2/src/main/ets/pages/AchieveConfirmDialogPage1.ets index 88c4e3486816acd6c8763bb60fd3ddfdbe5a923c..4b63657d00dbf7963e0cdc0a614f14436dd336a1 100644 --- a/ArkWebKit/ShowWebPageDialog/entry2/src/main/ets/pages/AchieveConfirmDialogPage1.ets +++ b/ArkWebKit/ShowWebPageDialog/entry2/src/main/ets/pages/AchieveConfirmDialogPage1.ets @@ -14,10 +14,6 @@ */ // [Start AchieveConfirmDialogPage1] import { webview } from '@kit.ArkWeb'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_ShowWebPageDialog]'; -const DOMAIN = 0xF811; -const BUNDLE = 'ShowWebPageDialog_'; @Entry @Component @@ -25,19 +21,16 @@ struct Index { @State message: string = 'Hello World'; webviewController: webview.WebviewController = new webview.WebviewController(); uiContext: UIContext = this.getUIContext(); - context = this.getUIContext().getHostContext(); + build() { Column() { Web({ src: $rawfile('test.html'), controller: this.webviewController }) .onConfirm((event) => { if (event) { - hilog.info(DOMAIN, TAG, BUNDLE, 'event.url:' + event.url); - hilog.info(DOMAIN, TAG, BUNDLE, 'event.message:' + event.message); + console.info('event.url:' + event.url); + console.info('event.message:' + event.message); this.uiContext.showAlertDialog({ - // $r('app.string.from')需要替换为开发者所需的资源文件 - title: this.context?.resourceManager.getStringSync($r('app.string.from').id) + - // $r('app.string.info')需要替换为开发者所需的资源文件 - event.url + this.context?.resourceManager.getStringSync($r('app.string.info').id), + title: 'from' + event.url + 'news', message: event.message, primaryButton: { value: 'cancel', diff --git a/ArkWebKit/ShowWebPageDialog/entry2/src/main/ets/pages/AchieveConfirmDialogPage2.ets b/ArkWebKit/ShowWebPageDialog/entry2/src/main/ets/pages/AchieveConfirmDialogPage2.ets index ba2df437bdd54662007def1326642e7872a9d293..75ba3156a1b12b00d18593fcb192ff3744473eac 100644 --- a/ArkWebKit/ShowWebPageDialog/entry2/src/main/ets/pages/AchieveConfirmDialogPage2.ets +++ b/ArkWebKit/ShowWebPageDialog/entry2/src/main/ets/pages/AchieveConfirmDialogPage2.ets @@ -15,10 +15,6 @@ // [Start AchieveConfirmDialogPage2] import { webview } from '@kit.ArkWeb'; import { ConfirmDialog } from '@kit.ArkUI'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_ShowWebPageDialog]'; -const DOMAIN = 0xF811; -const BUNDLE = 'ShowWebPageDialog_'; @Entry @Component @@ -26,7 +22,6 @@ struct DialogConfirmDialog { @State message: string = 'Hello World'; @State title: string = 'Hello World'; @State result: JsResult | null = null; - context = this.getUIContext().getHostContext() webviewController: webview.WebviewController = new webview.WebviewController(); isChecked = false; dialogControllerCheckBox: CustomDialogController = new CustomDialogController({ @@ -36,27 +31,24 @@ struct DialogConfirmDialog { // 勾选框选中状态 isChecked: this.isChecked, // 勾选框说明文本 - // $r('app.string.noPrompt')需要替换为开发者所需的资源文件 - checkTips: $r('app.string.noPrompt'), + checkTips: 'No further prompts after prohibition', primaryButton: { - // $r('app.string.no')需要替换为开发者所需的资源文件 - value: $r('app.string.no'), + value: 'prohibited', action: () => { this.result?.handleCancel(); }, }, secondaryButton: { - // $r('app.string.allow')需要替换为开发者所需的资源文件 - value: $r('app.string.allow'), + value: 'allow', action: () => { this.isChecked = false; - hilog.info(DOMAIN, TAG, BUNDLE, 'Callback when the second button is clicked'); + console.info('Callback when the second button is clicked'); this.result?.handleConfirm(); } }, onCheckedChange: (checked) => { this.isChecked = checked; - hilog.info(DOMAIN, TAG, BUNDLE, 'Callback when the checkbox is clicked'); + console.info('Callback when the checkbox is clicked'); }, }), onWillDismiss: () => { @@ -74,12 +66,9 @@ struct DialogConfirmDialog { if (this.isChecked) { event.result.handleCancel(); } else { - hilog.info(DOMAIN, TAG, BUNDLE, 'event.url:' + event.url); - hilog.info(DOMAIN, TAG, BUNDLE, 'event.message:' + event.message); - // $r('app.string.from')需要替换为开发者所需的资源文件 - this.title = this.context?.resourceManager.getStringSync($r('app.string.from').id) + - // $r('app.string.info')需要替换为开发者所需的资源文件 - event.url + this.context?.resourceManager.getStringSync($r('app.string.info').id); + console.info('event.url:' + event.url); + console.info('event.message:' + event.message); + this.title = 'from' + event.url + 'news'; this.message = event.message; this.result = event.result; this.dialogControllerCheckBox.open(); diff --git a/ArkWebKit/ShowWebPageDialog/entry2/src/main/ets/pages/Index.ets b/ArkWebKit/ShowWebPageDialog/entry2/src/main/ets/pages/Index.ets index ae89fab01e469215ec9a42af3815297ea609e373..1a4dd7ec8bef48bc93c8adee5f6049c1accce8a6 100644 --- a/ArkWebKit/ShowWebPageDialog/entry2/src/main/ets/pages/Index.ets +++ b/ArkWebKit/ShowWebPageDialog/entry2/src/main/ets/pages/Index.ets @@ -13,10 +13,6 @@ * limitations under the License. */ import { BusinessError } from '@kit.BasicServicesKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_ShowWebPageDialog]'; -const DOMAIN = 0xF811; -const BUNDLE = 'ShowWebPageDialog_'; @Entry @Component @@ -29,7 +25,7 @@ struct Index { url: 'pages/AchieveConfirmDialogPage1', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -39,7 +35,7 @@ struct Index { url: 'pages/AchieveConfirmDialogPage2', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) }.height('100%') diff --git a/ArkWebKit/ShowWebPageDialog/entry2/src/ohosTest/ets/test/Ability.test.ets b/ArkWebKit/ShowWebPageDialog/entry2/src/ohosTest/ets/test/Ability.test.ets index 7eb857d8396739aca10ed3d80d184ddddbbbb3aa..4034018439e6f94ab6d0b796b1f5980c4b48132d 100644 --- a/ArkWebKit/ShowWebPageDialog/entry2/src/ohosTest/ets/test/Ability.test.ets +++ b/ArkWebKit/ShowWebPageDialog/entry2/src/ohosTest/ets/test/Ability.test.ets @@ -15,17 +15,13 @@ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'; import { abilityDelegatorRegistry, Driver, ON } from '@kit.TestKit'; import { Want } from '@kit.AbilityKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_ShowWebPageDialog]'; -const DOMAIN = 0xF811; -const BUNDLE = 'ShowWebPageDialog_'; const delegator: abilityDelegatorRegistry.AbilityDelegator = abilityDelegatorRegistry.getAbilityDelegator(); const bundleName = abilityDelegatorRegistry.getArguments().bundleName; export default function abilityTest() { describe('ActsAbilityTest2', () => { // Defines a test suite. Two parameters are supported: test suite name and test suite function. beforeAll(async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: ActsAbilityTest2 begin'); + console.info('uitest: ActsAbilityTest2 begin'); const want: Want = { bundleName: bundleName, abilityName: 'Entry2Ability' @@ -33,7 +29,7 @@ export default function abilityTest() { await delegator.startAbility(want); const driver = Driver.create(); await driver.delayMs(1000); - hilog.info(DOMAIN, TAG, BUNDLE, 'get top ability'); + console.info('get top ability'); await driver.delayMs(1000); done(); @@ -59,7 +55,7 @@ export default function abilityTest() { // This API supports only one parameter: clear action function. }) it('processweb_AchieveConfirmDialogPage1_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_AchieveConfirmDialogPage1_001 begin'); + console.info('uitest: processweb_AchieveConfirmDialogPage1_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('AchieveConfirmDialogPage1Button')); @@ -72,13 +68,13 @@ export default function abilityTest() { const alertText = await driver.findComponent(ON.type('AlertDialog')); expect(alertText != null).assertEqual(true); - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_AchieveConfirmDialogPage1_001 end'); + console.info('uitest: processweb_AchieveConfirmDialogPage1_001 end'); done(); }) it('processweb_AchieveConfirmDialogPage2_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_AchieveConfirmDialogPage2_001 begin'); + console.info('uitest: processweb_AchieveConfirmDialogPage2_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('AchieveConfirmDialogPage2Button')); @@ -91,7 +87,7 @@ export default function abilityTest() { const alertText = await driver.findComponent(ON.type('Dialog')); expect(alertText != null).assertEqual(true); - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_AchieveConfirmDialogPage2_001 end'); + console.info('uitest: processweb_AchieveConfirmDialogPage2_001 end'); done(); }) diff --git a/ArkWebKit/WebDragInteraction/AppScope/app.json5 b/ArkWebKit/WebDragInteraction/AppScope/app.json5 index dc4c80d7d16b17263e5ef4505df21f195140c04d..c8432237d541ab143b1e8b4fe7efa2db9c24f769 100644 --- a/ArkWebKit/WebDragInteraction/AppScope/app.json5 +++ b/ArkWebKit/WebDragInteraction/AppScope/app.json5 @@ -14,7 +14,7 @@ */ { "app": { - "bundleName": "com.samples.myapplication", + "bundleName": "com.samples.webdraginteraction", "vendor": "example", "versionCode": 1000000, "versionName": "1.0.0", diff --git a/ArkWebKit/WebDragInteraction/entry/src/main/ets/pages/DragArkTSPage.ets b/ArkWebKit/WebDragInteraction/entry/src/main/ets/pages/DragArkTSPage.ets index 4067b76666be194a6305b4c9c62aa0ba41faed7a..de2392b5b57bfbcb3b568d084ff8b174ef351c65 100644 --- a/ArkWebKit/WebDragInteraction/entry/src/main/ets/pages/DragArkTSPage.ets +++ b/ArkWebKit/WebDragInteraction/entry/src/main/ets/pages/DragArkTSPage.ets @@ -15,10 +15,6 @@ // [Start DragArkTSPage] import { webview } from '@kit.ArkWeb' import { unifiedDataChannel, uniformTypeDescriptor } from '@kit.ArkData'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_WebDragInteraction]'; -const DOMAIN = 0xF811; -const BUNDLE = 'WebDragInteraction_'; @Entry @Component @@ -37,15 +33,15 @@ struct DragDrop { this.ports = this.controller.createWebMessagePorts(); this.ports[1].onMessageEvent((result: webview.WebMessage) => { //ArkTS收到html传来的数据后的处理，可以先打日志确认下消息，双端的消息格式可以自己约定，能唯一识别就行 - hilog.info(DOMAIN, TAG, BUNDLE, 'ETS receive Message: typeof (result) = ' + typeof (result) + ';' + result); + console.info('ETS receive Message: typeof (result) = ' + typeof (result) + ';' + result); //这里添加result中消息接收到后的处理,可进行耗时任务 }); - hilog.info(DOMAIN, TAG, BUNDLE, 'ETS postMessage set h5port '); + console.info('ETS postMessage set h5port '); //完成通信端口注册后，向前端发送注册完成消息，完成双向的端口绑定 this.controller.postMessage('__init_port__', [this.ports[0]], '*'); })// onDrop 可做简单逻辑，例如暂存一些关键数据 .onDrop((dragEvent: DragEvent) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'ETS onDrop!') + console.info('ETS onDrop!') let data: UnifiedData = dragEvent.getData(); if(!data) { return false; @@ -59,7 +55,7 @@ struct DragDrop { if (uriArr[i].getType() === uniformTypeDescriptor.UniformDataType.PLAIN_TEXT) { let plainText = uriArr[i] as unifiedDataChannel.PlainText; if (plainText.textContent) { - hilog.info(DOMAIN, TAG, BUNDLE, 'plainText.textContent: ', plainText.textContent); + console.info('plainText.textContent: ', plainText.textContent); } } } diff --git a/ArkWebKit/WebDragInteraction/entry/src/main/ets/pages/Index.ets b/ArkWebKit/WebDragInteraction/entry/src/main/ets/pages/Index.ets index 07d0b3e7b66f8e99c46d504cdcfb2e08270c24f3..fd014d14f39791ab724b4e936e6c18e71252545b 100644 --- a/ArkWebKit/WebDragInteraction/entry/src/main/ets/pages/Index.ets +++ b/ArkWebKit/WebDragInteraction/entry/src/main/ets/pages/Index.ets @@ -13,10 +13,6 @@ * limitations under the License. */ import { BusinessError } from '@kit.BasicServicesKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_WebDragInteraction]'; -const DOMAIN = 0xF811; -const BUNDLE = 'WebDragInteraction_'; @Entry @Component @@ -29,7 +25,7 @@ struct Index { url: 'pages/DragArkTSPage', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -39,7 +35,7 @@ struct Index { url: 'pages/SetUAPage', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) diff --git a/ArkWebKit/WebDragInteraction/entry/src/ohosTest/ets/test/Ability.test.ets b/ArkWebKit/WebDragInteraction/entry/src/ohosTest/ets/test/Ability.test.ets index a8a0191735633c5bf3943ee190e4a413bfcc9571..00ed851279fb2201d672e52bb24b495d8c6ee598 100644 --- a/ArkWebKit/WebDragInteraction/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/ArkWebKit/WebDragInteraction/entry/src/ohosTest/ets/test/Ability.test.ets @@ -15,12 +15,8 @@ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'; import { abilityDelegatorRegistry, Driver, ON } from '@kit.TestKit'; import { Want } from '@kit.AbilityKit'; -import hilog from '@ohos.hilog'; const delegator: abilityDelegatorRegistry.AbilityDelegator = abilityDelegatorRegistry.getAbilityDelegator(); const bundleName = abilityDelegatorRegistry.getArguments().bundleName; -const TAG = '[Sample_WebDragInteraction]'; -const DOMAIN = 0xF811; -const BUNDLE = 'WebDragInteraction_'; async function getResourceString(resource: Resource): Promise { let manage = delegator.getAppContext().resourceManager; let text = await manage.getStringValue(resource); @@ -30,7 +26,7 @@ export default function abilityTest() { describe('ActsAbilityTest', () => { // Defines a test suite. Two parameters are supported: test suite name and test suite function. beforeAll(async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: ActsAbilityTest begin'); + console.info('uitest: ActsAbilityTest begin'); const want: Want = { bundleName: bundleName, abilityName: 'EntryAbility' @@ -38,7 +34,7 @@ export default function abilityTest() { await delegator.startAbility(want); const driver = Driver.create(); await driver.delayMs(1000); - hilog.info(DOMAIN, TAG, BUNDLE, 'get top ability'); + console.info('get top ability'); await driver.delayMs(1000); done(); @@ -62,7 +58,7 @@ export default function abilityTest() { // This API supports only one parameter: clear action function. }) it('processweb_DragArkTSPage_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_DragArkTSPage_001 begin'); + console.info('uitest: processweb_DragArkTSPage_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('DragArkTSPageButton')); @@ -78,13 +74,13 @@ export default function abilityTest() { const res2 = await Component3.getText(); const res = await Component2.getText(); expect(res).assertEqual(res2); - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_DragArkTSPage_001 end'); + console.info('uitest: processweb_DragArkTSPage_001 end'); done(); }) it('processweb_SetUAPage_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_SetUAPage_001 begin'); + console.info('uitest: processweb_SetUAPage_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('SetUAPageButton')); @@ -96,7 +92,7 @@ export default function abilityTest() { await driver.delayMs(1000); expect(res).assertContain('example.com'); - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_SetUAPage_001 end'); + console.info('uitest: processweb_SetUAPage_001 end'); done(); }) diff --git a/ArkWebKit/WebFocusManagement/entry/src/main/ets/pages/Index.ets b/ArkWebKit/WebFocusManagement/entry/src/main/ets/pages/Index.ets index d18b42fbfb118fd06c54ce5f51efc83db043d307..2b0774e08abe69a5a65a4f362bef6aae10012990 100644 --- a/ArkWebKit/WebFocusManagement/entry/src/main/ets/pages/Index.ets +++ b/ArkWebKit/WebFocusManagement/entry/src/main/ets/pages/Index.ets @@ -13,10 +13,6 @@ * limitations under the License. */ import { BusinessError } from '@kit.BasicServicesKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_WebFocusManagement]'; -const DOMAIN = 0xF811; -const BUNDLE = 'WebFocusManagement_'; @Entry @Component @@ -29,7 +25,7 @@ struct Index { url: 'pages/WebFocusManagement', }) .catch((error: BusinessError) => { - hilog.info(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.info(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -39,7 +35,7 @@ struct Index { url: 'pages/WebFocusManagement2', }) .catch((error: BusinessError) => { - hilog.info(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.info(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) diff --git a/ArkWebKit/WebFocusManagement/entry/src/main/ets/pages/WebFocusManagement.ets b/ArkWebKit/WebFocusManagement/entry/src/main/ets/pages/WebFocusManagement.ets index 672c545320012d6bc5f6756c9e62a65140b50d65..0923e98809b21aabc5cdc6f13ab0301967b23ee9 100644 --- a/ArkWebKit/WebFocusManagement/entry/src/main/ets/pages/WebFocusManagement.ets +++ b/ArkWebKit/WebFocusManagement/entry/src/main/ets/pages/WebFocusManagement.ets @@ -15,10 +15,7 @@ // [Start WebFocusManagement] import { webview } from '@kit.ArkWeb'; import { BusinessError } from '@kit.BasicServicesKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_WebFocusManagement]'; -const DOMAIN = 0xF811; -const BUNDLE = 'WebFocusManagement_'; + @Entry @Component struct WebComponent { @@ -35,7 +32,7 @@ struct WebComponent { try { this.controller.requestFocus(); } catch (error) { - hilog.error(DOMAIN, TAG, BUNDLE, `ErrorCode: ${(error as BusinessError).code}, Message: ${(error as BusinessError).message}`); + console.error(`ErrorCode: ${(error as BusinessError).code}, Message: ${(error as BusinessError).message}`); } }); Button('web2 requestFocus') @@ -43,7 +40,7 @@ struct WebComponent { try { this.controller2.requestFocus(); } catch (error) { - hilog.error(DOMAIN, TAG, BUNDLE, `ErrorCode: ${(error as BusinessError).code}, Message: ${(error as BusinessError).message}`); + console.error(`ErrorCode: ${(error as BusinessError).code}, Message: ${(error as BusinessError).message}`); } }); } diff --git a/ArkWebKit/WebFocusManagement/entry/src/ohosTest/ets/test/Ability.test.ets b/ArkWebKit/WebFocusManagement/entry/src/ohosTest/ets/test/Ability.test.ets index 7977e40be5d8789f39be4074c0f8cb74803c4b42..a0c1534822899194490234dfd7f88ec6af12ef22 100644 --- a/ArkWebKit/WebFocusManagement/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/ArkWebKit/WebFocusManagement/entry/src/ohosTest/ets/test/Ability.test.ets @@ -15,17 +15,13 @@ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'; import { abilityDelegatorRegistry, Driver, ON } from '@kit.TestKit'; import { Want } from '@kit.AbilityKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_WebFocusManagement]'; -const DOMAIN = 0xF811; -const BUNDLE = 'WebFocusManagement_'; const delegator: abilityDelegatorRegistry.AbilityDelegator = abilityDelegatorRegistry.getAbilityDelegator(); const bundleName = abilityDelegatorRegistry.getArguments().bundleName; export default function abilityTest() { describe('ActsAbilityTest', () => { // Defines a test suite. Two parameters are supported: test suite name and test suite function. beforeAll(async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'ActsAbilityTest begin'); + console.info('ActsAbilityTest begin'); const want: Want = { bundleName: bundleName, abilityName: 'EntryAbility' @@ -33,7 +29,7 @@ export default function abilityTest() { await delegator.startAbility(want); const driver = Driver.create(); await driver.delayMs(1000); - hilog.info(DOMAIN, TAG, BUNDLE, 'get top ability'); + console.info('get top ability'); await driver.delayMs(1000); done(); @@ -57,7 +53,7 @@ export default function abilityTest() { // This API supports only one parameter: clear action function. }) it('processweb_WebFocusManagement_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_WebFocusManagement_001 begin'); + console.info('processweb_WebFocusManagement_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('WebFocusManagementButton')); @@ -68,9 +64,9 @@ export default function abilityTest() { await button1.click(); await driver.delayMs(100); //获取所点击的web边框颜色 - hilog.info(DOMAIN, TAG, BUNDLE, `Focused Web Component Info: ${getInspectorByKey('web1')}`); + console.info(`Focused Web Component Info: ${getInspectorByKey('web1')}`); const webJsonFocused1: boolean = JSON.parse(getInspectorByKey('web1'))['$attrs']['focused']; - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_setRenderProcessMode_001 end'); + console.info('processweb_setRenderProcessMode_001 end'); expect(webJsonFocused1).assertTrue(); @@ -78,17 +74,17 @@ export default function abilityTest() { await button2.click(); await driver.delayMs(100); //获取所点击的web边框颜色 - hilog.info(DOMAIN, TAG, BUNDLE, `Focused Web Component Info: ${getInspectorByKey('web1')}`); + console.info(`Focused Web Component Info: ${getInspectorByKey('web1')}`); const webJsonFocused2: boolean = JSON.parse(getInspectorByKey('web1'))['$attrs']['focused']; - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_setRenderProcessMode_001 end'); + console.info('processweb_setRenderProcessMode_001 end'); expect(webJsonFocused2).assertFalse(); - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_WebFocusManagement_001 end'); + console.info('processweb_WebFocusManagement_001 end'); done(); }) it('processweb_WebFocusManagement2_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_WebFocusManagement2_001 begin'); + console.info('processweb_WebFocusManagement2_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('WebFocusManagement2Button')); @@ -97,9 +93,9 @@ export default function abilityTest() { const type = await driver.findComponent(ON.type('Web')); let src: string = await type.getText(); - hilog.info(DOMAIN, TAG, BUNDLE, 'src: ' + src); + console.info('src: ' + src); expect(src).assertContain('test.html'); - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_WebFocusManagement2_001 end'); + console.info('processweb_WebFocusManagement2_001 end'); done(); }) }) diff --git a/ArkWebKit/WebGestureInteraction/entry/src/main/ets/pages/DistinguishTwoGesture.ets b/ArkWebKit/WebGestureInteraction/entry/src/main/ets/pages/DistinguishTwoGesture.ets index 159ca30ae708b9ec23fd291c6fe12121fe754a09..18928fff7537c0c2c0ce3a6d7e1bde4c49043a1d 100644 --- a/ArkWebKit/WebGestureInteraction/entry/src/main/ets/pages/DistinguishTwoGesture.ets +++ b/ArkWebKit/WebGestureInteraction/entry/src/main/ets/pages/DistinguishTwoGesture.ets @@ -14,10 +14,7 @@ */ // [Start DistinguishTwoGesture] import { webview } from '@kit.ArkWeb'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_WebGestureInteraction]'; -const DOMAIN = 0xF811; -const BUNDLE = 'WebGestureInteraction_'; + @Entry @Component struct Index { @@ -35,18 +32,18 @@ struct Index { // 在组件上绑定三指触发的捏合手势 PinchGesture({ fingers: 3 }) .onActionStart((event: GestureEvent|undefined) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'Pinch start'); + console.info('Pinch start'); }) // 当捏合手势触发时，可以通过回调函数获取缩放比例，从而修改组件的缩放比例 .onActionUpdate((event: GestureEvent|undefined) => { if(event){ this.scaleValue = this.pinchValue * event.scale; - hilog.info(DOMAIN, TAG, BUNDLE, `Pinch update: ${this.scaleValue}`); + console.info(`Pinch update: ${this.scaleValue}`); } }) .onActionEnd(() => { this.pinchValue = this.scaleValue; - hilog.info(DOMAIN, TAG, BUNDLE, 'Pinch end'); + console.info('Pinch end'); }) ) } diff --git a/ArkWebKit/WebGestureInteraction/entry/src/main/ets/pages/Index.ets b/ArkWebKit/WebGestureInteraction/entry/src/main/ets/pages/Index.ets index f3e3c97af2fb5de0a374ff87deb19f81a388f8eb..5b35324dafcda3ed78a5e196dbcbd970fe736261 100644 --- a/ArkWebKit/WebGestureInteraction/entry/src/main/ets/pages/Index.ets +++ b/ArkWebKit/WebGestureInteraction/entry/src/main/ets/pages/Index.ets @@ -13,10 +13,6 @@ * limitations under the License. */ import { BusinessError } from '@kit.BasicServicesKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_WebGestureInteraction]'; -const DOMAIN = 0xF811; -const BUNDLE = 'WebGestureInteraction_'; @Entry @Component struct Index { @@ -28,7 +24,7 @@ struct Index { url: 'pages/DistinguishTwoGesture', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -38,7 +34,7 @@ struct Index { url: 'pages/ReturnLastWebPage', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -48,7 +44,7 @@ struct Index { url: 'pages/SetUserAgent', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) }.height('100%') diff --git a/ArkWebKit/WebGestureInteraction/entry/src/ohosTest/ets/test/Ability.test.ets b/ArkWebKit/WebGestureInteraction/entry/src/ohosTest/ets/test/Ability.test.ets index 7281077ed453dad3e92c4ffda50e1ae5cbf5086c..470d9f67b1d3bb361d08b1ea858cbc605ab14007 100644 --- a/ArkWebKit/WebGestureInteraction/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/ArkWebKit/WebGestureInteraction/entry/src/ohosTest/ets/test/Ability.test.ets @@ -15,17 +15,13 @@ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'; import { abilityDelegatorRegistry, Driver, ON, PointerMatrix } from '@kit.TestKit'; import { Want } from '@kit.AbilityKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_WebGestureInteraction]'; -const DOMAIN = 0xF811; -const BUNDLE = 'WebGestureInteraction_'; const delegator: abilityDelegatorRegistry.AbilityDelegator = abilityDelegatorRegistry.getAbilityDelegator(); const bundleName = abilityDelegatorRegistry.getArguments().bundleName; export default function abilityTest() { describe('ActsAbilityTest', () => { // Defines a test suite. Two parameters are supported: test suite name and test suite function. beforeAll(async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: ActsAbilityTest begin'); + console.info('uitest: ActsAbilityTest begin'); const want: Want = { bundleName: bundleName, abilityName: 'EntryAbility' @@ -33,7 +29,7 @@ export default function abilityTest() { await delegator.startAbility(want); const driver = Driver.create(); await driver.delayMs(1000); - hilog.info(DOMAIN, TAG, BUNDLE, 'get top ability'); + console.info('get top ability'); await driver.delayMs(1000); done(); @@ -57,7 +53,7 @@ export default function abilityTest() { // This API supports only one parameter: clear action function. }) it('processweb_DistinguishTwoGesture_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_DistinguishTwoGesture_001 begin'); + console.info('uitest: processweb_DistinguishTwoGesture_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('DistinguishTwoGestureButton')); @@ -66,15 +62,15 @@ export default function abilityTest() { const type = await driver.findComponent(ON.type('Web')); const src = await type.getText(); - hilog.info(DOMAIN, TAG, BUNDLE, 'src:' + src); + console.info('src:' + src); expect(src).assertContain('www.example.com'); - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_DistinguishTwoGesture_001 end'); + console.info('uitest: processweb_DistinguishTwoGesture_001 end'); done(); }) it('processweb_ReturnLastWebPage_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_ReturnLastWebPage_001 begin'); + console.info('uitest: processweb_ReturnLastWebPage_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('ReturnLastWebPageButton')); @@ -83,15 +79,15 @@ export default function abilityTest() { const type = await driver.findComponent(ON.type('Web')); const src = await type.getText(); - hilog.info(DOMAIN, TAG, BUNDLE, 'src:' + src); + console.info('src:' + src); expect(src).assertContain('www.example.com'); - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_ReturnLastWebPage_001 end'); + console.info('uitest: processweb_ReturnLastWebPage_001 end'); done(); }) it('processweb_SetUserAgent_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_SetUserAgent_001 begin'); + console.info('uitest: processweb_SetUserAgent_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('SetUserAgentButton')); @@ -100,9 +96,9 @@ export default function abilityTest() { const type = await driver.findComponent(ON.type('Web')); const src = await type.getText(); - hilog.info(DOMAIN, TAG, BUNDLE, 'src:' + src); + console.info('src:' + src); expect(src).assertContain('www.example.com'); - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_SetUserAgent_001 end'); + console.info('uitest: processweb_SetUserAgent_001 end'); done(); }) diff --git a/ArkWebKit/WebManagementZooming/entry/src/main/ets/pages/ControlZoomByFixedRatio.ets b/ArkWebKit/WebManagementZooming/entry/src/main/ets/pages/ControlZoomByFixedRatio.ets index e1cd3bcd934da3fcb573b8c6f291278f63031ee0..0fb9de63a4bfb3de21f183ec8d23a88fe333c882 100644 --- a/ArkWebKit/WebManagementZooming/entry/src/main/ets/pages/ControlZoomByFixedRatio.ets +++ b/ArkWebKit/WebManagementZooming/entry/src/main/ets/pages/ControlZoomByFixedRatio.ets @@ -15,10 +15,7 @@ // [Start ControlZoomByFixedRatio] import { webview } from '@kit.ArkWeb'; import { BusinessError } from '@kit.BasicServicesKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_WebManagementZooming]'; -const DOMAIN = 0xF811; -const BUNDLE = 'WebManagementZooming_'; + @Entry @Component struct WebComponent { @@ -30,7 +27,7 @@ struct WebComponent { try { this.controller.zoomIn(); } catch (error) { - hilog.error(DOMAIN, TAG, BUNDLE, `ErrorCode: ${(error as BusinessError).code}, Message: ${(error as BusinessError).message}`); + console.error(`ErrorCode: ${(error as BusinessError).code}, Message: ${(error as BusinessError).message}`); } }) Button('zoomOut') @@ -38,7 +35,7 @@ struct WebComponent { try { this.controller.zoomOut(); } catch (error) { - hilog.error(DOMAIN, TAG, BUNDLE, `ErrorCode: ${(error as BusinessError).code}, Message: ${(error as BusinessError).message}`); + console.error(`ErrorCode: ${(error as BusinessError).code}, Message: ${(error as BusinessError).message}`); } }) Web({ src: 'www.example.com', controller: this.controller }) diff --git a/ArkWebKit/WebManagementZooming/entry/src/main/ets/pages/ControlZoomByInput.ets b/ArkWebKit/WebManagementZooming/entry/src/main/ets/pages/ControlZoomByInput.ets index 6e8d624957373c3687b86ab39dd1aa0e264461e7..69f44f1a2020064399767103795adc2fae75a156 100644 --- a/ArkWebKit/WebManagementZooming/entry/src/main/ets/pages/ControlZoomByInput.ets +++ b/ArkWebKit/WebManagementZooming/entry/src/main/ets/pages/ControlZoomByInput.ets @@ -15,10 +15,7 @@ // [Start ControlZoomByInput] import { webview } from '@kit.ArkWeb'; import { BusinessError } from '@kit.BasicServicesKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_WebManagementZooming]'; -const DOMAIN = 0xF811; -const BUNDLE = 'WebManagementZooming_'; + @Entry @Component struct WebComponent { @@ -37,7 +34,7 @@ struct WebComponent { try { this.controller.zoom(this.factor); } catch (error) { - hilog.error(DOMAIN, TAG, BUNDLE, `ErrorCode: ${(error as BusinessError).code}, Message: ${(error as BusinessError).message}`); + console.error(`ErrorCode: ${(error as BusinessError).code}, Message: ${(error as BusinessError).message}`); } }) Web({ src: 'www.example.com', controller: this.controller }) diff --git a/ArkWebKit/WebManagementZooming/entry/src/main/ets/pages/ControlZoomToFixedRatio.ets b/ArkWebKit/WebManagementZooming/entry/src/main/ets/pages/ControlZoomToFixedRatio.ets index 32fec2402c448afa59ce3b6a100424ceef3925bd..0a7f0406bbffb14655b084ff854c04e8041df4f2 100644 --- a/ArkWebKit/WebManagementZooming/entry/src/main/ets/pages/ControlZoomToFixedRatio.ets +++ b/ArkWebKit/WebManagementZooming/entry/src/main/ets/pages/ControlZoomToFixedRatio.ets @@ -15,10 +15,7 @@ // [Start ControlZoomToFixedRatio] import { webview } from '@kit.ArkWeb'; import { BusinessError } from '@kit.BasicServicesKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_WebManagementZooming]'; -const DOMAIN = 0xF811; -const BUNDLE = 'WebManagementZooming_'; + @Entry @Component struct WebComponent { @@ -42,13 +39,13 @@ struct WebComponent { let factor = this.targetFactor * this.intNumber / this.pageFactor; this.controller.zoom(factor); } catch (error) { - hilog.error(DOMAIN, TAG, BUNDLE, `ErrorCode: ${(error as BusinessError).code}, Message: ${(error as BusinessError).message}`); + console.error(`ErrorCode: ${(error as BusinessError).code}, Message: ${(error as BusinessError).message}`); } }) Web({ src: 'www.example.com', controller: this.controller }) .zoomAccess(true) .onScaleChange((event) => { - hilog.error(DOMAIN, TAG, BUNDLE, 'onScaleChange changed from ' + event.oldScale + ' to ' + event.newScale); + console.error('onScaleChange changed from ' + event.oldScale + ' to ' + event.newScale); this.pageFactor = event.newScale; }) } diff --git a/ArkWebKit/WebManagementZooming/entry/src/main/ets/pages/Index.ets b/ArkWebKit/WebManagementZooming/entry/src/main/ets/pages/Index.ets index aaf421b7cd9ec903c75bc90ab89e92cbf58ee3e2..03c84c53956dc51010fa8d97075f101768803c62 100644 --- a/ArkWebKit/WebManagementZooming/entry/src/main/ets/pages/Index.ets +++ b/ArkWebKit/WebManagementZooming/entry/src/main/ets/pages/Index.ets @@ -13,10 +13,7 @@ * limitations under the License. */ import { BusinessError } from '@kit.BasicServicesKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_WebManagementZooming]'; -const DOMAIN = 0xF811; -const BUNDLE = 'WebManagementZooming_'; + @Entry @Component struct Index { @@ -28,7 +25,7 @@ struct Index { url: 'pages/ControlWebGestureZooming', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -38,7 +35,7 @@ struct Index { url: 'pages/ControlMouseAndKeyBoardZooming', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -48,7 +45,7 @@ struct Index { url: 'pages/MonitorZoomRatio', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -58,7 +55,7 @@ struct Index { url: 'pages/ControlZoomByFixedRatio', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -68,7 +65,7 @@ struct Index { url: 'pages/ControlZoomByInput', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -78,7 +75,7 @@ struct Index { url: 'pages/ControlZoomToFixedRatio', }) .catch((error: BusinessError) => { - hilog.error(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.error(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) diff --git a/ArkWebKit/WebManagementZooming/entry/src/main/ets/pages/MonitorZoomRatio.ets b/ArkWebKit/WebManagementZooming/entry/src/main/ets/pages/MonitorZoomRatio.ets index 68b767ad0a370c5ab37a5630347421eb6677cec4..c2118867695ac5b4602423ac17c54e0e117a6382 100644 --- a/ArkWebKit/WebManagementZooming/entry/src/main/ets/pages/MonitorZoomRatio.ets +++ b/ArkWebKit/WebManagementZooming/entry/src/main/ets/pages/MonitorZoomRatio.ets @@ -14,10 +14,7 @@ */ // [Start MonitorZoomRatio] import { webview } from '@kit.ArkWeb'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_WebManagementZooming]'; -const DOMAIN = 0xF811; -const BUNDLE = 'WebManagementZooming_'; + @Entry @Component struct WebComponent { @@ -27,7 +24,7 @@ struct WebComponent { Column() { Web({ src: 'www.example.com', controller: this.controller }) .onScaleChange((event) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'onScaleChange changed from ' + event.oldScale + ' to ' + event.newScale); + console.info('onScaleChange changed from ' + event.oldScale + ' to ' + event.newScale); }) } } diff --git a/ArkWebKit/WebScrollDemo/entry/src/main/ets/pages/Index.ets b/ArkWebKit/WebScrollDemo/entry/src/main/ets/pages/Index.ets index 1cf742b08e4e56820f0850aa7ab22075a21205f2..a415b84fab635f44a829396e1a4a95dcde4019cc 100644 --- a/ArkWebKit/WebScrollDemo/entry/src/main/ets/pages/Index.ets +++ b/ArkWebKit/WebScrollDemo/entry/src/main/ets/pages/Index.ets @@ -13,10 +13,6 @@ * limitations under the License. */ import { BusinessError } from '@kit.BasicServicesKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_WebScrollDemo]'; -const DOMAIN = 0xF811; -const BUNDLE = 'WebScrollDemo_'; @Entry @Component @@ -29,7 +25,7 @@ struct Index { url: 'pages/WebScrollDemo', }) .catch((error: BusinessError) => { - hilog.info(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.info(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) }.height('100%') diff --git a/ArkWebKit/WebScrollDemo/entry/src/ohosTest/ets/test/Ability.test.ets b/ArkWebKit/WebScrollDemo/entry/src/ohosTest/ets/test/Ability.test.ets index 6f983880e5e9b9ede2633817e43b6432dd434ee7..a2bb0171bb6fd8a559adf320bbd836e608af6ea4 100644 --- a/ArkWebKit/WebScrollDemo/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/ArkWebKit/WebScrollDemo/entry/src/ohosTest/ets/test/Ability.test.ets @@ -15,17 +15,13 @@ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'; import { abilityDelegatorRegistry, Driver, ON } from '@kit.TestKit'; import { Want } from '@kit.AbilityKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_WebScrollDemo]'; -const DOMAIN = 0xF811; -const BUNDLE = 'WebScrollDemo_'; const delegator: abilityDelegatorRegistry.AbilityDelegator = abilityDelegatorRegistry.getAbilityDelegator(); const bundleName = abilityDelegatorRegistry.getArguments().bundleName; export default function abilityTest() { describe('ActsAbilityTest', () => { // Defines a test suite. Two parameters are supported: test suite name and test suite function. beforeAll(async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'ActsAbilityTest begin'); + console.info('ActsAbilityTest begin'); const want: Want = { bundleName: bundleName, abilityName: 'EntryAbility' @@ -33,7 +29,7 @@ export default function abilityTest() { await delegator.startAbility(want); const driver = Driver.create(); await driver.delayMs(1000); - hilog.info(DOMAIN, TAG, BUNDLE, 'get top ability'); + console.info('get top ability'); await driver.delayMs(1000); done(); @@ -57,7 +53,7 @@ export default function abilityTest() { // This API supports only one parameter: clear action function. }) it('processweb_scrollTo_ArkTS_one_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_scrollTo_ArkTS_one_001 begin'); + console.info('processweb_scrollTo_ArkTS_one_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('WebScrollDemoButton')); @@ -75,24 +71,24 @@ export default function abilityTest() { // 查找显示滚动位置的文本组件text const scrollPositionText = await driver.findComponent(ON.id('scrollPositionText')); const positionText = await scrollPositionText.getText(); - hilog.info(DOMAIN, TAG, BUNDLE, `positionText: ${positionText}`); + console.info(`positionText: ${positionText}`); // 从文本中提取数字 const yPositionMatch = positionText.match(/Y:\s*(\d+)/); if (yPositionMatch && yPositionMatch[1]) { const yPosition = parseInt(yPositionMatch[1]); - hilog.info(DOMAIN, TAG, BUNDLE, `yPosition: ${yPosition}`); + console.info(`yPosition: ${yPosition}`); expect(yPosition).assertEqual(0); } else { expect(positionText).assertContain('0'); } - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_scrollTo_ArkTS_one_001 end'); + console.info('processweb_scrollTo_ArkTS_one_001 end'); done(); }) it('processweb_scrollBy_js_two_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_scrollBy_js_two_001 begin'); + console.info('processweb_scrollBy_js_two_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('WebScrollDemoButton')); @@ -106,24 +102,24 @@ export default function abilityTest() { // 查找显示滚动位置的文本组件text const scrollPositionText = await driver.findComponent(ON.id('scrollPositionText')); const positionText = await scrollPositionText.getText(); - hilog.info(DOMAIN, TAG, BUNDLE, `positionText: ${positionText}`); + console.info(`positionText: ${positionText}`); // 从文本中提取数字 const yPositionMatch = positionText.match(/Y:\s*(\d+)/); if (yPositionMatch && yPositionMatch[1]) { const yPosition = parseInt(yPositionMatch[1]); - hilog.info(DOMAIN, TAG, BUNDLE, `yPosition: ${yPosition}`); + console.info(`yPosition: ${yPosition}`); expect(yPosition).assertEqual(200); } else { expect(positionText).assertContain('200'); } - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_scrollBy_js_two_001 end'); + console.info('processweb_scrollBy_js_two_001 end'); done(); }) it('processweb_scrollBy_js_three_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_scrollBy_js_three_001 begin'); + console.info('processweb_scrollBy_js_three_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('WebScrollDemoButton')); @@ -141,24 +137,24 @@ export default function abilityTest() { // 查找显示滚动位置的文本组件text const scrollPositionText = await driver.findComponent(ON.id('scrollPositionText')); const positionText = await scrollPositionText.getText(); - hilog.info(DOMAIN, TAG, BUNDLE, `positionText: ${positionText}`); + console.info(`positionText: ${positionText}`); // 从文本中提取数字 const yPositionMatch = positionText.match(/Y:\s*(\d+)/); if (yPositionMatch && yPositionMatch[1]) { const yPosition = parseInt(yPositionMatch[1]); - hilog.info(DOMAIN, TAG, BUNDLE, `yPosition: ${yPosition}`); + console.info(`yPosition: ${yPosition}`); expect(yPosition).assertEqual(800); } else { expect(positionText).assertContain('800'); } - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_scrollBy_js_three_001 end'); + console.info('processweb_scrollBy_js_three_001 end'); done(); }) it('processweb_scrollTo_js_four_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_scrollTo_js_four_001 begin'); + console.info('processweb_scrollTo_js_four_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('WebScrollDemoButton')); @@ -172,24 +168,24 @@ export default function abilityTest() { // 查找显示滚动位置的文本组件text const scrollPositionText = await driver.findComponent(ON.id('scrollPositionText')); const positionText = await scrollPositionText.getText(); - hilog.info(DOMAIN, TAG, BUNDLE, `positionText: ${positionText}`); + console.info(`positionText: ${positionText}`); // 从文本中提取数字 const yPositionMatch = positionText.match(/Y:\s*(\d+)/); if (yPositionMatch && yPositionMatch[1]) { const yPosition = parseInt(yPositionMatch[1]); - hilog.info(DOMAIN, TAG, BUNDLE, `yPosition: ${yPosition}`); + console.info(`yPosition: ${yPosition}`); expect(yPosition).assertEqual(400); } else { expect(positionText).assertContain('400'); } - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_scrollTo_js_four_001 end'); + console.info('processweb_scrollTo_js_four_001 end'); done(); }) it('processweb_scrollTo_js_five_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_scrollTo_js_five_001 begin'); + console.info('processweb_scrollTo_js_five_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('WebScrollDemoButton')); @@ -206,24 +202,24 @@ export default function abilityTest() { // 查找显示滚动位置的文本组件text const scrollPositionText = await driver.findComponent(ON.id('scrollPositionText')); const positionText = await scrollPositionText.getText(); - hilog.info(DOMAIN, TAG, BUNDLE, `positionText: ${positionText}`); + console.info(`positionText: ${positionText}`); // 从文本中提取数字 const yPositionMatch = positionText.match(/Y:\s*(\d+)/); if (yPositionMatch && yPositionMatch[1]) { const yPosition = parseInt(yPositionMatch[1]); - hilog.info(DOMAIN, TAG, BUNDLE, `yPosition: ${yPosition}`); + console.info(`yPosition: ${yPosition}`); expect(yPosition).assertEqual(0); } else { expect(positionText).assertContain('0'); } - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_scrollTo_js_five_001 end'); + console.info('processweb_scrollTo_js_five_001 end'); done(); }) it('processweb_scrollTo_js_six_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_scrollTo_js_six_001 begin'); + console.info('processweb_scrollTo_js_six_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('WebScrollDemoButton')); @@ -236,18 +232,18 @@ export default function abilityTest() { // 查找显示滚动位置的文本组件text const scrollPositionText = await driver.findComponent(ON.id('scrollPositionText')); const positionText = await scrollPositionText.getText(); - hilog.info(DOMAIN, TAG, BUNDLE, `positionText: ${positionText}`); + console.info(`positionText: ${positionText}`); // 从文本中提取数字 const yPositionMatch = positionText.match(/Y:\s*(\d+)/); if (yPositionMatch && yPositionMatch[1]) { const yPosition = parseInt(yPositionMatch[1]); - hilog.info(DOMAIN, TAG, BUNDLE, `yPosition: ${yPosition}`); + console.info(`yPosition: ${yPosition}`); expect(yPosition).assertEqual(500); } else { expect(positionText).assertContain('500'); } - hilog.info(DOMAIN, TAG, BUNDLE, 'processweb_scrollTo_js_six_001 end'); + console.info('processweb_scrollTo_js_six_001 end'); done(); }) diff --git a/ArkWebKit/WebWriteScreenIssue/entry/src/main/ets/pages/ChangeUserAgent.ets b/ArkWebKit/WebWriteScreenIssue/entry/src/main/ets/pages/ChangeUserAgent.ets index 178ba2c5520767cae2f9fabde7b40ac25ed18527..ee4c71501a9ac85bb6d3761057eff1b21436ea8f 100644 --- a/ArkWebKit/WebWriteScreenIssue/entry/src/main/ets/pages/ChangeUserAgent.ets +++ b/ArkWebKit/WebWriteScreenIssue/entry/src/main/ets/pages/ChangeUserAgent.ets @@ -15,10 +15,6 @@ // [Start ChangeUserAgent] import { webview } from '@kit.ArkWeb'; import { BusinessError } from '@kit.BasicServicesKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_WebWriteScreenIssue]'; -const DOMAIN = 0xF811; -const BUNDLE = 'WebWriteScreenIssue_'; @Entry @Component @@ -30,12 +26,12 @@ struct WebComponent { Column() { Web({ src: 'www.example.com', controller: this.controller }) .onControllerAttached(() => { - hilog.info(DOMAIN, TAG, BUNDLE, 'onControllerAttached'); + console.info('onControllerAttached'); try { let userAgent = this.controller.getUserAgent() + this.customUserAgent; this.controller.setCustomUserAgent(userAgent); } catch (error) { - hilog.error(DOMAIN, TAG, BUNDLE, `ErrorCode: ${(error as BusinessError).code}, Message: ${(error as BusinessError).message}`); + console.error(`ErrorCode: ${(error as BusinessError).code}, Message: ${(error as BusinessError).message}`); } }) } diff --git a/ArkWebKit/WebWriteScreenIssue/entry/src/main/ets/pages/Index.ets b/ArkWebKit/WebWriteScreenIssue/entry/src/main/ets/pages/Index.ets index 2eb1d450327bf4d2fbc62999b425c026e1462f59..96e4a8b1f1d97275aa23cb6c1c7bdb03747fecc9 100644 --- a/ArkWebKit/WebWriteScreenIssue/entry/src/main/ets/pages/Index.ets +++ b/ArkWebKit/WebWriteScreenIssue/entry/src/main/ets/pages/Index.ets @@ -13,10 +13,7 @@ * limitations under the License. */ import { BusinessError } from '@kit.BasicServicesKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_WebWriteScreenIssue]'; -const DOMAIN = 0xF811; -const BUNDLE = 'WebWriteScreenIssue_'; + @Entry @Component struct Index { @@ -28,7 +25,7 @@ struct Index { url: 'pages/OpenPermissions', }) .catch((error: BusinessError) => { - hilog.info(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.info(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -38,7 +35,7 @@ struct Index { url: 'pages/ChangeUserAgent', }) .catch((error: BusinessError) => { - hilog.info(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.info(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) @@ -48,7 +45,7 @@ struct Index { url: 'pages/CrossDomainIntercept', }) .catch((error: BusinessError) => { - hilog.info(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.info(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) diff --git a/ArkWebKit/WebWriteScreenIssue/entry/src/ohosTest/ets/test/Ability.test.ets b/ArkWebKit/WebWriteScreenIssue/entry/src/ohosTest/ets/test/Ability.test.ets index 96d34936240bff3e39f80fbb29d690a66654bc5f..4436b60ca97df8cd3f95c532052153f0a62446bc 100644 --- a/ArkWebKit/WebWriteScreenIssue/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/ArkWebKit/WebWriteScreenIssue/entry/src/ohosTest/ets/test/Ability.test.ets @@ -15,17 +15,13 @@ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'; import { abilityDelegatorRegistry, Driver, ON, PointerMatrix } from '@kit.TestKit'; import { Want } from '@kit.AbilityKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_WebWriteScreenIssue]'; -const DOMAIN = 0xF811; -const BUNDLE = 'WebWriteScreenIssue_'; const delegator: abilityDelegatorRegistry.AbilityDelegator = abilityDelegatorRegistry.getAbilityDelegator(); const bundleName = abilityDelegatorRegistry.getArguments().bundleName; export default function abilityTest() { describe('ActsAbilityTest', () => { // Defines a test suite. Two parameters are supported: test suite name and test suite function. beforeAll(async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: ActsAbilityTest begin'); + console.info('uitest: ActsAbilityTest begin'); const want: Want = { bundleName: bundleName, abilityName: 'EntryAbility' @@ -33,7 +29,7 @@ export default function abilityTest() { await delegator.startAbility(want); const driver = Driver.create(); await driver.delayMs(1000); - hilog.info(DOMAIN, TAG, BUNDLE, 'get top ability'); + console.info('get top ability'); await driver.delayMs(1000); done(); @@ -57,7 +53,7 @@ export default function abilityTest() { // This API supports only one parameter: clear action function. }) it('processweb_OpenPermissions_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_OpenPermissions_001 begin'); + console.info('uitest: processweb_OpenPermissions_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('OpenPermissionsButton')); @@ -66,15 +62,15 @@ export default function abilityTest() { const type = await driver.findComponent(ON.type('Web')); let src: string = await type.getText(); - hilog.info(DOMAIN, TAG, BUNDLE, 'src: ' + src); + console.info('src: ' + src); expect(src).assertContain('www.example.com'); - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_OpenPermissions_001 end'); + console.info('uitest: processweb_OpenPermissions_001 end'); done(); }) it('processweb_ChangeUserAgents_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_ChangeUserAgents_001 begin'); + console.info('uitest: processweb_ChangeUserAgents_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('ChangeUserAgentButton')); @@ -83,15 +79,15 @@ export default function abilityTest() { const type = await driver.findComponent(ON.type('Web')); let src: string = await type.getText(); - hilog.info(DOMAIN, TAG, BUNDLE, 'src: ' + src); + console.info('src: ' + src); expect(src).assertContain('www.example.com'); - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_ChangeUserAgents_001 end'); + console.info('uitest: processweb_ChangeUserAgents_001 end'); done(); }) it('processweb_CrossDomainIntercept_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_CrossDomainIntercept_001 begin'); + console.info('uitest: processweb_CrossDomainIntercept_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('CrossDomainInterceptButton')); @@ -100,9 +96,9 @@ export default function abilityTest() { const type = await driver.findComponent(ON.type('genericContainer')); let src: string = await type.getText(); - hilog.info(DOMAIN, TAG, BUNDLE, 'src: ' + src); + console.info('src: ' + src); expect(src).assertEqual('success'); - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_CrossDomainIntercept_001 end'); + console.info('uitest: processweb_CrossDomainIntercept_001 end'); done(); }) diff --git a/ArkWebKit/WebWriteScreenIssue/entry2/src/main/ets/pages/Index.ets b/ArkWebKit/WebWriteScreenIssue/entry2/src/main/ets/pages/Index.ets index 4823834c6e4f5b608e5247fcdd976fe9fe94b8c7..bc5fceb72d8b849cdfa007d728b1b61b771ba978 100644 --- a/ArkWebKit/WebWriteScreenIssue/entry2/src/main/ets/pages/Index.ets +++ b/ArkWebKit/WebWriteScreenIssue/entry2/src/main/ets/pages/Index.ets @@ -13,10 +13,7 @@ * limitations under the License. */ import { BusinessError } from '@kit.BasicServicesKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_WebWriteScreenIssue]'; -const DOMAIN = 0xF811; -const BUNDLE = 'WebWriteScreenIssue_'; + @Entry @Component struct Index { @@ -28,7 +25,7 @@ struct Index { url: 'pages/SetPath', }) .catch((error: BusinessError) => { - hilog.info(DOMAIN, TAG, BUNDLE, `pushUrl failed, code is ${error.code}, message is ${error.message}`); + console.info(`pushUrl failed, code is ${error.code}, message is ${error.message}`); }) }) diff --git a/ArkWebKit/WebWriteScreenIssue/entry2/src/main/ets/pages/SetPath.ets b/ArkWebKit/WebWriteScreenIssue/entry2/src/main/ets/pages/SetPath.ets index 15f098505595329baba20d950aec8bff76fafa50..766c2b21f087f8f569028a0d931b86c16b217948 100644 --- a/ArkWebKit/WebWriteScreenIssue/entry2/src/main/ets/pages/SetPath.ets +++ b/ArkWebKit/WebWriteScreenIssue/entry2/src/main/ets/pages/SetPath.ets @@ -15,10 +15,6 @@ // [Start SetPath] import { webview } from '@kit.ArkWeb'; import { BusinessError } from '@kit.BasicServicesKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_WebWriteScreenIssue]'; -const DOMAIN = 0xF811; -const BUNDLE = 'WebWriteScreenIssue_'; @Entry @Component @@ -38,7 +34,7 @@ struct WebComponent { ]) this.controller.loadUrl('file://' + this.uiContext.getHostContext()!.resourceDir + '/index.html') } catch (error) { - hilog.error(DOMAIN, TAG, BUNDLE, `ErrorCode: ${(error as BusinessError).code}, Message: ${(error as BusinessError).message}`); + console.error(`ErrorCode: ${(error as BusinessError).code}, Message: ${(error as BusinessError).message}`); } }) .javaScriptAccess(true) diff --git a/ArkWebKit/WebWriteScreenIssue/entry2/src/ohosTest/ets/test/Ability.test.ets b/ArkWebKit/WebWriteScreenIssue/entry2/src/ohosTest/ets/test/Ability.test.ets index 738b5f9f5b90b3accbe3706d44b7925ff4f94356..08e1a5b8ce5a3bb79730802a33db488558116a62 100644 --- a/ArkWebKit/WebWriteScreenIssue/entry2/src/ohosTest/ets/test/Ability.test.ets +++ b/ArkWebKit/WebWriteScreenIssue/entry2/src/ohosTest/ets/test/Ability.test.ets @@ -15,17 +15,13 @@ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'; import { abilityDelegatorRegistry, Driver, ON, PointerMatrix } from '@kit.TestKit'; import { Want } from '@kit.AbilityKit'; -import hilog from '@ohos.hilog'; -const TAG = '[Sample_WebWriteScreenIssue]'; -const DOMAIN = 0xF811; -const BUNDLE = 'WebWriteScreenIssue_'; const delegator: abilityDelegatorRegistry.AbilityDelegator = abilityDelegatorRegistry.getAbilityDelegator(); const bundleName = abilityDelegatorRegistry.getArguments().bundleName; export default function abilityTest() { describe('ActsAbilityTest2', () => { // Defines a test suite. Two parameters are supported: test suite name and test suite function. beforeAll(async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: ActsAbilityTest2 begin'); + console.info('uitest: ActsAbilityTest2 begin'); const want: Want = { bundleName: bundleName, abilityName: 'Entry2Ability' @@ -33,7 +29,7 @@ export default function abilityTest() { await delegator.startAbility(want); const driver = Driver.create(); await driver.delayMs(1000); - hilog.info(DOMAIN, TAG, BUNDLE, 'get top ability'); + console.info('get top ability'); await driver.delayMs(1000); done(); @@ -57,7 +53,7 @@ export default function abilityTest() { // This API supports only one parameter: clear action function. }) it('processweb_SetPath_001', 0, async (done: Function) => { - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_SetPath_001 begin'); + console.info('uitest: processweb_SetPath_001 begin'); const driver = Driver.create(); const button = await driver.findComponent(ON.text('SetPathButton')); @@ -70,9 +66,9 @@ export default function abilityTest() { const type = await driver.findComponent(ON.type('genericContainer')); let src: string = await type.getText(); - hilog.info(DOMAIN, TAG, BUNDLE, 'src: ' + src); + console.info('src: ' + src); expect(src != null).assertEqual(true); - hilog.info(DOMAIN, TAG, BUNDLE, 'uitest: processweb_SetPath_001 end'); + console.info('uitest: processweb_SetPath_001 end'); done(); })