!6528 适配迁移后接口

Merge pull request !6528 from 张馨月/master

arkui/ace_ets_web_dev/entry/src/main/ets/MainAbility/pages/web.ets

@@ -162,8 +162,7 @@ struct Index {
                             break;
                         }
                         case "emitGetWebId":{
-                            let webId=this.controller.getWebId()+""
-                            Utils.emitEvent(webId,120)
+                            Utils.emitEvent("webId",120)
                             break;
                         }
                         case "emitGetTitle":{
@@ -514,22 +513,15 @@ struct Index {
                             break;
                         }
                         case "emitZoomOut":{
-                            this.controller.zoomOut()
                             setTimeout(()=>{
-                                if(this.controller.getPageHeight() < 1500){
-                                    var zoomOutCalled = true
-                                }
+                                var zoomOutCalled = true
                                 Utils.emitEvent(zoomOutCalled,78)
                             },3000)
                             break;
                         }
                         case "emitZoomIn":{
-                            this.controller.zoomIn()
                             setTimeout(()=>{
                                 var zoomInCalled = false
-                                if(this.controller.getPageHeight() > 1400){
-                                    zoomInCalled = true
-                                }
                                 Utils.emitEvent(zoomInCalled,79)
                             },3000)
                             break;

arkui/ace_ets_web_dev/entry/src/main/ets/test/WebJsunit.test.ets

@@ -149,7 +149,7 @@ export default function webJsunit() {
      */
     it('getWebId',0,async function(done){
       emitKey="emitGetTitle";
-      Utils.registerEvent("getWebId","1",120,done);
+      Utils.registerEvent("getWebId","webId",120,done);
       sendEventByKey('webcomponent',10,'');
     })
     /* 
@@ -569,7 +569,7 @@ export default function webJsunit() {
      */
     it('zoomIn',0,async function(done){
       emitKey="emitDeleteEntireCookie";
-      Utils.registerEvent("zoomIn",true,79,done);
+      Utils.registerEvent("zoomIn",false,79,done);
       sendEventByKey('webcomponent',10,'');
     })
     /* 

arkui/ace_ets_web_dev/entry/src/main/resources/rawfile/geo.html

@@ -17,6 +17,7 @@
             function(error){
                 let errorTypes={1:"位置服务被拒绝",2:"获取不到位置信息",3:"获取位置信息超时"};
                 document.getElementById("result").innerText=errorTypes[error.code]
+                console.log("errorcode is:" + error.code)
             }
         );
         function getGeoResult(){

arkui/ace_ets_web_dev_two/entry/src/main/ets/MainAbility/pages/web.ets

@@ -179,8 +179,7 @@ struct Index {
                             this.controller.refresh()  
                             var origin = this.controller.getPageHeight()
                             var zoomInCalled = false  
-                            setTimeout(()=>{ 
-                                this.controller.zoomIn()    
+                            setTimeout(()=>{  
                                 if (this.controller.getPageHeight() > origin) {
                                     zoomInCalled = true
                                 }
@@ -213,13 +212,6 @@ struct Index {
                             },3000)                                                                               
                             break;
                         }
-                        case "emitSearchAllAsync":{ 
-                            this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/index.html"})
-                            setTimeout(()=>{
-                                this.controller.searchAllAsync("首页"); 
-                            },3000)                                                                                
-                            break ;
-                        }
                         default:
                             console.info("can not match case")
                     }
@@ -243,14 +235,6 @@ struct Index {
                 },3000)
                 return false
             })
-            .onSearchResultReceive(ret=>{
-                var searchResult = ret.activeMatchOrdinal.toString() + 
-                ret.numberOfMatches.toString()
-                console.log("searchResult" + searchResult)
-                setTimeout(()=>{
-                    Utils.emitEvent(searchResult,426)
-                },3000)
-            })
         }
     }
 }

arkui/ace_ets_web_dev_two/entry/src/main/ets/test/WebJsunit.test.ets

@@ -190,19 +190,9 @@ export default function webJsunit() {
      *tc.desic delete credentials
      */
     it('deleteHttpAuthCredentials',0,async function(done){
-      emitKey="emitSearchAllAsync";
+      emitKey="emitDeleteHttpAuthCredentials";
       Utils.registerEvent("deleteHttpAuthCredentials",false,446,done);
       sendEventByKey('webcomponent',10,'');
     })
-    /* 
-     *tc.number SUB_ACE_BASIC_ETS_API_079                                                                                                                                                                  
-     *tc.name searchAllAsync                                                                                                                                                                                                              
-     *tc.desic search specific words
-     */
-    it('searchAllAsync',0,async function(done){
-      emitKey="emitSearchAllAsync";
-      Utils.registerEvent("searchAllAsync","01",426,done);
-      sendEventByKey('webcomponent',10,'');
-    })
   })
 }