Merge remote-tracking branch 'origin/main'

 import router from '@ohos.router';
 import router from '@ohos.router';
 import { ContentDetailDTO, TopicInfo } from 'wdBean/Index';
 import { ContentDetailDTO, TopicInfo } from 'wdBean/Index';
-import { ToastUtils } from 'wdKit';
+import { DisplayUtils, ToastUtils } from 'wdKit';
 import { WDShare } from 'wdShare/Index';
 import { WDShare } from 'wdShare/Index';
 import { TrackConstants } from 'wdTracking/Index';
 import { TrackConstants } from 'wdTracking/Index';
 import font from '@ohos.font';
 import font from '@ohos.font';
@@ -130,11 +130,11 @@ export struct PaperTitleComponent {
   @Builder
   @Builder
   rightDecorateBuilder() {
   rightDecorateBuilder() {
       Row()
       Row()
-        .width('80vp')
+        .width(DisplayUtils.getDeviceWidth() - 265)
         .height('18vp')
         .height('18vp')
-        .clip(new Path({
-          commands: `M${vp2px(9)} 0 H${vp2px(91)} V${vp2px(18)} L0 ${vp2px(18)} Z`
-        }))
+        // .clip(new Path({
+        //   commands: `M${vp2px(9)} 0 H${vp2px(91)} V${vp2px(18)} L0 ${vp2px(18)} Z`
+        // }))
         .linearGradient({
         .linearGradient({
           direction: GradientDirection.Right, // 渐变方向
           direction: GradientDirection.Right, // 渐变方向
           repeating: false, // 渐变颜色是否重复
           repeating: false, // 渐变颜色是否重复

@@ -145,7 +145,7 @@ export struct LiveFollowComponent {
         ContentDetailRequest.postPointLevelOperate({ operateType: 6 }).then((res) => {
         ContentDetailRequest.postPointLevelOperate({ operateType: 6 }).then((res) => {
           console.log('关注号主获取积分==', JSON.stringify(res.data))
           console.log('关注号主获取积分==', JSON.stringify(res.data))
           if (res.data?.showToast) {
           if (res.data?.showToast) {
-            ToastUtils.showToast(res.data.ruleName + '+' + res.data.rulePoint + '积分', 1000);
+            // ToastUtils.showToast(res.data.ruleName + '+' + res.data.rulePoint + '积分', 1000);
           }
           }
         })
         })
       }
       }

@@ -16,6 +16,7 @@ import { MultiPictureDetailViewModel } from '../../viewmodel/MultiPictureDetailV
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { InfomationCardClick } from '../../utils/infomationCardClick'
 import { InfomationCardClick } from '../../utils/infomationCardClick'
 import measure from '@ohos.measure'
 import measure from '@ohos.measure'
+import { PeopleShipHomePageDataModel } from '../../viewmodel/PeopleShipHomePageDataModel'
 @Component
 @Component
 export struct RmhTitle {
 export struct RmhTitle {
   @State compDTO: CompDTO = new CompDTO()
   @State compDTO: CompDTO = new CompDTO()
@@ -74,7 +75,7 @@ export struct RmhTitle {
         ContentDetailRequest.postPointLevelOperate({ operateType: 6 }).then((res) => {
         ContentDetailRequest.postPointLevelOperate({ operateType: 6 }).then((res) => {
           console.log('关注号主获取积分==', JSON.stringify(res.data))
           console.log('关注号主获取积分==', JSON.stringify(res.data))
           if (res.data?.showToast) {
           if (res.data?.showToast) {
-            ToastUtils.showToast(res.data.ruleName + '+' + res.data.rulePoint + '积分', 1000);
+            // ToastUtils.showToast(res.data.ruleName + '+' + res.data.rulePoint + '积分', 1000);
           }
           }
         })
         })
       }
       }
@@ -236,13 +237,24 @@ export struct RmhTitle {
     .height(36)
     .height(36)
     .margin({ bottom: 10 })
     .margin({ bottom: 10 })
     .onClick(()=>{
     .onClick(()=>{
+      this.gotoPeopleShipHomePage()
+    })
+  }
+
+  async gotoPeopleShipHomePage(){
     ///个人主页 动态头像不能跳转
     ///个人主页 动态头像不能跳转
     if (this.isPeopleShipHome) return
     if (this.isPeopleShipHome) return
-
+    try {
+      let  detailModel = await PeopleShipHomePageDataModel.getPeopleShipHomePageDetailInfo(this.rmhInfo?.rmhId, '', '')
+      if (detailModel) {
         // 跳转号主
         // 跳转号主
-      ProcessUtils.gotoPeopleShipHomePage( this.rmhInfo?.rmhId,this.rmhInfo?.banControl,this.rmhInfo?.cnMainControl,this.rmhInfo?.userId,this.rmhInfo?.userType)
-
-    })
+        ProcessUtils.gotoPeopleShipHomePage(this.rmhInfo?.rmhId,this.rmhInfo?.banControl,this.rmhInfo?.cnMainControl,this.rmhInfo?.userId,this.rmhInfo?.userType)
+      }else {
+        ToastUtils.showToast('暂时无法查看该创作者主页',1000);
+      }
+    }catch {
+      ToastUtils.showToast('暂时无法查看该创作者主页',1000);
+    }
   }
   }
 
 
   // 获取文本宽度
   // 获取文本宽度

@@ -56,17 +56,17 @@ export default struct MinePageUserSimpleInfoUI {
 
 
         Image(this.isLogin?(this.headPhotoUrl?this.headPhotoUrl:this.userType === "1"?$r('app.media.default_head_userPage'):$r('app.media.AccountOwner_DefaultIcon')):$r('app.media.default_head_userPage'))
         Image(this.isLogin?(this.headPhotoUrl?this.headPhotoUrl:this.userType === "1"?$r('app.media.default_head_userPage'):$r('app.media.AccountOwner_DefaultIcon')):$r('app.media.default_head_userPage'))
           .alt(this.userType === "1"?$r('app.media.default_head_userPage'):$r('app.media.AccountOwner_DefaultIcon'))
           .alt(this.userType === "1"?$r('app.media.default_head_userPage'):$r('app.media.AccountOwner_DefaultIcon'))
-          .width(63.21)
-          .height(63.21)
-          .objectFit(ImageFit.Cover)
-          .borderRadius(50)
+          .width(64)
+          .height(64)
+          .objectFit(ImageFit.Fill)
+          .borderRadius(32)
 
 
         if(StringUtils.isNotEmpty(this.levelHead)){
         if(StringUtils.isNotEmpty(this.levelHead)){
           Image(this.levelHead)
           Image(this.levelHead)
-            .width(75.86)
-            .height(75.86)
+            .width(90)
+            .height(90)
             .objectFit(ImageFit.Cover)
             .objectFit(ImageFit.Cover)
-            .borderRadius(50)
+            // .borderRadius(50)
         }
         }
       }
       }
       .width(86)
       .width(86)

@@ -172,7 +172,7 @@ export struct HomePageBottomCommentComponent {
         parentCommentUserName))
         parentCommentUserName))
     })
     })
 
 
