Merge remote-tracking branch 'origin/main'

@@ -49,7 +49,7 @@ export struct ENewspaperItemComponent {
         })
         })
         .objectFit(ImageFit.Fill)
         .objectFit(ImageFit.Fill)
         .zIndex(10)
         .zIndex(10)
-      newsSkeleton()
+      newsSkeleton({showBottom: false})
         .visibility(this.isShowSkeleton ? Visibility.Visible : Visibility.None)
         .visibility(this.isShowSkeleton ? Visibility.Visible : Visibility.None)
         .width('100%')
         .width('100%')
         .zIndex(1)
         .zIndex(1)

-import { Action, CompDTO, ContentDTO } from 'wdBean';
-import { CommonConstants, ViewType } from 'wdConstant';
-import PageViewModel from '../../viewmodel/PageViewModel';
-import PageModel from '../../viewmodel/PageModel';
+import { Action } from 'wdBean';
 import router from '@ohos.router';
 import router from '@ohos.router';
-import { CardParser } from '../CardParser';
-import { channelSkeleton } from '../skeleton/channelSkeleton';
-import { ErrorComponent } from '../view/ErrorComponent';
-import { EmptyComponent } from '../view/EmptyComponent';
-import { listTouchEvent } from '../../utils/PullDownRefresh';
 import PageAdModel from '../../viewmodel/PageAdvModel';
 import PageAdModel from '../../viewmodel/PageAdvModel';
-import { RefreshLayoutBean } from '../refresh/RefreshLayoutBean';
-import RefreshLayout from '../refresh/RefreshLayout';
-import PageNoMoreLayout from './PageNoMoreLayout';
-import { NoMoreBean } from './NoMoreBean';
 import CommonPageTitle from './CommonPageTitle';
 import CommonPageTitle from './CommonPageTitle';
 import TemplatePageComponent from './template/TemplatePageComponent';
 import TemplatePageComponent from './template/TemplatePageComponent';
 import { TemplatePageConstant } from './template/TemplatePageConstant';
 import { TemplatePageConstant } from './template/TemplatePageConstant';

@@ -38,10 +38,12 @@ export class TemplatePageHelp extends BasePageHelp {
       this.treatDiffBusinessDataSource()
       this.treatDiffBusinessDataSource()
     } else if (pageModel.compList.size() > 0) {
     } else if (pageModel.compList.size() > 0) {
       // 加载缓存数据了，不用无网络提示
       // 加载缓存数据了，不用无网络提示
+      this.closeAnimation(this.pageModel.resolve)
     } else {
     } else {
         // 无网情况
         // 无网情况
         this.pageModel.pageCompType = TemplatePageStateType.OTHER
         this.pageModel.pageCompType = TemplatePageStateType.OTHER
         this.pageModel.noNormalState = WDViewDefaultType.WDViewDefaultType_NoNetwork
         this.pageModel.noNormalState = WDViewDefaultType.WDViewDefaultType_NoNetwork
+
     }
     }
   }
   }
 
 
@@ -293,6 +295,12 @@ export class TemplatePageHelp extends BasePageHelp {
     }
     }
 
 
   }
   }
+
+  private closeAnimation(resolve?: (value: string | PromiseLike<string>) => void) {
+    if (resolve) {
+        resolve('')
+    }
+  }
 }
 }
 
 
 
 

@@ -44,9 +44,10 @@ export struct CustomPullToRefresh {
               this.onRefresh(resolve)
               this.onRefresh(resolve)
             }).then((text) => {
             }).then((text) => {
               setTimeout(()=>{
               setTimeout(()=>{
+                this.refreshDestroy()
                 // 延时500，展示第二段动画 TODO 是否去掉？
                 // 延时500，展示第二段动画 TODO 是否去掉？
+                if(text){
                   this.refreshState = 3
                   this.refreshState = 3
-                this.refreshDestroy()
                   setTimeout(() => {
                   setTimeout(() => {
                     success(text)
                     success(text)
                   }, 500)
                   }, 500)
@@ -54,6 +55,11 @@ export struct CustomPullToRefresh {
                     this.refreshState = 4
                     this.refreshState = 4
                     // 延时将状态改为空闲，组件closeRefresh做了延时，不能配置，这里配合延时
                     // 延时将状态改为空闲，组件closeRefresh做了延时，不能配置，这里配合延时
                   }, 1200)
                   }, 1200)
+                }else {
+                  success(text)
+                  this.refreshState = 4
+                }
+
               },500)
               },500)
             })
             })
           });
           });

