Merge pull request #269 from zeze0556/master

历史播放列表按照播放时间降序排列

Author: rRemix

Diff for: app/src/main/java/remix/myplayer/db/room/dao/HistoryDao.kt

@@ -22,10 +22,12 @@ interface HistoryDao {
 
   @Query("""
     SELECT * FROM History ORDER BY
-    CASE WHEN :asc = 1 THEN play_count END ASC,
-    CASE WHEN :asc = 0 THEN play_count END DESC
+    CASE :orderBY WHEN 'last_play' THEN last_play  END asc,
+    CASE :orderBY WHEN 'last_play desc' THEN last_play END desc,
+    CASE :orderBY WHEN 'play_count' THEN play_count END asc,
+    CASE :orderBY WHEN 'play_count desc' THEN play_count END desc
   """)
-  fun selectAll(asc: Boolean): Flow<List<History>>
+  fun selectAll(orderBY: String): Flow<List<History>>
 
   @Query("""
     SELECT * FROM History

Diff for: app/src/main/java/remix/myplayer/helper/SortOrder.kt

@@ -24,4 +24,6 @@ object SortOrder {
   const val GENRE_Z_A = "${Audio.Genres.DEFAULT_SORT_ORDER} DESC"
   const val PLAY_COUNT = "play_count"
   const val PLAY_COUNT_DESC= "play_count desc"
+  const val LASTPLAY = "last_play"
+  const val LASTPLAY_DESC = "last_play desc"
 }

Diff for: app/src/main/java/remix/myplayer/ui/activity/HistoryActivity.kt

@@ -38,6 +38,7 @@ class HistoryActivity : MenuActivity() {
     HistoryAdapter(R.layout.item_song_recycle, choice, binding.recyclerview)
   }
   private val countMap = HashMap<Long, Int>()
+  private val last_play_map = HashMap<Long, Long>()
   private val choice by lazy {
     MultipleChoice<Song>(this, Constants.SONG)
   }
@@ -104,15 +105,16 @@ class HistoryActivity : MenuActivity() {
   private fun loadHistory() {
     job?.cancel()
     job = launch(Dispatchers.IO) {
+      val order = SPUtil.getValue(
+        this@HistoryActivity,
+        SPUtil.SETTING_KEY.NAME,
+        SPUtil.SETTING_KEY.HISTORY_SORT_ORDER,
+        SortOrder.PLAY_COUNT_DESC
+      )
       AppDatabase.getInstance(App.context.applicationContext)
         .historyDao()
         .selectAll(
-          SPUtil.getValue(
-            this@HistoryActivity,
-            SPUtil.SETTING_KEY.NAME,
-            SPUtil.SETTING_KEY.HISTORY_SORT_ORDER,
-            SortOrder.PLAY_COUNT_DESC
-          ) != SortOrder.PLAY_COUNT_DESC
+          order
         )
         .map {
           val songs = ArrayList<Song>()
@@ -121,6 +123,7 @@ class HistoryActivity : MenuActivity() {
             if (song != Song.EMPTY_SONG) {
               songs.add(song)
               countMap[song.id] = history.play_count
+              last_play_map[song.id] = history.last_play
             }
           }
           songs

Diff for: app/src/main/java/remix/myplayer/ui/activity/MenuActivity.kt

@@ -119,6 +119,14 @@ abstract class MenuActivity : ToolbarActivity() {
           sortOrder = SortOrder.PLAY_COUNT_DESC
           item.isChecked = true
         }
+        R.id.action_sort_order_last_play -> {
+          sortOrder = SortOrder.LASTPLAY
+          item.isChecked = true
+        }
+        R.id.action_sort_order_last_play_desc -> {
+          sortOrder = SortOrder.LASTPLAY_DESC
+          item.isChecked = true
+        }
       }
       if (!TextUtils.isEmpty(sortOrder))
         saveSortOrder(sortOrder)

Diff for: app/src/main/res/menu/menu_history.xml

@@ -15,6 +15,12 @@
         <item
           android:title="@string/count_desc"
           android:id="@+id/action_sort_order_play_count_desc"/>
+        <item
+            android:title="@string/last_play"
+            android:id="@+id/action_sort_order_last_play"/>
+        <item
+            android:title="@string/last_play_desc"
+            android:id="@+id/action_sort_order_last_play_desc"/>
       </group>
     </menu>
   </item>

Diff for: app/src/main/res/values-ja-rJP/strings.xml

@@ -473,4 +473,5 @@
   <string name="connect">せつぞく</string>
   <string name="edit">編集</string>
   <string name="buffering_wait">バッファリングです,ちょっと待ってください</string>
+    <string name="last_play">最後にプレイした</string>
 </resources>

Diff for: app/src/main/res/values-zh-rCN/strings.xml

@@ -475,4 +475,6 @@
   <string name="speed_at_2x">2x倍速播放中</string>
   <string name="local_lyric_tip">如果你的Android版本在11以及以上，本地歌词文件请确保放在公共目录中(如Downloads、Music等目录)</string>
   <string name="buffering_wait">缓冲中，请稍后</string>
+    <string name="last_play">最后播放</string>
+  <string name="last_play_desc">最后播放降序</string>
 </resources>

Diff for: app/src/main/res/values-zh-rHK/strings.xml

@@ -474,4 +474,6 @@
   <string name="speed_at_2x">2x倍速播放中</string>
   <string name="local_lyric_tip">如果你的Android版本在11以及以上，本地歌詞檔案請確保放在公共目錄中(如Downloads、Music等目錄)</string>
   <string name="buffering_wait">緩衝中，請稍後</string>
+    <string name="last_play">最後播放</string>
+  <string name="last_play_desc">最後播放降序</string>
 </resources>

Diff for: app/src/main/res/values-zh-rTW/strings.xml

@@ -475,4 +475,6 @@
   <string name="speed_at_2x">2x倍速播放中</string>
   <string name="local_lyric_tip">如果你的Android版本在11以及以上，本地歌詞檔案請確保放在公共目錄中(如Downloads、Music等目錄)</string>
   <string name="buffering_wait">緩衝中，請稍後</string>
+    <string name="last_play">最後播放</string>
+  <string name="last_play_desc">最後播放降序</string>
 </resources>

Diff for: app/src/main/res/values/strings.xml

@@ -475,4 +475,6 @@
   <string name="speed_at_2x">Playing at 2x speed</string>
   <string name="local_lyric_tip">If your Android version is 11 or above, please make sure the local lyrics files are placed in the public directory (such as Downloads, Music, etc. directories)</string>
   <string name="buffering_wait">Buffering, please wait</string>
+  <string name="last_play">Last Play TimeAt</string>
+  <string name="last_play_desc">Last Play TimeAt Desc</string>
 </resources>