yangchenggong1_wd

fix |> 20764 【网络切换】断网后访问新闻频道,频道展示无网络的默认缺省页,网络恢复后再次访问该频道,频道数据未自动加载,不应一直显示无网络的默认缺省页。

import { BottomNavi, CommonConstants, ViewType } from 'wdConstant';
import { EmitterEventId, EmitterUtils, Logger, NetworkUtil } from 'wdKit';
import { EmptyComponent } from '../view/EmptyComponent';
import { EmptyComponent, WDViewDefaultType } from '../view/EmptyComponent';
import PageModel from '../../viewmodel/PageModel';
import { autoRefresh, onActionEnd, onActionStart, onActionUpdate } from '../../utils/PullDownRefresh';
import LoadMoreLayout from './LoadMoreLayout';
... ... @@ -317,6 +317,11 @@ export struct PageComponent {
// console.log(TAG, 'page onAutoRefresh111 ' + this.needload)
if (this.needload) {
this.getData();
}else{
let netStatus = NetworkUtil.isNetConnected()
if(this.pageModel.emptyType === WDViewDefaultType.WDViewDefaultType_NoNetwork && netStatus ){
this.onAutoRefresh()
}
}
this.needload = false;
}
... ...
... ... @@ -120,6 +120,7 @@ export class PageHelper {
pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_NoContent1;
return;
} else {
pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_Default
//更新数据
pageModel.compList.addItems(liveReviewDTO.list);
this.refreshUIEnd(pageModel, true);
... ... @@ -138,6 +139,7 @@ export class PageHelper {
this.refreshUIEnd(pageModel, false)
return;
}
pageModel.emptyType = WDViewDefaultType.WDViewDefaultType_Default
pageModel.pageInfo = pageInfo;
if (pageInfo.md5 == pageModel.displayPageInfoMd5) {
// 缓存一致,不解析
... ...