build 724

江畔何人初见月
Moriafly · Apr 21, 2021 · 7f16e68 · 7f16e68
1 parent 2dd6e4c
commit 7f16e68
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 28 deletions.
diff --git a/UPDATE.md b/UPDATE.md
@@ -1,15 +1,13 @@
-皎皎空中孤月轮
+江畔何人初见月
 
 #### 新
 
-新增定时关闭（感谢 lbccccc 大佬）
-重新启动应用主页可以恢复到上次选择的页面
-
 #### 改
 
-流光效果下线
-修改一些文本
+提高浅色模式下播放界面亮度
+界面优化
 
 #### 修
 
-一些小问题的修复
+修复深色主题下定时关闭选中不可见问题
+修复播放歌单最后一首歌点击下一首跳转 FM 的问题
diff --git a/app/build.gradle b/app/build.gradle
@@ -29,8 +29,8 @@ android {
         applicationId "com.dirror.music"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 723
-        versionName "皎皎空中孤月轮"
+        versionCode 724
+        versionName "江畔何人初见月"
 
         multiDexEnabled true
 

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 723,
-      "versionName": "闂佹眹鍔屽ù宄扳枔閻樼數鐭氶弶鐐村閸橆剟鎮楀☉鏍э拷鏍э耿閿熶粙寮堕悜鍥ㄥ",
+      "versionCode": 724,
+      "versionName": "濠殿喖婀遍崰鎾诲疾鐟欏嫭濯撮柡鍥ㄧ閻粙鏌涢幒鎾剁畾妞ゎ偄妫濆鐢告晸閿燂拷",
       "outputFile": "app-release.apk"
     }
   ]

diff --git a/app/release/江畔何人初见月.apk b/app/release/江畔何人初见月.apk
diff --git a/app/src/main/java/com/dirror/music/service/MusicService.kt b/app/src/main/java/com/dirror/music/service/MusicService.kt
@@ -691,18 +691,20 @@ open class MusicService : BaseMediaService() {
         }
 
         override fun playNext() {
-            getPlayingSongData().value?.let {
-                val index = PlayQueue.currentQueue.value?.indexOf(it)
-                if (index == PlayQueue.currentQueue.value?.lastIndex) {
-                    PersonalFM.get({ list ->
-                        runOnMainThread {
-                            PlayQueue.setNormal(list)
-                            playMusic(list[0])
-                        }
-                    }, {
-                        toast("获取私人 FM 失败")
-                    })
-                    return
+            if (personFM.value == true) {
+                getPlayingSongData().value?.let {
+                    val index = PlayQueue.currentQueue.value?.indexOf(it)
+                    if (index == PlayQueue.currentQueue.value?.lastIndex) {
+                        PersonalFM.get({ list ->
+                            runOnMainThread {
+                                PlayQueue.setNormal(list)
+                                playMusic(list[0])
+                            }
+                        }, {
+                            toast("获取私人 FM 失败")
+                        })
+                        return
+                    }
                 }
             }
             PlayQueue.currentQueue.value?.next(songData.value)?.let {

diff --git a/app/src/main/res/drawable/ic_right.xml b/app/src/main/res/drawable/ic_right.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="@color/colorIconForeground"
       android:pathData="M998.62,171.24c-16.65,-15.62 -42.92,-14.87 -58.53,1.82L387.64,761.26l-301.78,-297.35c-16.32,-16.07 -42.54,-15.91 -58.62,0.41 -16.07,16.28 -15.87,42.54 0.46,58.58l332.02,327.09c0.12,0.12 0.29,0.17 0.41,0.29s0.17,0.29 0.29,0.41c2.61,2.49 5.76,3.89 8.78,5.55 1.49,0.87 2.78,2.15 4.35,2.78 4.89,1.91 10.07,2.9 15.2,2.9 5.43,0 10.85,-1.08 15.91,-3.23 1.7,-0.7 3.02,-2.15 4.6,-3.07 3.11,-1.82 6.34,-3.36 8.99,-6.05 0.12,-0.12 0.17,-0.33 0.29,-0.46 0.08,-0.12 0.25,-0.17 0.37,-0.29L1000.4,229.77c15.74,-16.61 14.87,-42.83 -1.78,-58.53z"/>
 </vector>
diff --git a/app/src/main/res/layout/activity_player.xml b/app/src/main/res/layout/activity_player.xml
@@ -23,6 +23,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scaleType="centerCrop"
+            android:alpha="0.72"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/recycler_song.xml b/app/src/main/res/layout/recycler_song.xml
@@ -32,7 +32,7 @@
         android:id="@+id/tvTitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
+        android:layout_marginStart="4dp"
         android:layout_marginTop="10dp"
         android:layout_marginEnd="8dp"
         android:paddingStart="4dp"
@@ -52,7 +52,7 @@
         android:id="@+id/llSub"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
+        android:layout_marginStart="4dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="10dp"
         android:orientation="horizontal"

diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
@@ -53,6 +53,6 @@
     <color name="playlistPageBackground">#141414</color>
     <color name="menuMainBackground">#141414</color>
 
-    <color name="dso_color_lyrics_back">#73000000</color>
+    <color name="dso_color_lyrics_back">#8C000000</color>
     <color name="white_alpha_10">#2EC8C8C8</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -61,6 +61,6 @@
     <color name="lrc_timeline_color">#809E9E9E</color>
     <color name="lrc_time_text_color">#809E9E9E</color>
 
-    <color name="dso_color_lyrics_back">#66FFFFFF</color>
+    <color name="dso_color_lyrics_back">#BFFFFFFF</color>
     <color name="white_alpha_10">#26FFFFFF</color>
 </resources>