feat：解决冲突

@@ -2,8 +2,8 @@
   "app": {
     "bundleName": "com.peopledailychina.hosactivity",
     "vendor": "$string:app_vendor",
-    "versionCode": 7398,
-    "versionName": "7.3.9.8",
+    "versionCode": 7399,
+    "versionName": "7.3.9.9",
     "icon": "$media:app_icon",
     "label": "$string:app_name"
   }

@@ -4,13 +4,14 @@ import { common } from '@kit.AbilityKit';
 import { AccountManagerUtils } from '../utils/AccountManagerUtils';
 import { UserDataLocal } from '../utils/UserDataLocal';
 import { EmitterUtils } from '../utils/EmitterUtils';
+import { EmitterEventId } from '../utils/EmitterEventId';
 
 export class UmengStats {
 
   private static _inited = false
 
   // 启动时调用
-  static preInit(context: common.UIAbilityContext) {
+  static preInit(context: common.AbilityStageContext) {
 
     // 需在 AppScope/resources/rawfile/umconfig.json 配置key和channel
     preInit({
@@ -23,14 +24,23 @@ export class UmengStats {
 
   // 在用户同意隐私政策后再调用此方法
   static initAfterAgreeProtocol() {
+    if (UmengStats._inited) {
+      return
+    }
     init();
     UmengStats._inited = true
 
     UmengStats.onLogin()
-    UmengStats.event("testHarmony", {"key1": "value1"})
+    // UmengStats.event("testHarmony", {"key1": "value1"})
+
+    EmitterUtils.receiveEvent(EmitterEventId.LOGIN_SUCCESS, () => {
+      UmengStats.onLogin()
+    })
+    EmitterUtils.receiveEvent(EmitterEventId.FORCE_USER_LOGIN_OUT, () => {
+      UmengStats.onLogout()
+    })
   }
 
-  // TODO: 登录成功调用
   static onLogin() {
     AccountManagerUtils.isLogin().then((login) => {
       if (!login) { return }
@@ -41,7 +51,7 @@ export class UmengStats {
       }
     })
   }
-  // TODO: 退出登录调用
+
   static onLogout() {
     onProfileSignOff()
   }

@@ -74,6 +74,16 @@ export struct WdWebLocalComponent {
 
   }
 
+  aboutToAppear(): void {
+    EmitterUtils.receiveEvent(EmitterEventId.AUDIO_CHANGE_STATUS, (status) => {
+      Logger.debug(TAG, "接收音频播放状态 = " + status);
+      if (!this.isPause) {
+        this.controller.pause()
+        this.cancelProgressTimer()
+      }
+    })
+  }
+
   build() {
     Column() {
       Row() {

@@ -88,6 +88,7 @@ export struct CardParser {
         pageId: this.pageId,
         pageName: this.pageName
       })
+      this.getBehindDivider()
     } else {
       if (contentDTO.appStyle === CompStyle.Card_02) {
         Card2Component({

@@ -185,6 +185,12 @@ export struct ImageAndTextPageComponent {
                 .padding({ top: 14, bottom: 24 })
                 .justifyContent(FlexAlign.Center)
               }
+
+              // 没有推荐 && 没有评论，高度需要增加，否则被外层padding了 显示不下
+              if (this.recommendList.length == 0 && !this.contentDetailData?.openComment) {
+                Column() {
+                }.height(44 + 24)
+              }
               if (this.recommendList.length > 0) {
                 Column(){
                   Divider().strokeWidth(8).color('#f5f5f5')

@@ -31,6 +31,11 @@ import DailyPaperTopicModel from '../../model/DailyPaperTopicModel';
 
 const TAG = 'MorningEveningPaperComponent';
 
+interface newsInfo {
+  currentStatus: number | string | undefined,
+  url: string
+}
+
 @Entry
 @Component
 export struct MorningEveningPaperComponent {
@@ -138,6 +143,10 @@ export struct MorningEveningPaperComponent {
         this.fetchData()
       }
     }
+    EmitterUtils.receiveEvent(EmitterEventId.AUDIO_CHANGE_STATUS, (val: number | string | undefined) => {
+      // console.log(TAG, 'this.currentStatus', val)
+      this.currentStatus = val
+    })
   }
 
   async fetchData() {
@@ -191,6 +200,25 @@ export struct MorningEveningPaperComponent {
           this.audioPlayUrl = compInfoBean?.compList[0].audioDataList[0]?.audioUrl
           this.audioTitle = compInfoBean?.compList[0].audioDataList[0]?.title
           // console.log(TAG, 'this.audioPlayUrl', this.audioPlayUrl)
+          const newsInfo = this.AudioSuspension.newsInfo();
+          // console.log(TAG, 'newsInfo', newsInfo)
+          if (newsInfo) {
+            try {
+              const parsedInfo: newsInfo = JSON.parse(newsInfo);
+              const url = parsedInfo.url;
+
+              // console.log(TAG, 'url', url)
+              // console.log(TAG, 'this.audioUrl', this.audioUrl)
+
+              if (url == this.audioPlayUrl) {
+                this.currentStatus = parsedInfo.currentStatus
+              }
+            } catch (error) {
+              console.error(`${TAG} Error parsing newsInfo:`, error);
+            }
+          } else {
+            console.log(`${TAG} No newsInfo available`);
+          }
         }
       }
 

@@ -134,6 +134,10 @@ export struct RmhTitle {
     return this.rmhInfo?.cnIsAttention && this.rmhInfo?.userType != "5"
   }
 
+  getFollowText() {
+    return Number(this.followStatus) === 0 ? '关注' : '已关注'
+  }
+
   build() {
     Flex() {
       if (this.rmhInfo.userType != '5') {
@@ -201,8 +205,17 @@ export struct RmhTitle {
                 .textAlign(TextAlign.Start)
                 .height(14)
                 .lineHeight(14)
-                .width('calc(100% - 65vp)')
-                // .constraintSize({maxWidth:(DisplayUtils.getDeviceWidth() - 32 - 36 - 18 - this.getTextWidth(DateTimeUtils.getCommentTime(Number.parseFloat(this.publishTime))))})
+                // .width('calc(100% - 65vp)')
+                .constraintSize({
+                    maxWidth:(
+                      DisplayUtils.getDeviceWidth()
+                        - 32
+                        - 8 - 12
+                        - 36
+                        - (this.hasRightFollow() ? (19 + 6 + this.getTextWidth(this.getFollowText(), $r('app.float.font_size_13'))) : 0)
+                        - this.getTextWidth(DateTimeUtils.getCommentTime(Number.parseFloat(this.publishTime)), $r("app.float.font_size_12"))
+                    )
+                  })
             }
 
           }
@@ -223,13 +236,15 @@ export struct RmhTitle {
               Image($r('app.media.rmh_follow'))
                 .width(16)
                 .height(16)
+                .margin({right: 3})
             }
 
-            Text(Number(this.followStatus) === 0 ? '关注' : '已关注')
+            Text(this.getFollowText())
               .fontSize($r('app.float.font_size_13'))
+              .fontWeight(600)
               .fontColor(Number(this.followStatus) === 0 ? $r('app.color.color_ED2800') : 0xc6c6c6)
           }
-          .margin({top:4})
+          // .margin({top:4})
           .height(36)
         }
         .flexShrink(0)
@@ -270,10 +285,10 @@ export struct RmhTitle {
   }
 
   // 获取文本宽度
-  private getTextWidth(text: string) {
+  private getTextWidth(text: string, fontSize: Resource) {
     let size =  measure.measureTextSize({
       textContent: text,
-      fontSize: $r("app.float.font_size_12")
+      fontSize: fontSize
     })
     return px2vp(Number(size.width))
   }

@@ -27,14 +27,17 @@ export struct MoreComponent {
         if (item.appStyle !== "9") {
           CardParser({compDTO:new CompDTO, contentDTO: item })
         } else {
-          Card9Component({ compDTO: new CompDTO, contentDTO:item, pageId: "", pageName: "" })
+          Column(){
+            Card9Component({ compDTO: new CompDTO, contentDTO:item, pageId: "", pageName: "" })
+
+            Divider()
+              .width('100%')
+              .color($r('app.color.color_F5F5F5'))
+              .strokeWidth(4)
+          }
         }
       })
 
-      Divider()
-        .width('100%')
-        .color($r('app.color.color_F5F5F5'))
-        .strokeWidth(4)
 
     } else {
       Column() {

@@ -233,7 +233,7 @@ export struct ZhSingleColumn09 {
             .fontSize(14)
             .fontColor(this.compDTO?.operDataList.length > 8 && !this.fullyTraversed ? 0xed2800 : 0xB0B0B0)
             .margin({ right: 4 })
-          Image(this.compDTO?.operDataList.length > 8 ? $r('app.media.icon_refresh') : $r('app.media.ic_refresh'))
+          Image(this.compDTO?.operDataList.length > 8 && !this.fullyTraversed ? $r('app.media.icon_refresh') : $r('app.media.ic_refresh'))
             .width(14)
             .height(14)
         }

@@ -437,6 +437,9 @@ export struct ZhSingleRow03 {
                 .fontSize(12)
                 .textAlign(TextAlign.Center)
                 .borderRadius(3)
+                .borderStyle(BorderStyle.Solid)
+                .borderWidth(this.isReserved(Number(item.objectId)) ? 1 : 0)
+                .borderColor('#e5e5e5')
                 .onClick(() => {
                   this.bookAndCancel(item.relId, item.objectId, !this.isReserved(Number(item.objectId)))
                 })

@@ -447,7 +447,7 @@ export struct PaperSingleColumn999CardView {
             .borderRadius(5)
             .objectFit(ImageFit.Fill)
             // .aspectRatio(319 / 179) ///图片设计比例
-            .padding({ top: 10 })
+            .margin({ top: 10 })
             .backgroundColor('#f5f5f5')
             .width('100%')
             .height((DisplayUtils.getDeviceWidth() - 66)*(179 / 319))
@@ -585,7 +585,7 @@ export struct PaperSingleColumn999CardView {
             Text(this.getPublishTime())
               .fontSize(12)
               .fontColor('#B0B0B0')
-              .margin({ left: this.item?.source.length > 0?0:16 })
+              .margin({ left: this.buildSourceString().length > 0?0:16 })
             if (this.item.objectType != '2' && this.interactData && this.interactData.commentNum && Number(this.interactData.commentNum) > 0) {
               Text(this.handlerNum(this.interactData.commentNum.toString()) + "评")
                 .fontSize(12)
@@ -679,7 +679,7 @@ export struct PaperSingleColumn999CardView {
   buildSourceString(): string {
     let contentString: string = ''
     if (this.item?.rmhInfo?.rmhName.length > 0) {
-      // contentString = this.item?.rmhInfo?.rmhName
+      contentString = this.item?.rmhInfo?.rmhName
     }else if(this.item?.source.length > 0){
       contentString = this.item?.source
     }

@@ -17,6 +17,8 @@ import TrackingPageBrowseUtils from '../../utils/TrackingPageBrowseUtils'
 import { TrackConstants, TrackingButton, TrackingContent, TrackParamConvert } from 'wdTracking/Index';
 
 import { PeopleShipMainViewModel } from '../../viewmodel/PeopleShipMainViewModel';
+import { router } from '@kit.ArkUI';
+
 @Entry
 @Component
 struct MyCollectionListPage {
@@ -151,7 +153,10 @@ struct MyCollectionListPage {
     .scrollBar(BarState.Off)
     .height(CommonConstants.FULL_PARENT)
     .edgeEffect(EdgeEffect.None) // 必须设置列表为滑动到边缘无效果
-    .margin({
+    .margin(router.getState().name === 'MyCollectionListPage' ? {
+      left: 6,
+      right: 6
+    } : {
       left: 16,
       right: 16
     })

 import { CommonConstants, ViewType } from 'wdConstant';
-import { Logger, NetworkUtil } from 'wdKit';
+import { EmitterEventId, EmitterUtils, Logger, NetworkUtil } from 'wdKit';
 import { EmptyComponent } from '../view/EmptyComponent';
 import PageModel from '../../viewmodel/PageModel';
 import { autoRefresh, onActionEnd, onActionStart, onActionUpdate } from '../../utils/PullDownRefresh';
@@ -43,6 +43,7 @@ export struct PageComponent {
   // 国殇灰度管理
   GrayManage: SubscribedAbstractProperty<GrayManageModel> =  AppStorage.link<GrayManageModel>('GrayManage')
   @State netStatus: number | undefined = undefined // 存储网络状态
+  isRMH:boolean = false
 
   build() {
     Column() {
@@ -282,6 +283,16 @@ export struct PageComponent {
       this.needload = false;
       // console.log(TAG, 'aboutToAppear onAutoRefresh111 ' + this.needload)
     }
+
+    //人民号推荐 监听登录事件（刷新页面）
+    EmitterUtils.receiveEvent(EmitterEventId.LOGIN_SUCCESS, () => {
+      if(this.navIndex === this.currentTopNavSelectedIndex && this.isRMH){
+        this.listScroller.scrollEdge(Edge.Top)
+        this.pageModel.viewType = ViewType.LOADING;
+        this.getData()
+      }
+    })
+
   }
 
   onChange() {

@@ -97,10 +97,10 @@ export struct TopNavigationComponentNew {
                 if (!this.isBroadcast(navItem) && !this.isLayout(navItem)) {
                   if (CompUtils.isNews(this.navItem)) {
                     this.createPageComponent(navItem, index,
-                      (channelId) => this.GrayManage.get().isNewsMourning(channelId));
+                      (channelId) => this.GrayManage.get().isNewsMourning(channelId),false);
                   } else if (CompUtils.isRMH(this.navItem)) {
                     this.createPageComponent(navItem, index,
-                      (channelId) => this.GrayManage.get().isRmhMourning(channelId));
+                      (channelId) => this.GrayManage.get().isRmhMourning(channelId),true);
                   }
 
                 } else {
@@ -165,7 +165,7 @@ export struct TopNavigationComponentNew {
 
   }
   @Builder
-   createPageComponent(navItem: TopNavDTO, index: number, mourningCheckFn: (channelId: string) => boolean) {
+   createPageComponent(navItem: TopNavDTO, index: number, mourningCheckFn: (channelId: string) => boolean,isRMH:boolean = false) {
     PageComponent({
       currentTopNavSelectedIndex: this.currentTopNavSelectedIndex,
       navIndex: index,
@@ -173,6 +173,7 @@ export struct TopNavigationComponentNew {
       channelId: navItem?.channelId + '',
       autoRefresh: this.autoRefresh2Page,
       isMourning: mourningCheckFn(`${navItem.channelId}`),
+      isRMH:isRMH
     })
       // .margin({
       //   left: 6,

@@ -266,6 +266,9 @@ export struct PeopleShipMainComponent {
         ListItem() {
           Column(){
             CardParser({ compDTO: new CompDTO, contentDTO: item })
+              .margin({
+                left: 6, right: 6
+              })
             // Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
           }.width('100%')
 
@@ -566,10 +569,10 @@ export struct PeopleShipMainComponent {
     }
 
     //退出登录的时候 刷新界面
-    let userID = UserDataLocal.getUserId()
-    if (!StringUtils.isNotEmpty(userID)) {
-      this.getData()
-    }
+    // let userID = UserDataLocal.getUserId()
+    // if (!StringUtils.isNotEmpty(userID)) {
+    //   this.getData()
+    // }
   }
 
   onAutoRefresh(changedPropertyName: string) {

@@ -115,13 +115,6 @@ export struct SearchResultComponent {
             ListItem() {
               Column() {
                 CardParser({compDTO:new CompDTO,contentDTO:item})
-                if (index != this.data.totalCount() - 1) {
-                  Divider()
-                    .width('100%')
-                    .height(`${this.calcHeight(1)}lpx`)
-                    .color($r('app.color.color_F5F5F5'))
-                    .strokeWidth(`${this.calcHeight(1)}lpx`)
-                }
               }
             }
           })

@@ -310,18 +310,8 @@ export struct SearchResultContentComponent {
                     Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
                   }
                 } else {
-                  if (this.data?.get(index + 1)?.sameContentListSize > 0 && index !== 0) {
-                    Divider()
-                      .width('100%')
-                      .color($r('app.color.color_F5F5F5'))
-                      .strokeWidth(4)
-                  }
                   CardParser({ compDTO: new CompDTO, contentDTO: item })
                 }
-                if (index != this.data.totalCount() - 1) {
-                  Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
-
-                }
               }
             }
           }, (item: ContentDTO, index: number) => index.toString())

@@ -41,6 +41,11 @@ const TAG = 'OperRowListView';
  })
  */
 
+interface newsInfo {
+  currentStatus: number | string | undefined,
+  url: string
+}
+
 @Preview
 @Component
 export struct OperRowListView {
@@ -103,6 +108,7 @@ export struct OperRowListView {
     // console.info(TAG, 'this.needLike', this.needLike)
     this.handleStyle()
     this.onDetailUpdated()
+
     EmitterUtils.receiveEvent(EmitterEventId.AUDIO_CHANGE_STATUS, (val: number | string | undefined) => {
       // console.log(TAG, 'this.currentStatus', val)
       this.currentStatus = val
@@ -187,6 +193,25 @@ export struct OperRowListView {
       this.audioTitle = this.contentDetailData.newsTitle || ''
       // console.log(TAG, 'this.audioUrl+++', this.audioUrl)
       // console.log(TAG, 'this.audioTitle+++', this.audioTitle)
+      const newsInfo = this.AudioSuspension.newsInfo();
+      // console.log(TAG, 'newsInfo', newsInfo)
+      if (newsInfo) {
+        try {
+          const parsedInfo: newsInfo = JSON.parse(newsInfo);
+          const url = parsedInfo.url;
+
+          // console.log(TAG, 'url', url)
+          // console.log(TAG, 'this.audioUrl', this.audioUrl)
+
+          if (url == this.audioUrl) {
+            this.currentStatus = parsedInfo.currentStatus
+          }
+        } catch (error) {
+          console.error(`${TAG} Error parsing newsInfo:`, error);
+        }
+      } else {
+        console.log(`${TAG} No newsInfo available`);
+      }
     }
     // 2：竖屏直播页 3：图集 4：横屏直播页
     if(this.pageComponentType == 2 || this.pageComponentType == 4) {
@@ -475,10 +500,10 @@ export struct OperRowListView {
           }
         ]
       }
-      console.info(TAG, '查询用户对作品收藏1', JSON.stringify(params))
+      // console.info(TAG, '查询用户对作品收藏1', JSON.stringify(params))
       // console.info(TAG, '查询用户对作品收藏11', JSON.stringify(params))
       let data = await MultiPictureDetailViewModel.getInteractDataStatus(params)
-      console.info(TAG, '查询用户对作品收藏22', JSON.stringify(data))
+      // console.info(TAG, '查询用户对作品收藏22', JSON.stringify(data))
       this.newsStatusOfUser = data[0];
     } catch (exception) {
       // console.error(TAG, JSON.stringify(exception))
@@ -491,9 +516,9 @@ export struct OperRowListView {
   async toggleCollectStatus() {
     // 未登录，跳转登录
     const user_id = await SPHelper.default.get(SpConstants.USER_ID, '')
-    console.log(TAG, '收藏点击，登录', user_id)
+    // console.log(TAG, '收藏点击，登录', user_id)
     if (!user_id) {
-      console.log(TAG, '收藏点击，用户未登录')
+      // console.log(TAG, '收藏点击，用户未登录')
       if (this.dialogBeforeJumpOtherPageAction) { this.dialogBeforeJumpOtherPageAction() }
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       return
@@ -524,7 +549,7 @@ export struct OperRowListView {
       }
     }
 
-    console.log(TAG, '收藏点击', JSON.stringify(params))
+    // console.log(TAG, '收藏点击', JSON.stringify(params))
     PageRepository.postExecuteCollectRecord(params).then(res => {
       if (this.newsStatusOfUser && res.code == 0) {
         this.newsStatusOfUser.collectStatus = this.newsStatusOfUser?.collectStatus === 1 ? 0 : 1
@@ -536,7 +561,7 @@ export struct OperRowListView {
         }
         this.queryContentInteractCount()
       }
-      console.log(TAG, '收藏点击 this.newsStatusOfUser', JSON.stringify(this.newsStatusOfUser))
+      // console.log(TAG, '收藏点击 this.newsStatusOfUser', JSON.stringify(this.newsStatusOfUser))
     }).catch((error:Error) =>{
       ToastUtils.showToast(error.message, 1000);
     })
@@ -553,9 +578,9 @@ export struct OperRowListView {
         contentType: this.contentDetailData?.newsType,
       }]
     }
-    console.log(TAG, '查询点赞、收藏数量', JSON.stringify(params))
+    // console.log(TAG, '查询点赞、收藏数量', JSON.stringify(params))
     PageRepository.getContentInteract(params).then(res => {
-      console.log(TAG, '查询点赞、收藏数量 res', JSON.stringify(res))
+      // console.log(TAG, '查询点赞、收藏数量 res', JSON.stringify(res))
       if (res.data) {
         this.interactData.likeNum = NumberFormatterUtils.formatNumberWithWan(res.data[0]?.likeNum)
         this.interactData.collectNum = NumberFormatterUtils.formatNumberWithWan(res.data[0]?.collectNum)

@@ -13,7 +13,6 @@ export class AudioSuspensionModel {
   public playerController: SubscribedAbstractProperty<WDPlayerController> =  AppStorage.link<WDPlayerController>('playerController')
   public floatWindowClass: SubscribedAbstractProperty<window.Window> =  AppStorage.link<window.Window>('floatWindowClass')
   public srcTitle: string = ''
-  private url: string = ''
   // 窗口是否最小化
   private isMinimize: SubscribedAbstractProperty<boolean> = AppStorage.link<boolean>('isMinimize')
   constructor() {
@@ -40,8 +39,7 @@ export class AudioSuspensionModel {
    * 配置音频地址
    */
   public async setPlayerUrl(url: string, srcTitle: string, srcContentId?: string, srcSource?: string) {
-    /*console.log(TAG,'this.url', this.url)
-    console.log(TAG,'url', url)*/
+    // console.log(TAG,'url', url)
     this.playerController.get().keepOnBackground = true
     BackgroundAudioController.sharedController().avplayerController = this.playerController.get()
     await BackgroundAudioController.sharedController().createSession()
@@ -50,7 +48,7 @@ export class AudioSuspensionModel {
     await BackgroundAudioController.sharedController().setSessionMetaData(srcContentId ?? "", srcTitle, $r("app.media.system_audio_icon_bk_center"), srcSource ?? "")
     BackgroundAudioController.sharedController().stopUseFeatures()
 
-    if (this.url === url) {
+    if (this.playerController.get().getUrl() === url) {
       this.isMinimize = AppStorage.link<boolean>('isMinimize')
       // console.log(TAG, 'this.isMinimize', this.isMinimize?.get())
       if (this.isMinimize?.get()) {
@@ -61,7 +59,6 @@ export class AudioSuspensionModel {
         this.playerController.get().switchPlayOrPause()
       }
     } else {
-      this.url = url
       this.playerController.get().firstPlay(url)
       this.playerController.get().onCanplay = () => {
         this.playerController.get().play()
@@ -120,6 +117,16 @@ export class AudioSuspensionModel {
       // console.info(TAG, 'Succeeded in minimizing the window.');
     });
   }
+  // 获取当前播放状态 newsId作为参数
+  public newsInfo() {
+    const currentStatus = this.playerController.get().getStatus()
+    const url = this.playerController.get().getUrl()
+    return JSON.stringify({ currentStatus, url })
+  }
+
+  public switchPlayOrPause() {
+    this.playerController.get().switchPlayOrPause()
+  }
 
 
 

@@ -89,7 +89,7 @@ export class PageHelper {
       pageModel.displayPageInfoMd5 = pageInfo.md5
       //解析页面挂角广告资源
       pageAdvModel.analysisAdvSource(pageInfo);
-      this.parseGroup(pageModel, true)
+      this.parseGroup(pageModel, true, true)
     })
   }
 
@@ -110,7 +110,7 @@ export class PageHelper {
   }
 
   async getPageInfo(pageModel: PageModel, pageAdvModel: PageAdModel) {
-    let cacheIsSame = false;
+    let adHasChanged = false;
     pageModel.currentPage = 1;
     pageModel.loadImg = await onlyWifiLoadImg();
     if (pageModel.pageType == 1) {
@@ -142,7 +142,7 @@ export class PageHelper {
         if (pageInfo.md5 == pageModel.displayPageInfoMd5) {
           // 缓存一致，不解析
         //  Logger.debug(TAG, 'getPageInfo 与缓存一致，不解析广告。。。')
-          cacheIsSame = true;
+          adHasChanged = true;
         } else {
         //  Logger.debug(TAG, 'getPageInfo 要解析广告')
           if (pageModel.currentPage == 1) {
@@ -152,10 +152,10 @@ export class PageHelper {
           pageModel.displayPageInfoMd5 = pageInfo.md5
           //解析页面挂角广告资源
           pageAdvModel.analysisAdvSource(pageInfo);
-          cacheIsSame = false;
+          adHasChanged = false;
         }
        // Logger.debug(TAG, 'getPageInfo go on')
-        this.parseGroup(pageModel, cacheIsSame)
+        this.parseGroup(pageModel, false, adHasChanged)
       }).catch((err:Error) => {
         this.refreshUIEnd(pageModel, false)
         if (this.isPageLoaded(pageModel)) {
@@ -178,7 +178,7 @@ export class PageHelper {
    * 解析信息流页面楼层数据
    * @param pageModel
    */
-  async parseGroup(pageModel: PageModel, isCache: boolean) {
+  async parseGroup(pageModel: PageModel, isCache: boolean, adHasChagned: boolean) {
     let pageInfo: PageInfoDTO = pageModel.pageInfo
     pageModel.groupList = []
     pageInfo.pageAdList = []
@@ -200,7 +200,7 @@ export class PageHelper {
       if (isCache) {
         pageDto = await PageViewModel.getPageGroupCacheData(pageModel.bizCopy()) as PageDTO
         pageModel.displayGroupInfoMd5 = pageDto.md5
-        pageModel.currentPage = 2
+        // pageModel.currentPage = 2
       } else {
         pageDto = await PageViewModel.getPageGroupCompData(pageModel.bizCopy()) as PageDTO
         //增加楼层数据异常判断条件

@@ -141,9 +141,9 @@ export struct TopPlayComponent {
       this.isHideLoading = false
     } else {
       this.isWait = this.contentDetailData?.liveInfo?.liveState == 'wait'
-      if (this.isWait) {
-        this.isHideLoading = true
-      }
+      // if (this.isWait) {
+      //   this.isHideLoading = true
+      // }
     }
 
     this.isEnd = this.contentDetailData?.liveInfo?.liveState === 'end' &&
@@ -269,6 +269,14 @@ export struct TopPlayComponent {
           Visibility.None)//  .contrast(this.isEnd ? 0.4 : 1)
           .blur(this.isEnd ? 20 : 0)
           .width('100%')
+          .onComplete(event=>{
+            if (event?.loadingStatus == 1) {
+                this.isHideLoading = true
+            }
+          })
+          .onError(()=>{
+            this.isHideLoading = true
+          })
 
 
         if (this.liveDetailPageLogic.showPad) {

@@ -243,8 +243,10 @@ export struct PlayerTitleView {
             .fontWeight(400)
             .fontFamily('PingFang SC-Regular')
             .onClick(() => {
-              this.isOpenDetail = true
-              this.dialogController?.open()
+              if (this.isOverLines) {
+                this.isOpenDetail = true
+                this.dialogController?.open()
+              }
             })
           if (this.isOverLines) {
             Span('...    全文')

@@ -430,6 +430,10 @@ export class WDPlayerController {
     return this.status;
   }
 
+  getUrl() {
+    return this.url
+  }
+
   getPlayer() {
     return this.avPlayer;
   }

+import AbilityStage from '@ohos.app.ability.AbilityStage';
+import AbilityConstant from '@ohos.app.ability.AbilityConstant';
+import Want from '@ohos.app.ability.Want';
+import { Configuration } from '@ohos.app.ability.Configuration';
+import { SPHelper, UmengStats } from 'wdKit';
+
+export default class MyAbilityStage extends AbilityStage {
+
+  onCreate() {
+
+    UmengStats.preInit(this.context)
+
+    // KV存储
+    SPHelper.init(this.context);
+
+    if (SPHelper.default.getSync('isPrivacy', true)) {
+      // 同意隐私协议，这里直接初始化。TODO 耗时梳理
+      UmengStats.initAfterAgreeProtocol()
+    }
+  }
+
+  onAcceptWant(want: Want): string {
+    return ""
+  }
+
+  onConfigurationUpdate(newConfig: Configuration): void {
+
+  }
+  onMemoryLevel(level: AbilityConstant.MemoryLevel): void {
+
+  }
+
+  onDestroy(): void {
+
+  }
+
+}
\ No newline at end of file

@@ -87,8 +87,11 @@ export struct VideoChannelPage {
     if (item.channelStyle === 1) {
       return this.currentTopNavSelectedIndex === index ? Color.White : this.tabSelectedColor(false)
     } else {
-      return this.tabSelectedColor(this.currentTopNavSelectedIndex ===
-        index)
+      // 如果当前时沉浸式，其他TAB全部设置 白色50%
+      if (this.isImmerseChannel() && this.currentTopNavSelectedIndex != index) {
+        return "#50FFFFFF"
+      }
+      return this.tabSelectedColor(this.currentTopNavSelectedIndex === index)
     }
   }
 

@@ -193,7 +193,7 @@ export class StartupManager {
   }
 
   private preInitUmentStat() {
-    UmengStats.preInit(this.context!)
+    // UmengStats.preInit(this.context!)
   }
   private initUmengStat() {
     Logger.debug(TAG, "App 友盟统计 初始化")

@@ -4,6 +4,7 @@
     "type": "entry",
     "description": "$string:module_desc",
     "mainElement": "EntryAbility",
+    "srcEntry": "./ets/entryability/EntryAbilityStage.ets",
     "deviceTypes": [
       "phone",
       //      "tablet",