Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool into main

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix:1）修改我的首次删除弹框和清理缓存弹框按钮颜色
  fix: 18424 UI还原问题-【生产环境】视频频道向上滑动，视频内容会一闪一闪，亮晶晶
  feat:1）内链 页面，添加距顶部距底部间距
  feat:1）公共跳转地方添加频道跳转功能

@@ -38,6 +38,10 @@ export class ContentConstants {
    */
    */
   static readonly TYPE_NINE: string = "9";
   static readonly TYPE_NINE: string = "9";
   /**
   /**
+   * 11:频道跳转
+   */
+  static readonly TYPE_CHANNEL: string = "11";
+  /**
    * 13:音频详情
    * 13:音频详情
    */
    */
   static readonly TYPE_AUDIO: string = "13";
   static readonly TYPE_AUDIO: string = "13";

@@ -134,6 +134,10 @@ export class ProcessUtils {
       // 专题详情，跳转h5
       // 专题详情，跳转h5
         ProcessUtils.gotoSpecialTopic(content);
         ProcessUtils.gotoSpecialTopic(content);
         break;
         break;
+      case ContentConstants.TYPE_CHANNEL:
+      // 频道跳转
+        HomeChannelUtils.jumpChannelTab(content.objectId, content.pageId, content.newsTitle)
+        break;
     //动态详情页（动态图文）
     //动态详情页（动态图文）
       case ContentConstants.TYPE_FOURTEEN:
       case ContentConstants.TYPE_FOURTEEN:
         ProcessUtils.gotoDynamicDetailPage(content);
         ProcessUtils.gotoDynamicDetailPage(content);

@@ -104,7 +104,7 @@ export class ContentDTO implements BaseDTO {
   //底部导航栏 id（用于频道跳转）
   //底部导航栏 id（用于频道跳转）
   bottomNavId: string = '';
   bottomNavId: string = '';
   // 链接类型： 0：无链接；1：内链（文章）；2：外链
   // 链接类型： 0：无链接；1：内链（文章）；2：外链
-  openType: string = '';
+  openType: string = '1';
   extra: string = ''
   extra: string = ''
   sameContentList:ContentDTO[] = []
   sameContentList:ContentDTO[] = []
   sameContentListJson:string = ""
   sameContentListJson:string = ""

@@ -47,7 +47,7 @@ struct MyCollectionListPage {
       },
       },
       title:this.isAllSelect?'是否确认清空?':'确认删除'+this.deleteNum.toString()+'条收藏',
       title:this.isAllSelect?'是否确认清空?':'确认删除'+this.deleteNum.toString()+'条收藏',
       tipShow: false ,
       tipShow: false ,
-      leftTextColor:$r('app.color.color_648DF2'),
+      leftTextColor:$r('app.color.color_333333')
     }),
     }),
     autoCancel: true,
     autoCancel: true,
     alignment: DialogAlignment.Center,
     alignment: DialogAlignment.Center,

@@ -49,7 +49,7 @@ export struct MineSettingComponent {
       title: "清理缓存",
       title: "清理缓存",
       tipValue:"是否确认清理此App的缓存",
       tipValue:"是否确认清理此App的缓存",
       tipShow:true,
       tipShow:true,
-      leftTextColor:$r('app.color.color_648DF2')
+      leftTextColor:$r('app.color.color_333333')
     }),
     }),
     autoCancel: true,
     autoCancel: true,
     alignment: DialogAlignment.Center,
     alignment: DialogAlignment.Center,

@@ -68,7 +68,9 @@ export struct DetailPlayShortVideoPage {
       this.queryNewsInfoOfUser()
       this.queryNewsInfoOfUser()
       if (this.switchVideoStatus && this.isPlay && this.onlyWifiLoadVideo) {
       if (this.switchVideoStatus && this.isPlay && this.onlyWifiLoadVideo) {
         await this.playerController.play()
         await this.playerController.play()
+        await this.playerController.startRenderFrame(() => {
           this.imageVisible = false
           this.imageVisible = false
+        })
       }
       }
     }
     }
   }
   }
