!9570 【OpenHarmony 4.0.9.5】【4.0Beta2】【Web子系统】【TOD】【rk3568】【必现】修改xts-webcontroller用例

Merge pull request !9570 from yupeng/OpenHarmony-4.0-Beta2

arkui/ace_ets_web_dev_webController/entry/src/main/ets/MainAbility/pages/webONHttpErrorReceive.ets

@@ -68,7 +68,6 @@ struct webONHttpErrorReceive {
                             } catch (error) {
                                 console.error(`ErrorCode: ${error.code},  Message: ${error.message}`);
                             }
-                            Utils.emitEvent(this.title, 490)
                             break;
                         }
                     }
@@ -101,8 +100,7 @@ struct webONHttpErrorReceive {
                     Utils.emitEvent(event.response.getResponseMimeType(), 476);
                     console.log('getResponseCode:' + event.response.getResponseCode());
                     Utils.emitEvent(event.response.getResponseCode(), 478);
-                    this.title = JSON.stringify(event.response.getResponseCode()) + event.request.getRequestUrl();
-                    console.log("this.title result is :" + this.title);
+                    console.log("this.title result is :" + JSON.stringify(event.response.getResponseCode()) + event.request.getRequestUrl());
                     console.log('getReasonMessage:' + event.response.getReasonMessage());
                     Utils.emitEvent(event.response.getReasonMessage(), 480);
                     let result = event.request.getRequestHeader()
@@ -125,6 +123,7 @@ struct webONHttpErrorReceive {
                     console.log('The response header last result is ' + this.responseKey + this.responseValue);
                     Utils.emitEvent(this.responseKey, 486);
                     Utils.emitEvent(this.responseValue, 488);
+                    Utils.emitEvent(JSON.stringify(event.response.getResponseCode()) + event.request.getRequestUrl(), 490)
                 })
             }
     }

arkui/ace_ets_web_dev_webController/entry/src/main/ets/MainAbility/pages/webOnFirstContFour.ets

@@ -83,15 +83,10 @@ struct webOnFirstContFour {
                 .onFirstContentfulPaint(event => {
                     console.log("onFirstContentfulPaint:" + "[navigationStartTick]:" + 
                         event.navigationStartTick + ", [firstContentfulPaintMs]:" + event.firstContentfulPaintMs + this.firstId)
-                    if (event.firstContentfulPaintMs > 0 && event.firstContentfulPaintMs < 3000) {
+                    if (event.firstContentfulPaintMs > 0 && event.navigationStartTick > 0) {
                         this.firstcontentfulpaint = true;
-                        console.error("result of onFirstContentfulPaint is: "+ this.firstcontentfulpaint + this.firstId);
-                    }
-                })
-                .onPageEnd((event) => {
-                    console.log('url' + event.url + this.firstcontentfulpaint + this.firstId);
-                    if (this.firstBoo) {
                         Utils.emitEvent(this.firstcontentfulpaint, this.firstId)
+                        console.error("result of onFirstContentfulPaint is: "+ this.firstcontentfulpaint + this.firstId);
                     }
                 })
             }

arkui/ace_ets_web_dev_webController/entry/src/main/ets/MainAbility/pages/webOnFirstContThree.ets

@@ -82,7 +82,7 @@ struct webOnFirstContThree {
                 .onFirstContentfulPaint(event => {
                     console.log("onFirstContentfulPaint:" + "[navigationStartTick]:" + 
                         event.navigationStartTick + ", [firstContentfulPaintMs]:" + event.firstContentfulPaintMs + this.firstId)
-                    if (event.firstContentfulPaintMs > 0 && event.firstContentfulPaintMs < 5000) {
+                    if (event.firstContentfulPaintMs > 0 && event.navigationStartTick > 0) {
                         this.firstcontentfulpaint = true;
                         console.error("result of onFirstContentfulPaint is: "+ this.firstcontentfulpaint + this.firstId);
                     }

arkui/ace_ets_web_dev_webController/entry/src/main/ets/MainAbility/pages/webOnSslError.ets

@@ -85,11 +85,6 @@ struct webOnSslError {
                     Utils.emitEvent(this.sslerrorText, this.firstId)
                     return true
                 })
-                .onErrorReceive((event) => {
-                    console.log('getErrorInfo:' + event.error.getErrorInfo())
-                    console.log('getErrorCode:' + event.error.getErrorCode())
-                    console.log('url:' + event.request.getRequestUrl())
-                })
             }
     }
 }
\ No newline at end of file

arkui/ace_ets_web_dev_webController/entry/src/main/module.json

@@ -8,7 +8,8 @@
         "deviceTypes": [
             "tablet",
             "default",
-            "phone"
+            "phone",
+            "2in1"
         ],
         "deliveryWithInstall": true,
         "installationFree": false,
@@ -16,29 +17,33 @@
         "pages": "$profile:main_pages",
         "metadata": [
             {
-              "name": "ArkTSPartialUpdate",
-              "value": "true"
+                "name": "ArkTSPartialUpdate",
+                "value": "true"
             }
-          ],
-        "abilities": [{
-            "name": "com.example.myapplication.MainAbility",
-            "srcEntrance": "./ets/MainAbility/MainAbility.ts",
-            "description": "$string:phone_entry_main",
-            "icon": "$media:icon",
-            "label": "$string:entry_label",
-            "visible": true,
-            "orientation": "portrait",
-            "skills": [{
-                "actions": [
-                    "action.system.home"
-                ],
-                "entities": [
-                    "entity.system.home"
+        ],
+        "abilities": [
+            {
+                "name": "com.example.myapplication.MainAbility",
+                "srcEntrance": "./ets/MainAbility/MainAbility.ts",
+                "description": "$string:phone_entry_main",
+                "icon": "$media:icon",
+                "label": "$string:entry_label",
+                "visible": true,
+                "orientation": "portrait",
+                "skills": [
+                    {
+                        "actions": [
+                            "action.system.home"
+                        ],
+                        "entities": [
+                            "entity.system.home"
+                        ]
+                    }
                 ]
-            }]
-        }],
+            }
+        ],
         "requestPermissions": [
-	    {
+            {
                 "name": "ohos.permission.LOCATION"
             },
             {