Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool

@@ -85,6 +85,9 @@ export struct WdWebLocalComponent {
       eventHandler.pageEndBlock = this.onPageEnd.bind(this)
       eventHandler.pageEndBlock = this.onPageEnd.bind(this)
       if (eventHandler.pageLoadEnd) {
       if (eventHandler.pageLoadEnd) {
         this.onPageEnd()
         this.onPageEnd()
+
+        // 开始复用
+        this.startResuse()
       }
       }
       eventHandler.currentPageOperateBlock = this.currentPageOperate.bind(this)
       eventHandler.currentPageOperateBlock = this.currentPageOperate.bind(this)
     }
     }
@@ -206,6 +209,14 @@ export struct WdWebLocalComponent {
     }
     }
   }
   }
 
 
+  startResuse() {
+    let params = {'event':NativeCallH5Event.NativeCallH5EventStartLoadingOnReuse} as eventParams;
+    let jsonString = JSON.stringify(params);
+    this.webviewControl.callHandle(NativeCallH5Type.jsCall_appNotifyEvent, jsonString, (data: string) => {
+      Logger.debug(TAG, "开始复用，H5回调" + data);
+    })
+  }
+
   startPlay() {
   startPlay() {
     this.cancelProgressTimer()
     this.cancelProgressTimer()
     this.controller.start()
     this.controller.start()

 import { BottomNavi, CommonConstants, ViewType } from 'wdConstant';
 import { BottomNavi, CommonConstants, ViewType } from 'wdConstant';
 import { EmitterEventId, EmitterUtils, Logger, NetworkUtil } from 'wdKit';
 import { EmitterEventId, EmitterUtils, Logger, NetworkUtil } from 'wdKit';
-import { EmptyComponent } from '../view/EmptyComponent';
+import { EmptyComponent, WDViewDefaultType } from '../view/EmptyComponent';
 import PageModel from '../../viewmodel/PageModel';
 import PageModel from '../../viewmodel/PageModel';
 import { autoRefresh, onActionEnd, onActionStart, onActionUpdate } from '../../utils/PullDownRefresh';
 import { autoRefresh, onActionEnd, onActionStart, onActionUpdate } from '../../utils/PullDownRefresh';
 import LoadMoreLayout from './LoadMoreLayout';
 import LoadMoreLayout from './LoadMoreLayout';
@@ -317,6 +317,11 @@ export struct PageComponent {
         // console.log(TAG, 'page onAutoRefresh111 ' + this.needload)
         // console.log(TAG, 'page onAutoRefresh111 ' + this.needload)
         if (this.needload) {
         if (this.needload) {
           this.getData();
           this.getData();
+        }else{
+          let netStatus = NetworkUtil.isNetConnected()
+          if(this.pageModel.emptyType === WDViewDefaultType.WDViewDefaultType_NoNetwork && netStatus ){
+            this.onAutoRefresh()
+          }
         }
         }
         this.needload = false;
         this.needload = false;
       }
       }

@@ -120,6 +120,7 @@ export class PageHelper {
           pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_NoContent1;
           pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_NoContent1;
           return;
           return;
         } else {
         } else {
+          pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_Default
           //更新数据
           //更新数据
           pageModel.compList.addItems(liveReviewDTO.list);
           pageModel.compList.addItems(liveReviewDTO.list);
           this.refreshUIEnd(pageModel, true);
           this.refreshUIEnd(pageModel, true);
@@ -138,6 +139,7 @@ export class PageHelper {
           this.refreshUIEnd(pageModel, false)
           this.refreshUIEnd(pageModel, false)
           return;
           return;
         }
         }
+        pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_Default
         pageModel.pageInfo = pageInfo;
         pageModel.pageInfo = pageInfo;
         if (pageInfo.md5 == pageModel.displayPageInfoMd5) {
         if (pageInfo.md5 == pageModel.displayPageInfoMd5) {
           // 缓存一致，不解析
           // 缓存一致，不解析