From 431e2d4aa9116c9217705c8e322ba879ce26c313 Mon Sep 17 00:00:00 2001
From: zhangjing <zhangjing403@huawei.com>
Date: Tue, 20 Sep 2022 10:44:56 +0800
Subject: [PATCH] =?UTF-8?q?web=E7=BB=84=E4=BB=B6=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhangjing <zhangjing403@huawei.com>
---
 .../src/main/ets/MainAbility/pages/web.ets    |   7 +++++--
 .../entry/src/main/ets/test/Utils.ets         |  18 ++++++++++++++++++
 .../src/main/ets/test/WebJsunit.test.ets      |   2 +-
 .../signature/openharmony_sx.p7b              | Bin 3842 -> 3469 bytes
 4 files changed, 24 insertions(+), 3 deletions(-)

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 e3714dc50..630f93a12 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
@@ -55,6 +55,7 @@ struct Index {
     @State cacheError:boolean=false
     @State mixedSwitch:boolean=false
     @State mixedAllSwitch:boolean=false
+    @State overViewFalseHeight:number=0
     onPageShow(){
         let valueChangeEvent={
             eventId:10,
@@ -512,9 +513,11 @@ struct Index {
                             await Utils.sleep(1000)
                             this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/overview.html"})
                             setTimeout(()=>{
+                                let webPageHeight=this.controller.getPageHeight()
                                 this.controller.runJavaScript({script:"getViewResult()",callback:(res)=>{
+                                    this.overViewFalseHeight=parseInt(res)
 				                    console.info("getViewResult==>"+res)
-                                    Utils.emitEventTwo(1150,res,168)
+                                    Utils.emitEventTwo(webPageHeight,res,168)
                                 }})
                             },3000)
                             break;
@@ -526,7 +529,7 @@ struct Index {
                             setTimeout(()=>{
                                 this.controller.runJavaScript({script:"getViewResult()",callback:(res)=>{
 				                    console.info("getViewResult==>"+res)
-                                    Utils.emitEventTwo(2350,res,170)
+                                    Utils.emitEventTwo(this.overViewFalseHeight,parseInt(res),170)
                                 }})
                             },3000)
                             break;
diff --git a/arkui/ace_ets_web_dev/entry/src/main/ets/test/Utils.ets b/arkui/ace_ets_web_dev/entry/src/main/ets/test/Utils.ets
index 1a90ba6ae..d8e0944a8 100644
--- a/arkui/ace_ets_web_dev/entry/src/main/ets/test/Utils.ets
+++ b/arkui/ace_ets_web_dev/entry/src/main/ets/test/Utils.ets
@@ -132,4 +132,22 @@ export default class Utils {
             console.info("emit emitKey  err: " + JSON.stringify(err));
       }
     }
+    static registerLargerEvent(testCaseName,eventId,done){
+        console.info(`[${testCaseName}] START`);
+        try{
+            let callBack=(backData)=>{
+                console.info(`${testCaseName} get result is:`+JSON.stringify(backData));
+                expect(backData.data.actualValue).assertLarger(backData.data.expectedValue);
+                console.info(`[${testCaseName}] END`);
+                done()
+            }
+            let innerEvent = {
+                eventId:eventId,
+                priority:events_emitter.EventPriority.LOW
+            }
+            events_emitter.on(innerEvent,callBack)
+        }catch(err){
+            console.info(`[${testCaseName}] err:`+JSON.stringify(err));
+        }
+    }
 }
diff --git a/arkui/ace_ets_web_dev/entry/src/main/ets/test/WebJsunit.test.ets b/arkui/ace_ets_web_dev/entry/src/main/ets/test/WebJsunit.test.ets
index 5c955c488..1e55e2548 100644
--- a/arkui/ace_ets_web_dev/entry/src/main/ets/test/WebJsunit.test.ets
+++ b/arkui/ace_ets_web_dev/entry/src/main/ets/test/WebJsunit.test.ets
@@ -389,7 +389,7 @@ export default function webJsunit() {
      */
     it('overviewModeAccessTrue',0,async function(done){
       emitKey="emitOnPrompt";
-      Utils.registerEventTwo("overviewModeAccessTrue",170,done);
+      Utils.registerLargerEvent("overviewModeAccessTrue",170,done);
       sendEventByKey('webcomponent',10,'');
     })
     /* 
diff --git a/arkui/ace_ets_web_dev/signature/openharmony_sx.p7b b/arkui/ace_ets_web_dev/signature/openharmony_sx.p7b
index 7ffcdc78527c5c1aa24520ab7e913c5f47c703f0..bd2ec963919e78b14f7b0a95673312126655f454 100644
GIT binary patch
delta 434
zcmZpY>y@rIXyWZ;<J4;NX#38~$j-E&iMI+URK~=}Xvk~8&BmF~=E0cC%)-QI(8Q{R
zP{_ETiB+1ViB-H>sVudqI5R&_H!m?aRmn=pNY6meKuHHKoSdHm6gJXPN-QYQP01`S
zDauSLEdgmLsVqpHxKCtamfplmHvAwSP<v5oPHJLts?ug2#zoAD`30$YdKrmDx%qjO
zdWp%Y<*7*}sl_Eg;}Z*VfU5KIi*gflz}y1ewA93s(jt%{8TrNW5UF^etxB~(<;gk4
zN><fMi8(p><*6yU5Pr1MWCK>+%^TSG*|{7Iniy??-Zsdd{DCcXvL2svy``a<p@Ffv
zfpL_9KHTe^EQU%f3Jl6z>n9W(iHU1|s`S?5Mcqp7J?jr&OMb7rxO&<xr;i&AxY#&=
zfqKrCg_()P-N2Pe!7)*7^Onq`l3pB#+U~s7pPqP+=b{>u{+)|=Pj;`q;1JKG$T0Ou
litM_ex64(Fe7tS0&k&TFmYJvZwqsvc=uUR)=X2j>004!kl<5Ef

delta 750
zcmeB`ZjwtkXyW_F#;Mij(e|B}k)3Hl6W@EF&}$|}Mnhf$ZZ^(@HV?*BW)>z!gC@3l
z2!)Ibn%MeTn%KIlmC90!iZk=`bd&Q_QkAR>b>ISdiMc=lB||*}J%fo84Eakc3qbs$
z)ST4B;#8%H8QK#M+HB@yT)^y-T9KGrkdvyHTbWo;kdv95SOPRrNk=KMAP1<UxU#q;
zH8(yvzbF+fR-l`fnpjc_<XI_Y<QK<7<R`ypQIN|A^7RT*i*hrIL5|Y%^a~Dg^zn&z
z3iWgGah=T1s#~vwuEyOp1S%iz>F4GTv;tj)ucM!%yKB6!XK=8mzh5vG6{z-LQ2@83
z-W6<1d_a(An5U1cyQ>Qp)y^J{en1NyojiR!Ln7l{{T!WqTwUUUehG2KqCCje*FVfP
z-r3RF!!_OwXeu@*`gjJ1xcbG1LV_Y5Vg(k%f+K<IeB<4G{2fE$!#(|6{KK)Ra&`;|
z2@P_M4|Wc6b@fx)Y{SaW&gx{)#Ar7;fM;#JiIJs&xuJ=vWt4$FJk@Zr7%H(ST<!`n
zeX6Rhdo(4>;MkjvSsIIb-d9%|CN6mtY^!!<wuk{28wW5wp0j0PW@7O$aAQ(r`0<Ia
z#)+Au=<n=Kv*&`Mzc!r7`mMEiL5a_YXUcJJCLRSUnRPEg>}rj-NZRI=YUaX1FJg9C
Tx=#{XeD`<MoM&qlN;v}oqn!R`

-- 
GitLab