fix:17156 功能缺陷-【uat】点击栏目订阅，弹出栏目订阅弹窗，动画和android不一致，看视频

@@ -13,8 +13,20 @@ const LOCAL_CHANNEL: string = '地方频道'
 
 
 const TAG: string = 'ChannelSubscriptionLayout'
 const TAG: string = 'ChannelSubscriptionLayout'
 
 
-@CustomDialog
-struct ChannelDialog {
+// @Entry
+@Component
+struct ChannelSubscriptionLayout {
+  @State indexSettingArray: string [] = ['推荐', '热点']
+  //当前选中的频道
+  @Link currentTopNavSelectedIndex: number;
+  @Prop homeChannelList: TopNavDTO []
+  @Prop indexSettingChannelId: number
+  @Link myChannelList: TopNavDTO []
+  @Link moreChannelList: TopNavDTO []
+  @Link localChannelList: TopNavDTO []
+  @Link channelIds: number []
+  @StorageLink('channelIds') storeChannelIds: string = ''
+  @State isShow: boolean = false
   @State dragItem: number = -1
   @State dragItem: number = -1
   private dragRefOffsetX: number = 0
   private dragRefOffsetX: number = 0
   private dragRefOffsetY: number = 0
   private dragRefOffsetY: number = 0
@@ -25,26 +37,40 @@ struct ChannelDialog {
   @State indexSettingTabIndex: number = 0
   @State indexSettingTabIndex: number = 0
   @State isEditIng: boolean = false
   @State isEditIng: boolean = false
   @State currentTopNavSelectedItem: TopNavDTO = {} as TopNavDTO
   @State currentTopNavSelectedItem: TopNavDTO = {} as TopNavDTO
-  @Link currentTopNavSelectedIndex: number
-  @Link myChannelList: TopNavDTO[]
-  @Link moreChannelList: TopNavDTO[]
-  @Link localChannelList: TopNavDTO[]
-  @Link homeChannelList: TopNavDTO[]
-  @Link indexSettingChannelId: number
-  controller?: CustomDialogController
-  confirm: (index: number) => void = () => {
-  }
-  changeChannelIndex: (index1: number, index2: number) => void = () => {
-  }
-  delChannelItem: (index: number) => void = () => {
-  }
-  addChannelItem: (item: TopNavDTO) => void = () => {
+  changeTab: (index: number) => void = () => {
   }
   }
 
 
   aboutToAppear() {
   aboutToAppear() {
     this.currentTopNavSelectedItem = this.myChannelList[this.currentTopNavSelectedIndex]
     this.currentTopNavSelectedItem = this.myChannelList[this.currentTopNavSelectedIndex]
   }
   }
 
 
+  //交换我的频道数组中的位置
+  changeChannelIndex(index1: number, index2: number) {
+    let tmp = this.myChannelList.splice(index1, 1)
+    let channelIdTmp = this.channelIds.splice(index1, 1)
+    this.myChannelList.splice(index2, 0, tmp[0])
+    this.channelIds.splice(index2, 0, channelIdTmp[0])
+    this.storeChannelIds = this.channelIds.join(',')
+  }
+  //删除频道
+  delChannelItem(index: number){
+    let item = this.myChannelList.splice(index, 1)[0]
+    this.channelIds.splice(index, 1)
+    this.storeChannelIds = this.channelIds.join(',')
+    if (item.moreChannel === '1') {
+      this.moreChannelList.unshift(item)
+    }
+    if (item.localChannel === '1') {
+      this.localChannelList.unshift(item)
+    }
+  }
+  // 添加频道
+  addChannelItem(item: TopNavDTO){
+    this.channelIds.push(item.channelId)
+    this.myChannelList.push(item)
+    this.storeChannelIds = this.channelIds.join(',')
+  }
+
   itemMove(index: number, newIndex: number): void {
   itemMove(index: number, newIndex: number): void {
     let targetItem = this.myChannelList[newIndex]
     let targetItem = this.myChannelList[newIndex]
     if (!(targetItem?.headlinesOn === 1 || targetItem?.movePermitted === 0 || targetItem?.homeChannel === '1')) {
     if (!(targetItem?.headlinesOn === 1 || targetItem?.movePermitted === 0 || targetItem?.homeChannel === '1')) {
@@ -176,7 +202,8 @@ struct ChannelDialog {
     }
     }
   }
   }
 
 
-  build() {
+  @Builder
+  sheetBuilder() {
     Column() {
     Column() {
       Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
       Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
         Image($r('app.media.icon_ren_min_ri_bao'))
         Image($r('app.media.icon_ren_min_ri_bao'))
@@ -185,7 +212,7 @@ struct ChannelDialog {
         Image($r('app.media.close_button'))
         Image($r('app.media.close_button'))
           .width(24)
           .width(24)
           .onClick(() => {
           .onClick(() => {
-            this.controller?.close()
+            this.isShow = false
           })
           })
       }
       }
       .width('100%')
       .width('100%')
@@ -310,8 +337,8 @@ struct ChannelDialog {
                           this.delChannelItem(index)
                           this.delChannelItem(index)
                         }
                         }
                       } else {
                       } else {
-                        this.confirm(index)
-                        this.controller?.close()
+                        this.changeTab(index)
+                        this.isShow = false
                       }
                       }
                     }),
                     }),
                   LongPressGesture({ repeat: true })
                   LongPressGesture({ repeat: true })
