Merge remote-tracking branch 'origin/master'

entry/src/main/ets/pages/NewIndex.ets

@@ -231,7 +231,7 @@ struct NewIndex{
               .visibility(this.isCoverOpacity()?Visibility.None:Visibility.Visible)
               .height(180)
             Blank()
-              .backgroundColor($r('app.color.title_bar_bg'))
+              .backgroundColor(this.themeColor)
               .visibility(this.isCoverOpacity()?Visibility.Visible:Visibility.None)
               .width('100%')
               .height(55)

entry/src/main/ets/pages/SettingPage.ets

@@ -829,8 +829,7 @@ export struct SettingPage {
             .height(55)
 
             Line().width('100%').height(0.3).backgroundColor($r('app.color.index_tab_unselected_font_color'))
-              .visibility(Visibility.None)
-            // 默认排序模式
+            // 保存播放模式
             Row() {
               Text('保存播放模式')
                 .margin({ left: 18 })
@@ -945,7 +944,7 @@ export struct SettingPage {
               this.apiDialogController.open()
             })
             .height(55)
-
+            Line().width('100%').height(0.3).backgroundColor($r('app.color.index_tab_unselected_font_color'))
             // 封面API
             Button({ type: ButtonType.Normal, stateEffect: true }) {
               Row() {

entry/src/main/ets/view/LocalMusic.ets

@@ -4870,13 +4870,16 @@ export struct LocalMusic {
 
   //是不是手机横屏
   isPhoneLan() {
+    LogUtil.info(' isPhoneLan this.currentBreakpoint = '+ this.currentBreakpoint )
+    LogUtil.info(' isPhoneLan DisplayUtil.getFoldStatus() = '+ DisplayUtil.getFoldStatus() )
     if (DeviceUtil.getDeviceType() === resourceManager.DeviceType.DEVICE_TYPE_PHONE
       && this.currentBreakpoint !== BreakpointTypeEnum.SM) {
       if (DisplayUtil.getFoldStatus() === 0 ) {
+        LogUtil.info(' isPhoneLan 是横屏' )
         return true
       }
     }
-
+    LogUtil.info(' isPhoneLan 不是横屏' )
     return false
   }
 

lib/src/main/ets/view/LyricView2.ets

@@ -309,7 +309,7 @@ export struct LyricView2 {
             })
         }
         .justifyContent(this.alignMode === 'center' ? FlexAlign.Center : FlexAlign.Start)
-        .width(this.alignMode == 'center' ? '100%' : '95%')
+        .width(this.alignMode == 'center' ? '100%' :index == this.currentIndex ?'95%': '85%')
     }