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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix: 17931 UI还原问题-【uat】地区精选卡，上下两条线比android细
  fix(默认提示语)： 跳转失败默认提示语
  fix(18961)： 必修--时间轴专题下含有不支持的音频节目未能给出对应提示信息
  fix: 18073 UI还原问题-【uat】进入直播频道-直播大图卡直播动图没有显示
  fix(18173)： 功能缺陷-【uat】进入直播结束视频详情页，android显示已结束，鸿蒙显示回看
  音频悬浮窗关闭图标替换

@@ -222,6 +222,7 @@ export class ProcessUtils {
         ProcessUtils.gotoThemeListPage(content)
         ProcessUtils.gotoThemeListPage(content)
         break;
         break;
       default:
       default:
+        ToastUtils.shortToast('敬请期待')
         break;
         break;
     }
     }
   }
   }
@@ -423,20 +424,22 @@ export class ProcessUtils {
     Logger.debug(TAG, `gotoLive, ${content.objectId}`);
     Logger.debug(TAG, `gotoLive, ${content.objectId}`);
   }
   }
 
 
+  //音频详情页
   public static gotoAudio(content: ContentDTO) {
   public static gotoAudio(content: ContentDTO) {
-    let taskAction: Action = {
-      type: 'JUMP_DETAIL_PAGE',
-      params: {
-        detailPageType: 13,
-        contentID: content?.objectId,
-        extra: {
-          relType: content?.relType,
-          relId: content?.relId,
-        } as ExtraDTO,
-        targetLayout: content.customParamTargetLayout
-      } as Params,
-    };
-    WDRouterRule.jumpWithAction(taskAction)
+    ToastUtils.shortToast('该音频类型暂不支持')
+    // let taskAction: Action = {
+    //   type: 'JUMP_DETAIL_PAGE',
+    //   params: {
+    //     detailPageType: 13,
+    //     contentID: content?.objectId,
+    //     extra: {
+    //       relType: content?.relType,
+    //       relId: content?.relId,
+    //     } as ExtraDTO,
+    //     targetLayout: content.customParamTargetLayout
+    //   } as Params,
+    // };
+    // WDRouterRule.jumpWithAction(taskAction)
     Logger.debug(TAG, `gotoAudio, ${content.objectId}`);
     Logger.debug(TAG, `gotoAudio, ${content.objectId}`);
   }
   }
 
 

@@ -217,7 +217,7 @@ export struct CompParser {
         } else {
         } else {
           Divider().strokeWidth(5).color('#f5f5f5')
           Divider().strokeWidth(5).color('#f5f5f5')
         }
         }
-      } else if (this.compDTO.compType === 'appStyle') {
+      } else if (this.compDTO.compType === 'appStyle' || this.compDTO.compStyle === CompStyle.Zh_Single_Row_01) {
         if (
         if (
           this.nextCompDTO.compStyle === CompStyle.Card_09 ||
           this.nextCompDTO.compStyle === CompStyle.Card_09 ||
             this.nextCompDTO?.operDataList?.[0]?.appStyle === CompStyle.Card_10 ||
             this.nextCompDTO?.operDataList?.[0]?.appStyle === CompStyle.Card_10 ||

@@ -71,8 +71,8 @@ export struct LottieView {
           this.onDestroyAnimation()
           this.onDestroyAnimation()
         })
         })
         .onAppear(()=>{
         .onAppear(()=>{
-        this.loadAnimation();
-      })
+          this.loadAnimation();
+        })
 
 
     }
     }
   }
   }

@@ -130,7 +130,8 @@ export default struct CustomLayout {
       this.animate2()
       this.animate2()
     } else {
     } else {
       // 刷新完成
       // 刷新完成
-      lottie.destroy()
+      !!this.animateItem && lottie.destroy(this.animateName)
+      !!this.animateItem2 && lottie.destroy(this.animateName2)
     }
     }
     let maxH = CustomLayout.REFRESH_HEIGHT
     let maxH = CustomLayout.REFRESH_HEIGHT
     let tmpHeight = this.refreshBean.offset > maxH ? maxH : this.refreshBean.offset
     let tmpHeight = this.refreshBean.offset > maxH ? maxH : this.refreshBean.offset

@@ -250,7 +250,7 @@ export struct PlayUIComponent {
     //回看
     //回看
     else if (this.contentDetailData.liveInfo?.liveState == 'end') {
     else if (this.contentDetailData.liveInfo?.liveState == 'end') {
       Row() {
       Row() {
-        Text('回看')
+        Text(StringUtils.isEmpty(this.liveUrl)?'已结束':'回看')
           .fontSize('11vp')
           .fontSize('11vp')
           .fontWeight(400)
           .fontWeight(400)
           .fontColor(Color.White)
           .fontColor(Color.White)

@@ -168,8 +168,8 @@ struct Index {
                 }))
                 }))
           Image($r("app.media.icon_audio_close"))
           Image($r("app.media.icon_audio_close"))
             .objectFit(ImageFit.Contain)
             .objectFit(ImageFit.Contain)
-            .width(24)
-            .height(24)
+            .width(32)
+            .height(32)
             .gesture(
             .gesture(
               TapGesture()
               TapGesture()
                 .onAction((event: GestureEvent) => {
                 .onAction((event: GestureEvent) => {