下载列表添加排序功能

Author: xiaojieonly

app/build.gradle

@@ -115,7 +115,7 @@ dependencies {
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation "androidx.fragment:fragment:1.8.6"
     implementation "androidx.preference:preference-ktx:1.2.1"
-    implementation 'androidx.recyclerview:recyclerview:1.2.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'org.conscrypt:conscrypt-android:2.5.1'
     // https://mvnrepository.com/artifact/androidx.core/core-ktx
     implementation 'androidx.core:core-ktx:1.15.0'
@@ -145,6 +145,10 @@ dependencies {
     implementation 'com.github.seven332:refreshlayout:0.1.0'
     implementation 'com.github.seven332:ripple:0.1.2'
     implementation 'com.github.seven332:streampipe:0.1.0'
+//   列表组件
+//    implementation "androidx.paging:paging-runtime:3.2.1"
+//    implementation "androidx.paging:paging-rxjava3:3.2.1" // 如果需要 RxJava
+//    implementation "androidx.paging:paging-guava:3.2.1" // 如果需要 Guava
 
 
     implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:1.0.0'

app/src/main/java/com/hippo/ehviewer/EhDB.java

@@ -116,9 +116,9 @@ private static void upgradeDB(SQLiteDatabase db, int oldVersion) {
                         "\"ENABLE\" INTEGER);");
                 db.execSQL("INSERT INTO \"FILTER2\" (" +
                         "_id, MODE, TEXT, ENABLE)" +
-                        "SELECT _id, MODE, TEXT, 1 FROM FILTER;");
-                db.execSQL("DROP TABLE FILTER");
-                db.execSQL("ALTER TABLE FILTER2 RENAME TO FILTER");
+                        "SELECT _id, MODE, TEXT, 1 FROM [FILTER];");
+                db.execSQL("DROP TABLE [FILTER]");
+                db.execSQL("ALTER TABLE FILTER2 RENAME TO [FILTER]");
             case 3: // 3 to 4, add PAGE_FROM and PAGE_TO column to QUICK_SEARCH
                 db.execSQL("CREATE TABLE " + "\"QUICK_SEARCH2\" (" +
                         "\"_id\" INTEGER PRIMARY KEY ," +
@@ -414,6 +414,28 @@ public static synchronized List<DownloadInfo> getAllDownloadInfo() {
         return list;
     }
 
+    public static synchronized void moveDownloadInfo(List<DownloadInfo> infos, int fromPosition, int toPosition){
+        if (fromPosition == toPosition) {
+            return;
+        }
+        DownloadsDao dao = sDaoSession.getDownloadsDao();
+        boolean reverse = fromPosition > toPosition;
+        int offset = reverse ? toPosition : fromPosition;
+        int limit = reverse ? fromPosition - toPosition + 1 : toPosition - fromPosition + 1;
+
+        List<DownloadInfo> list = infos.subList(offset, offset + limit);
+
+        int step = reverse ? 1 : -1;
+        int start = reverse ? limit - 1 : 0;
+        int end = reverse ? 0 : limit - 1;
+        long toTime = list.get(end).time;
+        for(int i = end; reverse ? i < start : i > start; i += step) {
+            list.get(i).setTime(list.get(i + step).getTime());
+        }
+        list.get(start).setTime(toTime);
+        dao.updateInTx(list);
+    }
+
     // Insert or update
     public static synchronized void putDownloadInfo(DownloadInfo downloadInfo) {
         DownloadsDao dao = sDaoSession.getDownloadsDao();
@@ -734,28 +756,46 @@ public static synchronized void deleteQuickSearch(QuickSearch quickSearch) {
         dao.delete(quickSearch);
     }
 
+    /**
+     * 快速搜索项移动方法
+     * 用于调整快速搜索项的顺序，通过时间戳来实现位置调整
+     *
+     * @param fromPosition 起始位置
+     * @param toPosition   目标位置
+     */
     public static synchronized void moveQuickSearch(int fromPosition, int toPosition) {
+    // 如果起始位置和目标位置相同，则直接返回
         if (fromPosition == toPosition) {
             return;
         }
 
+    // 判断是否需要反向移动
         boolean reverse = fromPosition > toPosition;
+    // 计算偏移量，用于查询数据库时的起始位置
         int offset = reverse ? toPosition : fromPosition;
+    // 计算需要移动的项目数量
         int limit = reverse ? fromPosition - toPosition + 1 : toPosition - fromPosition + 1;
 
+    // 获取QuickSearchDao对象
         QuickSearchDao dao = sDaoSession.getQuickSearchDao();
+    // 查询需要移动的搜索项列表，按时间升序排列
         List<QuickSearch> list = dao.queryBuilder().orderAsc(QuickSearchDao.Properties.Time)
                 .offset(offset).limit(limit).list();
 
+    // 设置移动方向和起始、结束位置
         int step = reverse ? 1 : -1;
         int start = reverse ? limit - 1 : 0;
         int end = reverse ? 0 : limit - 1;
+    // 获取目标位置的时间戳
         long toTime = list.get(end).getTime();
+    // 遍历列表，交换相邻项的时间戳，实现位置移动
         for (int i = end; reverse ? i < start : i > start; i += step) {
             list.get(i).setTime(list.get(i + step).getTime());
         }
+    // 将起始项的时间设置为目标时间
         list.get(start).setTime(toTime);
 
+    // 在事务中更新所有更改
         dao.updateInTx(list);
     }
 

app/src/main/java/com/hippo/ehviewer/client/EhClient.java

@@ -19,6 +19,7 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.AsyncTask;
+import android.util.Log;
 
 import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.hippo.ehviewer.EhApplication;
@@ -150,6 +151,7 @@ public void stop() {
         @Override
         protected Object doInBackground(Object... params) {
             try {
+                Log.i(TAG, "doInBackground: "+mMethod);
                 switch (mMethod) {
                     case METHOD_SIGN_IN:
                         return EhEngine.signIn(this, mOkHttpClient, (String) params[0], (String) params[1]);