diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/conponentadd/web.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/conponentadd/web.ets index aab8d1aa27f1dcf22b78abe738ee26f73ece7602..3803e664448a65a705b213e790035029584498e7 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/conponentadd/web.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/conponentadd/web.ets @@ -250,7 +250,7 @@ struct Index { var origin = this.controller.getPageHeight() var zoomInCalled = false setTimeout(()=>{ - this.controller.zoomIn() + this.newcontroller.zoomIn(); if (this.controller.getPageHeight() > origin) { zoomInCalled = true } @@ -383,7 +383,7 @@ struct Index { case "emitSearchAllAsync":{ this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/index.html"}) setTimeout(()=>{ - this.controller.searchAllAsync("首页"); + this.newcontroller.searchAllAsync("首页"); },3000) break; } @@ -523,7 +523,7 @@ struct Index { case "emitgetUrl":{ try{ setTimeout(() => { - this.controller.getUrl(); + this.newcontroller.getUrl(); Utils.emitEvent('succesful',446) },3000) }catch (error) { diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/conponentadd/webg.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/conponentadd/webg.ets index bbcb0c92f911f2d3c0bf597329213b4aea156ac9..8e6bc7cf7e3a3c3f46cc91ac47ec94abd251725c 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/conponentadd/webg.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/conponentadd/webg.ets @@ -219,7 +219,7 @@ struct Index { var origin = this.controller.getPageHeight() var zoomInCalled = false setTimeout(()=>{ - this.controller.zoomIn() + this.newcontroller.zoomIn(); if (this.controller.getPageHeight() > origin) { zoomInCalled = true } @@ -358,7 +358,7 @@ struct Index { case "emitSearchAllAsync":{ this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/index.html"}) setTimeout(()=>{ - this.controller.searchAllAsync("首页"); + this.newcontroller.searchAllAsync("首页"); },3000) break; } diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/video.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/video.ets index 7e7490ef50a9335d9c776d38e1b81b835e2c4a75..b13b4b9b3ae723c04d15443f9580261807764ac5 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/video.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/video.ets @@ -93,7 +93,8 @@ struct VideoOnFullscreenChange { Button("FullScreen") .key("fullScreen") .onClick(() => { - this.controller.requestFullscreen(true) + this.controller.requestFullscreen(true); + console.info("video_101 onClick start to fullScreen"); }); Button("ExitFullScreen") diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/web.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/web.ets index c83dd2ab9f3023e19c365e611963df7df63e4e49..eb4d8486b22ffb7a6c4ca153ed0e99f78db43b07 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/web.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/web.ets @@ -15,6 +15,7 @@ */ import Log from '../common/Log.ets'; +import web_webview from '@ohos.web.webview'; @Entry @Component @@ -24,6 +25,7 @@ struct WebComponent { fileAccess: boolean = true; // 定义Web组件的控制器controller controller: WebController = new WebController(); + controllerTwo: web_webview.WebviewController = new web_webview.WebviewController(); webResourceResponse: WebResourceResponse = new WebResourceResponse(); build() { Column() { @@ -146,8 +148,8 @@ struct WebComponent { console.log('setResponseEncoding:' + event.response.setResponseEncoding("UTF-8")); console.log('setResponseMimeType:' + event.response.setResponseMimeType("application/json")); console.log('setResponseHeader:' + event.response.setResponseHeader([])); - console.log('web getExtra:' + this.controller.getHitTestValue().getExtra()); - console.log('web getType:' + this.controller.getHitTestValue().getType()); + console.log('web getExtra:' + this.controllerTwo.getHitTestValue().getExtra()); + console.log('web getType:' + this.controllerTwo.getHitTestValue().getType()); console.log('web getCookieManager:' + this.controller.getCookieManager()); console.log('web getCookie:' + this.controller.getCookieManager().getCookie("www.baidu.com")); console.log('web existCookie:' + this.controller.getCookieManager().existCookie()); @@ -165,10 +167,10 @@ struct WebComponent { console.log('web putAcceptThirdPartyCookieEnabled:' + this.controller.getCookieManager() .putAcceptThirdPartyCookieEnabled(true)); console.log('web saveCookieSync:' + this.controller.getCookieManager().saveCookieSync()); - console.log('web zoomIn:' + this.controller.zoomIn()); - console.log('web zoomOut:' + this.controller.zoomOut()); + console.log('web zoomIn:' + this.controllerTwo.zoomIn()); + console.log('web zoomOut:' + this.controllerTwo.zoomOut()); console.log('web zoom:' + this.controller.zoom(2)); - console.log('web getWebId:' + this.controller.getWebId()); + console.log('web getWebId:' + this.controllerTwo.getWebId()); console.log('web getDefaultUserAgent:' + this.controller.getDefaultUserAgent()); console.log('web getTitle:' + this.controller.getTitle()); console.log('web getPageHeight:' + this.controller.getPageHeight()); diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/webapi9.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/webapi9.ets index 52aa504a8c20c09389fe0dbdb64fe979fa40893b..5193fab0b58ea3cda1607cd1a9b6f415fabb7e83 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/webapi9.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/webapi9.ets @@ -45,7 +45,8 @@ struct Index { message = new ConsoleMessage("1","12",23,MessageLevel.Debug); - controller:WebController = new WebController() + controller:WebController = new WebController(); + controllerTwo: web_webview.WebviewController = new web_webview.WebviewController(); responseweb: WebResourceResponse = new WebResourceResponse() @State str:string="emitStoreWebArchive" @@ -160,23 +161,23 @@ struct Index { switch(this.str){ // add case "emitGeturl": - let url = this.controller.getUrl(); + let url = this.controllerTwo.getUrl(); Utils.emitEvent(url,810); break; case "emitclearClientAuthenticationCache": - this.controller.clearClientAuthenticationCache(); + this.controllerTwo.clearClientAuthenticationCache(); Utils.emitEvent(this.isVoid,811); break; case "emitclearSslCache": - this.controller.clearSslCache(); + this.controllerTwo.clearSslCache(); Utils.emitEvent(this.isVoid,812); break; case "emitsearchNext": - this.controller.searchNext(true); + this.controllerTwo.searchNext(true); Utils.emitEvent(this.isVoid,813); break; case "emitclearMatches": - this.controller.clearMatches(); + this.controllerTwo.clearMatches(); Utils.emitEvent(this.isVoid,814); break; case "emitDefaultUserAgent": @@ -184,7 +185,7 @@ struct Index { Utils.emitEvent(usrAgent,815); break; case "emitgetWebId": - let webId = this.controller.getWebId(); + let webId = this.controllerTwo.getWebId(); Utils.emitEvent(webId,816); break; case "emitpostMessage": diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/test/sideBar.test.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/test/sideBar.test.ets index 991bec94f35e9ed7c7bba74be637a966c82063c2..73bdb6e5f9224f1ffc34a1f2f2741f76ab5e926b 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/test/sideBar.test.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/test/sideBar.test.ets @@ -91,7 +91,7 @@ export default function sideBarShowSideBarJsunit() { console.info("[testsideBarShowSideBar0003] component autoHide strJson:" + strJson); let obj = JSON.parse(strJson); expect(obj.$type).assertEqual('SideBarContainer'); - expect(obj.$attrs.sideBarPosition).assertEqual(undefined); + expect(obj.$attrs.sideBarPosition).assertEqual('SideBarPosition.End'); console.info("[testsideBarShowSideBar0003] autoHide value :" + obj.$attrs.autoHide); done(); }); diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/test/video.test.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/test/video.test.ets index 7ae83e2f61e12de10375abbd70bf39a29126f4f9..119e66d8d1b2707d424dafd866d98fbb3d6fe88e 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/test/video.test.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/test/video.test.ets @@ -214,11 +214,13 @@ export default function videoOnFullscreenChangeJsunit() { }catch(err){ console.info("video_101 on events_emitter err : " + JSON.stringify(err)); } - done(); } try { events_emitter.on(innerEvent, callback); + await Utils.sleep(500); console.info("video_101 click result is: " + JSON.stringify(sendEventByKey('fullScreen', 10, ""))); + await Utils.sleep(2000); + done(); } catch (err) { console.info("video_101 on events_emitter err : " + JSON.stringify(err)); } diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/test/xcomponent.test.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/test/xcomponent.test.ets index aa6fa0580c21415b2493e2730beefa4b522da9ae..7673cee33e4cdea09323f37823f9b273bb48531e 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/test/xcomponent.test.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/test/xcomponent.test.ets @@ -62,14 +62,16 @@ export default function xcomponentGetXComponentContextJsunit() { var callback1 = (eventData) => { console.info("onRequestPopupData_0010 get event state result is: " + JSON.stringify(eventData)); expect(eventData.data.STATUS).assertEqual("callBackSuccess"); - done(); } - console.info("onSelect_0012 click result is: " + JSON.stringify(sendEventByKey('getXComponentContextText', 10, ""))); events_emitter.on(innerEventOne, callback1); + await Utils.sleep(1000); + console.info("onSelect_0012 click result is: " + JSON.stringify(sendEventByKey('getXComponentContextText', 10, ""))); + await Utils.sleep(2000); } catch (err) { console.info("onRequestPopupData_0010 on events_emitter err : " + JSON.stringify(err)); } console.info('testxcomponentGetXComponentContext0010 END'); + done(); }); /* @@ -80,7 +82,8 @@ export default function xcomponentGetXComponentContextJsunit() { it('testxcomponentSetXComponentSurfaceSize0001', 0, async function (done) { console.info('xcomponentSetXComponentContext testxcomponentSetXComponentSurfaceSize0001 START'); await Utils.sleep(2000); - console.info("setXComponentSurfaceSize0001 click result is: " + JSON.stringify(sendEventByKey('setXComponentSurfaceSizeText', 10, ""))) + console.info("setXComponentSurfaceSize0001 click result is: " + JSON.stringify(sendEventByKey('setXComponentSurfaceSizeText', 10, ""))); + await Utils.sleep(2000); let strJson = getInspectorByKey('setXComponentSurfaceSizeText'); //console let obj = JSON.parse(strJson); @@ -99,6 +102,7 @@ export default function xcomponentGetXComponentContextJsunit() { console.info('xcomponentSetXComponentContext testxcomponentSetXComponentSurfaceSize0002 START'); await Utils.sleep(2000); console.info("testxcomponentSetXComponentSurfaceSize0002 click result is: " + JSON.stringify(sendEventByKey('setXComponentSurfaceSizeText', 10, ""))) + await Utils.sleep(2000); let strJson = getInspectorByKey('setXComponentSurfaceSizeText'); //console let obj = JSON.parse(strJson);