liyubing

feat:1)优化样板信息流块,无网络状态的业务逻辑处理

1 -import { Action, CompDTO, ContentDTO } from 'wdBean';  
2 -import { CommonConstants, ViewType } from 'wdConstant';  
3 -import PageViewModel from '../../viewmodel/PageViewModel';  
4 -import PageModel from '../../viewmodel/PageModel'; 1 +import { Action } from 'wdBean';
5 import router from '@ohos.router'; 2 import router from '@ohos.router';
6 -import { CardParser } from '../CardParser';  
7 -import { channelSkeleton } from '../skeleton/channelSkeleton';  
8 -import { ErrorComponent } from '../view/ErrorComponent';  
9 -import { EmptyComponent } from '../view/EmptyComponent';  
10 -import { listTouchEvent } from '../../utils/PullDownRefresh';  
11 import PageAdModel from '../../viewmodel/PageAdvModel'; 3 import PageAdModel from '../../viewmodel/PageAdvModel';
12 -import { RefreshLayoutBean } from '../refresh/RefreshLayoutBean';  
13 -import RefreshLayout from '../refresh/RefreshLayout';  
14 -import PageNoMoreLayout from './PageNoMoreLayout';  
15 -import { NoMoreBean } from './NoMoreBean';  
16 import CommonPageTitle from './CommonPageTitle'; 4 import CommonPageTitle from './CommonPageTitle';
17 import TemplatePageComponent from './template/TemplatePageComponent'; 5 import TemplatePageComponent from './template/TemplatePageComponent';
18 import { TemplatePageConstant } from './template/TemplatePageConstant'; 6 import { TemplatePageConstant } from './template/TemplatePageConstant';
@@ -38,10 +38,12 @@ export class TemplatePageHelp extends BasePageHelp { @@ -38,10 +38,12 @@ export class TemplatePageHelp extends BasePageHelp {
38 this.treatDiffBusinessDataSource() 38 this.treatDiffBusinessDataSource()
39 } else if (pageModel.compList.size() > 0) { 39 } else if (pageModel.compList.size() > 0) {
40 // 加载缓存数据了,不用无网络提示 40 // 加载缓存数据了,不用无网络提示
  41 + this.closeAnimation(this.pageModel.resolve)
41 } else { 42 } else {
42 - // 无网情况  
43 - this.pageModel.pageCompType = TemplatePageStateType.OTHER  
44 - this.pageModel.noNormalState = WDViewDefaultType.WDViewDefaultType_NoNetwork 43 + // 无网情况
  44 + this.pageModel.pageCompType = TemplatePageStateType.OTHER
  45 + this.pageModel.noNormalState = WDViewDefaultType.WDViewDefaultType_NoNetwork
  46 +
45 } 47 }
46 } 48 }
47 49
@@ -293,6 +295,12 @@ export class TemplatePageHelp extends BasePageHelp { @@ -293,6 +295,12 @@ export class TemplatePageHelp extends BasePageHelp {
293 } 295 }
294 296
295 } 297 }
  298 +
  299 + private closeAnimation(resolve?: (value: string | PromiseLike<string>) => void) {
  300 + if (resolve) {
  301 + resolve('')
  302 + }
  303 + }
296 } 304 }
297 305
298 306
@@ -44,16 +44,22 @@ export struct CustomPullToRefresh { @@ -44,16 +44,22 @@ export struct CustomPullToRefresh {
44 this.onRefresh(resolve) 44 this.onRefresh(resolve)
45 }).then((text) => { 45 }).then((text) => {
46 setTimeout(()=>{ 46 setTimeout(()=>{
47 - // 延时500,展示第二段动画 TODO 是否去掉?  
48 - this.refreshState = 3  
49 this.refreshDestroy() 47 this.refreshDestroy()
50 - setTimeout(() => { 48 + // 延时500,展示第二段动画 TODO 是否去掉?
  49 + if(text){
  50 + this.refreshState = 3
  51 + setTimeout(() => {
  52 + success(text)
  53 + }, 500)
  54 + setTimeout(() => {
  55 + this.refreshState = 4
  56 + // 延时将状态改为空闲,组件closeRefresh做了延时,不能配置,这里配合延时
  57 + }, 1200)
  58 + }else {
51 success(text) 59 success(text)
52 - }, 500)  
53 - setTimeout(() => {  
54 this.refreshState = 4 60 this.refreshState = 4
55 - // 延时将状态改为空闲,组件closeRefresh做了延时,不能配置,这里配合延时  
56 - }, 1200) 61 + }
  62 +
57 },500) 63 },500)
58 }) 64 })
59 }); 65 });