Merge remote-tracking branch 'origin/main'

@@ -40,7 +40,7 @@ struct ChannelSubscriptionLayout {
 
   aboutToAppear() {
     this.currentTopNavSelectedItem = this.myChannelList[this.currentTopNavSelectedIndex]
-    this.myChannelList.forEach(item=>{
+    this.myChannelList.forEach(item => {
       this.channelIds.push(item.channelId)
     })
   }
@@ -53,8 +53,9 @@ struct ChannelSubscriptionLayout {
     this.channelIds.splice(index2, 0, channelIdTmp[0])
     AppStorage.setOrCreate('channelIds', this.channelIds.join(','))
   }
+
   //删除频道
-  delChannelItem(index: number){
+  delChannelItem(index: number) {
     let item = this.myChannelList.splice(index, 1)[0]
     this.channelIds.splice(index, 1)
     AppStorage.setOrCreate('channelIds', JSON.stringify(this.channelIds))
@@ -65,8 +66,9 @@ struct ChannelSubscriptionLayout {
       this.localChannelList.unshift(item)
     }
   }
+
   // 添加频道
-  addChannelItem(item: TopNavDTO){
+  addChannelItem(item: TopNavDTO) {
     this.channelIds.push(item.channelId)
     this.myChannelList.push(item)
     AppStorage.setOrCreate('channelIds', this.channelIds.join(','))
@@ -323,9 +325,10 @@ struct ChannelSubscriptionLayout {
               }
               .width('23%')
               .height(40)
+              .borderRadius(3)
               .border({
-                width: item.headlinesOn === 1 || item.movePermitted === 0 ? 0 : 1,
-                color: '#EDEDED',
+                width: 0.7,
+                color: item.headlinesOn === 1 || item.movePermitted === 0 ? '#F5F5F5' : '#EDEDED',
                 radius: 3
               })
               .zIndex(this.dragItem == item.num ? 1 : 0)
@@ -427,8 +430,9 @@ struct ChannelSubscriptionLayout {
                 .width(80)
                 .height(40)
                 .border({
-                  width: 1,
-                  color: '#EDEDED'
+                  width: 0.7,
+                  color: '#EDEDED',
+                  radius: 3
                 })
               }, (item: TopNavDTO) => JSON.stringify(item))
             }
@@ -471,8 +475,9 @@ struct ChannelSubscriptionLayout {
                 .width(80)
                 .height(40)
                 .border({
-                  width: 1,
-                  color: '#EDEDED'
+                  width: 0.7,
+                  color: '#EDEDED',
+                  radius: 3
                 })
               }, (item: TopNavDTO) => JSON.stringify(item))
             }

@@ -203,7 +203,6 @@ export struct TopNavigationComponentNew {
         moreChannelList: $moreChannelList,
         localChannelList: $localChannelList,
         changeTab: (index) => {
-
           this.changePage(index)
         }
       })

@@ -125,7 +125,6 @@ export struct TopPlayComponent {
         } else {
           Logger.debug(TAG, `---0------>${playUrl}`)
           if (StringUtils.isNotEmpty(playUrl)) {
-            Logger.debug(TAG, `---isNotEmpty------>`)
             this.playUrl = playUrl
             this.tryToPlay()
           }
@@ -152,8 +151,8 @@ export struct TopPlayComponent {
         this.previewUrl = ''
       }
     }
-    Logger.debug(TAG,
-      `---0------>` + this.isWait + '   ->' + this.isHideLoading + '   ->' + this.isEnd + ' -->' + this.isVideoSource)
+    // Logger.debug(TAG,
+    //   `---0------>` + this.isWait + '   ->' + this.isHideLoading + '   ->' + this.isEnd + ' -->' + this.isVideoSource)
   }
 
   tryToPlay() {