diff --git a/arkui/ace_ets_web_dev/entry/src/main/ets/MainAbility/pages/web.ets b/arkui/ace_ets_web_dev/entry/src/main/ets/MainAbility/pages/web.ets index 744bb9b1fc7a2030995cac399ee05a980b431d83..16497a88cb60d7fe8aa37b1ce075689d2a41d8bc 100644 --- a/arkui/ace_ets_web_dev/entry/src/main/ets/MainAbility/pages/web.ets +++ b/arkui/ace_ets_web_dev/entry/src/main/ets/MainAbility/pages/web.ets @@ -35,7 +35,7 @@ struct Index { @State errorReceive:string="" @State httpErrorReceive:number=0 @State titleReceive:string="" - @State downloadStart:string="" + @State isDownloadStart:boolean=false @State javaScriptAccess:boolean=true @State fileAccess:boolean=true @State domStorageAccess:boolean=false @@ -56,6 +56,8 @@ struct Index { @State mixedAllSwitch:boolean=false @State overViewFalseHeight:number=0 @State webVisibility: Visibility = Visibility.Visible + @State isProgressFinish:boolean=false + @State isHttpErrorReceive:boolean=false onPageShow(){ let valueChangeEvent={ eventId:10, @@ -109,7 +111,7 @@ struct Index { break; } case "emitOnUrlLoadIntercept":{ - this.controller.loadUrl({url:"https://www.gitee.com/"}) + this.controller.loadUrl({url:"https://gitee.com/"}) setTimeout(()=>{ Utils.emitEvent(loadedUrl,104) },3000) @@ -127,7 +129,7 @@ struct Index { break; } case "emitLoadUrl":{ - this.controller.loadUrl({url:"https://www.gitee.com"}) + this.controller.loadUrl({url:"https://gitee.com/"}) setTimeout(()=>{ let webTitle=this.controller.getTitle() Utils.emitEvent(webTitle,110) @@ -144,10 +146,9 @@ struct Index { break; } case "emitOnProgressChange":{ - this.controller.loadUrl({url:"https://www.gitee.com"}) - setTimeout(()=>{ - Utils.emitEvent(this.progress,114) - },5000) + this.isProgressFinish=true + await Utils.sleep(1000) + this.controller.loadUrl({url:"https://gitee.com/"}) break; } case "emitOnRefreshAccessedHistory":{ @@ -461,13 +462,9 @@ struct Index { break; } case "emitOnHttpErrorReceive":{ + this.isHttpErrorReceive=true + await Utils.sleep(1000) this.controller.loadUrl({url:'https://example1.com/path/does/not/exist/index.jsp'}) - setTimeout(()=>{ - this.controller.loadUrl({url:'https://example1.com/path/does/not/exist/index.jsp'}) - setTimeout(()=>{ - Utils.emitEvent(this.httpErrorReceive,66) - },3000) - },3000) break; } case "emitOnTitleReceive":{ @@ -478,10 +475,9 @@ struct Index { break; } case "emitOnDownloadStart":{ + this.isDownloadStart=true + await Utils.sleep(1000) this.controller.loadUrl({url:"https://consumer.huawei.com/content/dam/huawei-cbg-site/cn/mkt/mobileservices/2022/download/PC107f1b3947c942ffaa14334a879065d8.2107261020.exe"}) - setTimeout(()=>{ - Utils.emitEvent(this.downloadStart,68) - },5000) break; } case "emitSetCookie":{ @@ -711,6 +707,10 @@ struct Index { if(this.enterPageEnd){ Utils.emitEvent(this.newScale,97) this.enterPageEnd=false + }else if(this.isProgressFinish){ + console.info("isProgressFinish==>") + Utils.emitEvent(this.progress,114) + this.isProgressFinish=false } }) .onConsole((event) => { @@ -744,13 +744,22 @@ struct Index { } }) .onHttpErrorReceive((event) => { - this.httpErrorReceive = event.response.getResponseCode() + if(this.isHttpErrorReceive){ + console.info("isHttpErrorReceive==>") + this.httpErrorReceive = event.response.getResponseCode() + Utils.emitEvent(this.httpErrorReceive,66) + this.isHttpErrorReceive=false + } }) .onTitleReceive((event) => { this.titleReceive = event.title }) .onDownloadStart((event) => { - this.downloadStart = event.url + if(this.isDownloadStart){ + console.info("isDownloadStart==>") + Utils.emitEvent(event.url,68) + this.isDownloadStart=false + } }) .onScaleChange((event)=>{ console.log("onScaleChange==>")