@@ -464,73 +491,6 @@ struct ChannelDialog {
     })
     })
     .backgroundColor('#ffffff')
     .backgroundColor('#ffffff')
   }
   }
-}
-
-// @Entry
-@Component
-struct ChannelSubscriptionLayout {
-  @State indexSettingArray: string [] = ['推荐', '热点']
-  //当前选中的频道
-  @Link currentTopNavSelectedIndex: number;
-  @Prop homeChannelList: TopNavDTO []
-  @Prop indexSettingChannelId: number
-  @Link myChannelList: TopNavDTO []
-  @Link moreChannelList: TopNavDTO []
-  @Link localChannelList: TopNavDTO []
-  @Link channelIds: number []
-  @StorageLink('channelIds') storeChannelIds: string = ''
-  changeTab: (index: number) => void = () => {
-  }
-  //频道弹窗点击切换频道
-  onAccept = (index: number) => {
-    this.changeTab(index)
-  }
-  //交换我的频道数组中的位置
-  changeChannelIndex = (index1: number, index2: number) => {
-    let tmp = this.myChannelList.splice(index1, 1)
-    let channelIdTmp = this.channelIds.splice(index1, 1)
-    this.myChannelList.splice(index2, 0, tmp[0])
-    this.channelIds.splice(index2, 0, channelIdTmp[0])
-    this.storeChannelIds = this.channelIds.join(',')
-  }
-  //删除频道
-  delChannelItem = (index: number) => {
-    let item = this.myChannelList.splice(index, 1)[0]
-    this.channelIds.splice(index, 1)
-    this.storeChannelIds = this.channelIds.join(',')
-    if (item.moreChannel === '1') {
-      this.moreChannelList.unshift(item)
-    }
-    if (item.localChannel === '1') {
-      this.localChannelList.unshift(item)
-    }
-  }
-  // 添加频道
-  addChannelItem = (item: TopNavDTO) => {
-    this.channelIds.push(item.channelId)
-    this.myChannelList.push(item)
-    this.storeChannelIds = this.channelIds.join(',')
-  }
-  dialogController: CustomDialogController | null = new CustomDialogController({
-    builder: ChannelDialog({
-      currentTopNavSelectedIndex: $currentTopNavSelectedIndex,
-      indexSettingChannelId: $indexSettingChannelId,
-      homeChannelList: $homeChannelList,
-      myChannelList: $myChannelList,
-      moreChannelList: $moreChannelList,
-      localChannelList: $localChannelList,
-      confirm: this.onAccept,
-      changeChannelIndex: this.changeChannelIndex,
-      delChannelItem: this.delChannelItem,
-      addChannelItem: this.addChannelItem
-    }),
-    alignment: DialogAlignment.TopEnd,
-    customStyle: true,
-  })
-
-  aboutToDisappear() {
-    this.dialogController = null // 将dialogController置空
-  }
 
 
   build() {
   build() {
     Row() {
     Row() {
@@ -542,10 +502,9 @@ struct ChannelSubscriptionLayout {
     .justifyContent(FlexAlign.Center)
     .justifyContent(FlexAlign.Center)
     .backgroundColor(Color.White)
     .backgroundColor(Color.White)
     .onClick(() => {
     .onClick(() => {
-      if (this.dialogController != null) {
-        this.dialogController.open()
-      }
+      this.isShow = true
     })
     })
+    .bindContentCover(this.isShow, this.sheetBuilder())
   }
   }
 }
 }