Merge remote-tracking branch 'origin/main'

@@ -81,7 +81,6 @@ export struct SubscribeMessageComponent{
           }
         })
           .width('100%')
-          .margin({bottom:px2vp(this.bottomSafeHeight)})
       }
     }
     .backgroundColor($r('app.color.color_F9F9F9'))
@@ -113,12 +112,12 @@ export struct SubscribeMessageComponent{
       if (!this.hasMore) {
         ListItem() {
           ListHasNoMoreDataUI()
-        }
+        }.padding({bottom:px2vp(this.bottomSafeHeight) + 10})
       }
     }.width('100%')
+    .edgeEffect(EdgeEffect.None)
     .height("100%")
     .scrollBar(BarState.Off)
-    .layoutWeight(1)
   }
 
   getNewPageData() {

@@ -52,9 +52,9 @@ class MineSettingDatasModel{
     this.mainSettingData.push(new MineMainSettingFunctionItem(null, 'wifi网络情况下自动播放视频', null, 1, videoState,"video_switch"))
      let suspensionState=SPHelper.default.getSync(SpConstants.SETTING_SUSPENSION_SWITCH,false) as boolean
     this.mainSettingData.push(new MineMainSettingFunctionItem(null, '开启播放器悬浮窗', null, 1, suspensionState,"suspensionState_switch"))
-    this.mainSettingData.push(new MineMainSettingFunctionItem(null, null, null, 2, null,""))
+    // this.mainSettingData.push(new MineMainSettingFunctionItem(null, null, null, 2, null,""))
     this.mainSettingData.push(new MineMainSettingFunctionItem(null, '清理缓存', '32MB', 0, false,"clear_cache"))
-    this.mainSettingData.push(new MineMainSettingFunctionItem(null, '评价我们', null, 0, false,""))
+    // this.mainSettingData.push(new MineMainSettingFunctionItem(null, '评价我们', null, 0, false,""))
 
     return this.mainSettingData
   }