3.10.1

修复播放界面星不变红问题。
Moriafly · Jul 25, 2021 · fbf8352 · fbf8352
1 parent 5769c45
commit fbf8352
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 37 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -29,15 +29,15 @@ android {
         applicationId "com.dirror.music"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 744
-        versionName "3.10.0"
+        versionCode 745
+        versionName "3.10.1"
 
         multiDexEnabled true
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         ndk {
-            abiFilters 'armeabi-v7a', 'arm64-v8a' // , 'x86' // 'arm64-v8a', 'armeabi-v7a', 'x86'
+            abiFilters 'armeabi-v7a', 'arm64-v8a' // 'armeabi-v7a', 'x86'
         }
 
     }

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
diff --git a/app/src/main/java/com/dirror/music/service/MusicService.kt b/app/src/main/java/com/dirror/music/service/MusicService.kt
@@ -64,6 +64,7 @@ import kotlin.coroutines.suspendCoroutine
 
 /**
  * Dso Music 音乐播放服务
+ * 
  * @author Moriafly
  * @since 2020/9
  */
@@ -213,9 +214,8 @@ open class MusicService : BaseMediaService() {
         mediaSessionCallback = object : MediaSessionCompat.Callback() {
 
             override fun onPlay() {
-                // 注册广播
+                // 注册监听噪音的广播，接收到噪音（耳机断开）触发 onPause
                 registerReceiver(myNoisyAudioStreamReceiver, intentFilter)
-
                 // 请求音频焦点
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                     if (isAudioFocus) {

diff --git a/app/src/main/java/com/dirror/music/ui/main/MainActivity.kt b/app/src/main/java/com/dirror/music/ui/main/MainActivity.kt
@@ -103,7 +103,6 @@ class MainActivity : BaseActivity() {
     }
 
     override fun initView() {
-        mainViewModel.updateUI()
         thread {
             ACache.get(this).getAsBitmap(Config.APP_THEME_BACKGROUND)?.let {
                 runOnMainThread {

diff --git a/app/src/main/java/com/dirror/music/ui/main/viewmodel/MainViewModel.kt b/app/src/main/java/com/dirror/music/ui/main/viewmodel/MainViewModel.kt
@@ -6,26 +6,37 @@ import com.dirror.music.MyApp
 import com.dirror.music.manager.User
 import com.dirror.music.util.Config
 
+/**
+ * MainActivity ViewModel
+ */
 class MainViewModel: ViewModel() {
 
-    var singleColumnPlaylist = MutableLiveData<Boolean>().also {
-        it.value = false
-    }
-
     /** 状态栏高度 */
     val statusBarHeight = MutableLiveData<Int>()
 
     /** 导航栏高度 */
     val navigationBarHeight = MutableLiveData<Int>()
 
+    /**
+     * 用户 id
+     */
     val userId =  MutableLiveData<Long>().also {
         it.value = User.uid
     }
 
-    var neteaseLiveVisibility = MutableLiveData(false)
+    /**
+     * 网易登录后才可见
+     */
+    val neteaseLiveVisibility = MutableLiveData<Boolean>().also {
+        it.value = MyApp.mmkv.decodeBool(Config.USER_NETEASE_CLOUD_MUSIC_API_ENABLE, false)
+    }
 
-    // 句子推荐可见性
-    var sentenceVisibility = MutableLiveData(true)
+    /**
+     * 句子推荐可见性
+     */
+    var sentenceVisibility = MutableLiveData<Boolean>().also {
+        it.value = MyApp.mmkv.decodeBool(Config.SENTENCE_RECOMMEND, true)
+    }
 
     /**
      * 设置用户 id
@@ -34,9 +45,11 @@ class MainViewModel: ViewModel() {
         userId.value = User.uid
     }
 
+    /**
+     * 刷新 UI
+     */
     fun updateUI() {
         neteaseLiveVisibility.value = MyApp.mmkv.decodeBool(Config.USER_NETEASE_CLOUD_MUSIC_API_ENABLE, false)
-        singleColumnPlaylist.value = MyApp.mmkv.decodeBool(Config.SINGLE_COLUMN_USER_PLAYLIST, false)
         sentenceVisibility.value = MyApp.mmkv.decodeBool(Config.SENTENCE_RECOMMEND, true)
     }
 

diff --git a/app/src/main/java/com/dirror/music/ui/player/PlayerActivity.kt b/app/src/main/java/com/dirror/music/ui/player/PlayerActivity.kt
@@ -588,6 +588,9 @@ class PlayerActivity : SlideBackActivity() {
                     seekBarVolume.progressDrawable.colorFilter = PorterDuffColorFilter(it, PorterDuff.Mode.SRC_IN)
 
                     ivVolume.setColorFilter(it)
+                    if (playViewModel.heart.value == true) {
+                        playViewModel.heart.value = true
+                    }
                 }
             })
 

diff --git a/app/src/main/java/com/dirror/music/ui/player/PlayerViewModel.kt b/app/src/main/java/com/dirror/music/ui/player/PlayerViewModel.kt
@@ -68,7 +68,12 @@ class PlayerViewModel: ViewModel() {
         it.value = Color.rgb(100, 100, 100)
     }
 
-    var heart = MutableLiveData<Boolean>()
+    /**
+     * 当前歌曲是否被点红心，
+     * 若有，实心，保持红色
+     * 若无，空心，跟随封面变色
+     */
+    val heart = MutableLiveData<Boolean>()
 
     /** 平常颜色 */
     var normalColor = MutableLiveData<Int>()

diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
@@ -128,9 +128,7 @@
                 android:id="@+id/rvNewSong"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:overScrollMode="never"
-                android:paddingStart="6dp"
-                android:paddingEnd="6dp" />
+                android:overScrollMode="never" />
 
             <TextView
                 android:id="@+id/tvFoyou"

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,9 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.4.31'
+    ext {
+        kotlin_version = '1.4.31'
+        // compose_version = '1.0.0-beta09'
+    }
     repositories {
         maven { url 'https://jitpack.io' }
         google()