@@ -6,6 +6,7 @@
 @Component
 @Component
 export struct newsSkeleton {
 export struct newsSkeleton {
   @State quantity: Array<number> = [1, 2, 3,]
   @State quantity: Array<number> = [1, 2, 3,]
+  @State showBottom: boolean = true
 
 
   build() {
   build() {
     Row() {
     Row() {
@@ -116,10 +117,11 @@ export struct newsSkeleton {
           right: 15,
           right: 15,
           left: 15
           left: 15
         })
         })
-
+        if (this.showBottom) {
           Column().backgroundColor('#CBCBCB').height(5).width(339)
           Column().backgroundColor('#CBCBCB').height(5).width(339)
           Column().backgroundColor('#909090').height(5).width(326)
           Column().backgroundColor('#909090').height(5).width(326)
         }
         }
+      }
       .width('100%')
       .width('100%')
     }
     }
     .height('100%')
     .height('100%')

@@ -66,10 +66,10 @@ export struct LiveHorizontalCardComponent {
 
 
   liveToMore() {
   liveToMore() {
     if (!!this.compDTO.dataSourceType) {
     if (!!this.compDTO.dataSourceType) {
-      if (this.compDTO.dataSourceType === 'OBJECT_POS') {
-        ProcessUtils.jumpChannelTab(this.compDTO.objectId, this.compDTO.pageId as string, this.compDTO.objectTitle)
-        return;
-      }
+      // if (this.compDTO.dataSourceType === 'OBJECT_POS') {
+      //   ProcessUtils.jumpChannelTab(this.compDTO.objectId, this.compDTO.pageId as string, this.compDTO.objectTitle)
+      //   return;
+      // }
       if (this.compDTO.linkUrl) {
       if (this.compDTO.linkUrl) {
         let taskAction: Action = {
         let taskAction: Action = {
           type: 'JUMP_H5_BY_WEB_VIEW',
           type: 'JUMP_H5_BY_WEB_VIEW',
@@ -236,6 +236,13 @@ export struct LiveHorizontalCardComponent {
       } else if (this.compDTO.operDataList.length) {
       } else if (this.compDTO.operDataList.length) {
         // 一个
         // 一个
         LiveHorizontalCardForOneComponent({ contentDTO: this.compDTO.operDataList[0] })
         LiveHorizontalCardForOneComponent({ contentDTO: this.compDTO.operDataList[0] })
+          .onClick(() => {
+            InfomationCardClick.track(this.compDTO, this.compDTO.operDataList[0], this.pageId, this.pageName)
+            if (this.compDTO.operDataList[0].objectType != '0') {
+              console.log(this.compDTO.operDataList[0].objectId)
+              this.gotoLive(this.compDTO.operDataList[0])
+            }
+          })
       }
       }
     }
     }
     // .width(CommonConstants.FULL_WIDTH)
     // .width(CommonConstants.FULL_WIDTH)

@@ -7,7 +7,7 @@
   "main": "",
   "main": "",
   "version": "1.0.0",
   "version": "1.0.0",
   "dependencies": {
   "dependencies": {
-    "@ohos/lottie": "2.0.10",
+    "@ohos/lottie": "v2.0.11-rc.6",
     "wdComponent": "file:../../features/wdComponent",
     "wdComponent": "file:../../features/wdComponent",
     "wdConstant": "file:../../commons/wdConstant",
     "wdConstant": "file:../../commons/wdConstant",
     "wdKit": "file:../../commons/wdKit",
     "wdKit": "file:../../commons/wdKit",