-    this.bottomCompH = DisplayUtils.getDeviceHeight() - data.length*160
+    this.bottomCompH = DisplayUtils.getDeviceHeight() - data.length*160 - 140
     if (status.commentIdList.length === 0) {
     if (status.commentIdList.length === 0) {
 
 
       if (this.curPageNum === 1) this.data_comment.clear()
       if (this.curPageNum === 1) this.data_comment.clear()

@@ -184,7 +184,7 @@ export struct OtherHomePageBottomCommentComponent {
       this.data_comment.notifyDataReload()
       this.data_comment.notifyDataReload()
 
 
       this.count = this.data_comment.totalCount()
       this.count = this.data_comment.totalCount()
-      this.commentNum = value.totalCount
+      // this.commentNum = value.totalCount
       if (value.hasNext === 1) {
       if (value.hasNext === 1) {
         this.curPageNum++
         this.curPageNum++
       } else {
       } else {
@@ -214,7 +214,7 @@ export struct OtherHomePageBottomCommentComponent {
         this.data_comment.notifyDataReload()
         this.data_comment.notifyDataReload()
 
 
         this.count = this.data_comment.totalCount()
         this.count = this.data_comment.totalCount()
-        this.commentNum = value.totalCount
+        // this.commentNum = value.totalCount
         if (value.hasNext === 1) {
         if (value.hasNext === 1) {
           this.curPageNum++
           this.curPageNum++
         } else {
         } else {
@@ -236,7 +236,7 @@ export struct OtherHomePageBottomCommentComponent {
       this.data_comment.notifyDataReload()
       this.data_comment.notifyDataReload()
 
 
       this.count = this.data_comment.totalCount()
       this.count = this.data_comment.totalCount()
-      this.commentNum = value.totalCount
+      // this.commentNum = value.totalCount
       if (value.hasNext === 1) {
       if (value.hasNext === 1) {
         this.curPageNum++
         this.curPageNum++
       } else {
       } else {

 import { CommonConstants, ViewType } from 'wdConstant';
 import { CommonConstants, ViewType } from 'wdConstant';
-import { Logger } from 'wdKit';
+import { Logger, NetworkUtil } from 'wdKit';
 import { EmptyComponent } from '../view/EmptyComponent';
 import { EmptyComponent } 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';
@@ -41,6 +41,7 @@ export struct PageComponent {
   private pageTrackBean: PageTrackBean = new PageTrackBean()
   private pageTrackBean: PageTrackBean = new PageTrackBean()
   // 国殇灰度管理
   // 国殇灰度管理
   GrayManage: SubscribedAbstractProperty<GrayManageModel> =  AppStorage.link<GrayManageModel>('GrayManage')
   GrayManage: SubscribedAbstractProperty<GrayManageModel> =  AppStorage.link<GrayManageModel>('GrayManage')
+  @State netStatus: number | undefined = undefined // 存储网络状态
 
 
   build() {
   build() {
     Column() {
     Column() {
@@ -278,19 +279,26 @@ export struct PageComponent {
     if (this.navIndex === this.currentTopNavSelectedIndex) {
     if (this.navIndex === this.currentTopNavSelectedIndex) {
       this.getData();
       this.getData();
       this.needload = false;
       this.needload = false;
+      // console.log(TAG, 'aboutToAppear onAutoRefresh111 ' + this.needload)
     }
     }
   }
   }
 
 
   onChange() {
   onChange() {
-    Logger.info(TAG,
-      `onChangezz id: ${this.pageId} , ${this.channelId} , ${this.navIndex} , navIndex: ${this.currentTopNavSelectedIndex}`);
+    // console.log(TAG, `onChangezz id: ${this.pageId} , ${this.channelId} , ${this.navIndex} , navIndex: ${this.currentTopNavSelectedIndex}`);
+    // 注册监听网络连接
+    this.netStatus = undefined
+    let netStatus = NetworkUtil.isNetConnected()
+    if (netStatus) {
       if (this.navIndex === this.currentTopNavSelectedIndex) {
       if (this.navIndex === this.currentTopNavSelectedIndex) {
-      Logger.debug(TAG, 'page onAutoRefresh111 ' + this.needload)
+        // console.log(TAG, 'page onAutoRefresh111 ' + this.needload)
         if (this.needload) {
         if (this.needload) {
           this.getData();
           this.getData();
         }
         }
         this.needload = false;
         this.needload = false;
       }
       }
+    } else {
+      this.pageModel.viewType = ViewType.EMPTY;
+    }
   }
   }
 
 
   onAutoRefresh() {
   onAutoRefresh() {

@@ -46,7 +46,7 @@ export struct PeopleShipHomePageTopComponent {
             authIcon: this.detailModel.authIcon
             authIcon: this.detailModel.authIcon
           }).margin({
           }).margin({
             left: '10vp',
             left: '10vp',
-            bottom: '20vp'
+            bottom: '15vp'
           }).onClick(() => {
           }).onClick(() => {
             let params = {
             let params = {
               'headPhotoUrl': this.detailModel.headPhotoUrl,
               'headPhotoUrl': this.detailModel.headPhotoUrl,

@@ -8,7 +8,7 @@ import {
   postInteractBrowsOperateParams
   postInteractBrowsOperateParams
 } from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest';
 } from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest';
 import { HttpUtils } from 'wdNetwork/Index';
 import { HttpUtils } from 'wdNetwork/Index';
-import { DateTimeUtils, EmitterEventId, EmitterUtils, Logger, WindowModel } from 'wdKit/Index';
+import { DateTimeUtils, EmitterEventId, EmitterUtils, Logger, NetworkType, WindowModel } from 'wdKit/Index';
 import { PlayerBottomView } from '../view/PlayerBottomView';
 import { PlayerBottomView } from '../view/PlayerBottomView';
 import { PlayerRightView } from '../view/PlayerRightView';
 import { PlayerRightView } from '../view/PlayerRightView';
 import { DisplayDirection } from 'wdConstant/Index';
 import { DisplayDirection } from 'wdConstant/Index';
@@ -61,6 +61,7 @@ export struct DetailPlayShortVideoPage {
   @Consume toastTextVisible: boolean
   @Consume toastTextVisible: boolean
   @StorageProp('currentBreakpoint') @Watch("currentChanged") currentBreakpoint: string = 'sm';
   @StorageProp('currentBreakpoint') @Watch("currentChanged") currentBreakpoint: string = 'sm';
   @State isPad: boolean = this.currentBreakpoint == "md" || this.currentBreakpoint == "lg" ? true : false
   @State isPad: boolean = this.currentBreakpoint == "md" || this.currentBreakpoint == "lg" ? true : false
+  @State timer: number = -1
 
 
   currentChanged() {
   currentChanged() {
     if (this.currentBreakpoint == "md" || this.currentBreakpoint == "lg") {
     if (this.currentBreakpoint == "md" || this.currentBreakpoint == "lg") {
@@ -230,6 +231,24 @@ export struct DetailPlayShortVideoPage {
 
 
     ///解决初始化竖屏视频时 this.ratio未更新导致显示错误
     ///解决初始化竖屏视频时 this.ratio未更新导致显示错误
     this.calculatePlayerRect()
     this.calculatePlayerRect()
+
+    // 注册监听网络连接
+    EmitterUtils.receiveEvent(EmitterEventId.NETWORK_CONNECTED, (async (str?: string) => {
+      if (this.timer) {
+        clearTimeout(this.timer)
+      }
+      this.timer = setTimeout(() => {
+        let type: NetworkType | null = null
+        if (str) {
+          type = JSON.parse(str) as NetworkType
+        }
+        // 注册监听网络连接
+        if (this.currentIndex === this.index && type != NetworkType.TYPE_UNKNOWN) {
+          console.log(TAG, '网络连接状态变化', type, 'this.currentIndex', this.currentIndex, 'this.index', this.index)
+          this.currentIndexChange()
+        }
+      }, 1000)
+    }))
   }
   }
 
 
   contentTrackingDict() {
   contentTrackingDict() {

 import { ContentDetailDTO } from 'wdBean/Index';
 import { ContentDetailDTO } from 'wdBean/Index';
-import { DateTimeUtils, ToastUtils } from 'wdKit/Index';
+import { DateTimeUtils, EmitterEventId, EmitterUtils, ToastUtils } from 'wdKit/Index';
 import { PlayerConstants, WDPlayerController } from 'wdPlayer/Index';
 import { PlayerConstants, WDPlayerController } from 'wdPlayer/Index';
 
 
 @Reusable
 @Reusable
@@ -49,6 +49,12 @@ export struct PlayerProgressView {
         this.playerController?.play()
         this.playerController?.play()
       }
       }
     }
     }
+    // 注册监听网络连接
+    EmitterUtils.receiveEvent(EmitterEventId.NETWORK_CONNECTED, (async (str?: string) => {
+      if (this.timer) {
+        clearTimeout(this.timer)
+      }
+    }))
   }
   }
 
 
   /**
   /**