@@ -81,7 +83,9 @@ export struct DetailPlayShortVideoPage {
     if (this.currentIndex === this.index) {
     if (this.currentIndex === this.index) {
       if (this.switchVideoStatus && this.isPlay && this.onlyWifiLoadVideo) {
       if (this.switchVideoStatus && this.isPlay && this.onlyWifiLoadVideo) {
         await this.playerController.play()
         await this.playerController.play()
+        await this.playerController.startRenderFrame(() => {
           this.imageVisible = false
           this.imageVisible = false
+        })
       } else {
       } else {
         this.playerController.pause()
         this.playerController.pause()
       }
       }
@@ -106,14 +110,18 @@ export struct DetailPlayShortVideoPage {
         this.playerController.onCanplay = async () => {
         this.playerController.onCanplay = async () => {
           this.ratio = this.playerController.videoWidth / this.playerController.videoHeight
           this.ratio = this.playerController.videoWidth / this.playerController.videoHeight
           await this.playerController.play()
           await this.playerController.play()
+          await this.playerController.startRenderFrame(() => {
             this.imageVisible = false
             this.imageVisible = false
+          })
         }
         }
       } else {
       } else {
         if (!this.onlyWifiLoadVideo) {
         if (!this.onlyWifiLoadVideo) {
           await this.playerController.pause()
           await this.playerController.pause()
         } else {
         } else {
           await this.playerController.play()
           await this.playerController.play()
+          await this.playerController.startRenderFrame(() => {
             this.imageVisible = false
             this.imageVisible = false
+          })
         }
         }
       }
       }
     }
     }
@@ -186,7 +194,9 @@ export struct DetailPlayShortVideoPage {
           await this.playerController.pause()
           await this.playerController.pause()
         } else {
         } else {
           await this.playerController.play()
           await this.playerController.play()
+          await this.playerController.startRenderFrame(() => {
             this.imageVisible = false
             this.imageVisible = false
+          })
         }
         }
       }
       }
     }
     }
@@ -363,8 +373,10 @@ export struct DetailPlayShortVideoPage {
           this.onlyWifiLoadVideo = true
           this.onlyWifiLoadVideo = true
           this.toastTextVisible = false
           this.toastTextVisible = false
           this.playerController?.play()
           this.playerController?.play()
+          this.playerController.startRenderFrame(() => {
             this.imageVisible = false
             this.imageVisible = false
           })
           })
+        })
       }
       }
       .width('100%')
       .width('100%')
       .height(64)
       .height(64)

@@ -250,6 +250,13 @@ export class WDPlayerController {
     this.avPlayer?.play();
     this.avPlayer?.play();
   }
   }
 
 
+  async startRenderFrame(cb: Function) {
+    this.avPlayer?.on('startRenderFrame', () => {
+      cb && cb();
+      console.info('startRenderFrame success')
+    })
+  }
+
   async stop() {
   async stop() {
     // if (this.avPlayer == null) {
     // if (this.avPlayer == null) {
     //   await this.initPromise;
     //   await this.initPromise;

@@ -9,6 +9,8 @@ const TAG = 'DefaultWebPage'
 @Entry
 @Entry
 @Component
 @Component
 struct DefaultWebPage {
 struct DefaultWebPage {
+  @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') as number;
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   webviewControl: BridgeWebViewControl = new BridgeWebViewControl()
   webviewControl: BridgeWebViewControl = new BridgeWebViewControl()
   scroller: Scroller = new Scroller();
   scroller: Scroller = new Scroller();
   action: Action = {} as Action
   action: Action = {} as Action
@@ -24,10 +26,10 @@ struct DefaultWebPage {
           isPageEnd: $isPageEnd
           isPageEnd: $isPageEnd
         })
         })
       }.layoutWeight(1)
       }.layoutWeight(1)
-        .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])
+
 
 
       Row() {
       Row() {
-        Button({type: ButtonType.Normal}) {
+        Button({ type: ButtonType.Normal }) {
           Image($r("app.media.back_icon_black"))
           Image($r("app.media.back_icon_black"))
             .width(20).height(25)
             .width(20).height(25)
         }.height(44).width(44)
         }.height(44).width(44)
@@ -35,13 +37,17 @@ struct DefaultWebPage {
         .onClick(() => {
         .onClick(() => {
           router.back()
           router.back()
         })
         })
+
         Blank()
         Blank()
       }.width("100%").height(44)
       }.width("100%").height(44)
       .alignItems(VerticalAlign.Center)
       .alignItems(VerticalAlign.Center)
       .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
       .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
     }
     }
     .width(CommonConstants.FULL_WIDTH)
     .width(CommonConstants.FULL_WIDTH)
-    .height(CommonConstants.FULL_HEIGHT)
+    .height(CommonConstants.FULL_HEIGHT).padding({
+      top: px2vp(this.topSafeHeight),
+      bottom: px2vp(this.bottomSafeHeight)
+    })
   }
   }
 
 
   aboutToAppear() {
   aboutToAppear() {