feat: 升级v1.8.8

Author: Yu2002s

app/build.gradle

@@ -29,8 +29,8 @@ android {
         applicationId "com.lanzou.cloud"
         minSdk 24
         targetSdk 35
-        versionCode 26
-        versionName "1.8.7"
+        versionCode 27
+        versionName "1.8.8"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         signingConfig signingConfigs.debug

app/src/main/java/com/lanzou/cloud/data/Upload.java

@@ -5,6 +5,7 @@
 
 import androidx.annotation.NonNull;
 
+import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.Since;
 import com.lanzou.cloud.event.OnUploadListener;
 import com.lanzou.cloud.utils.FileJavaUtils;
@@ -75,7 +76,8 @@ public class Upload extends LitePalSupport implements Parcelable, Comparable<Upl
     private final String comment = "如需完整下载此文件，请下载app（https://github.com/Yu2002s/SplitLanzou）";
 
     @Column(ignore = true)
-    private OnUploadListener listener;
+    @Expose(serialize = false, deserialize = false)
+    private transient OnUploadListener listener;
 
     public Upload() {
     }

app/src/main/java/com/lanzou/cloud/model/PathModel.kt

@@ -10,7 +10,7 @@ sealed class PathModel(
   /**
    * 路径名称
    */
-  val name: String,
+  val name: String = "",
   /**
    * 文件 Fragment 实例
    */
@@ -20,7 +20,6 @@ sealed class PathModel(
    */
   val path: String? = null,
 ) {
-
   /**
    * 路径 ID, 用于标识唯一
    */

app/src/main/java/com/lanzou/cloud/service/DownloadService.java

@@ -555,7 +555,7 @@ private Upload readJsonToUpload(InputStream inputStream, int len, Download downl
                 download.setUploadJson(json);
             }
         } catch (Exception e) {
-            Log.e(TAG, "获取上传信息失败，尝试写入文本文件");
+            Log.e(TAG, "获取上传信息失败，尝试写入文本文件: " + e);
             // 如果读取上传文件出错了，就直接下载文本内容到本地
             writeTextFileToLocal(download, json);
         }

app/src/main/java/com/lanzou/cloud/ui/cloud/file/FileAction.java

@@ -124,13 +124,20 @@ default void getFiles() {
      */
     void moveFiles();
 
+    /**
+     * 选择所有文件
+     */
+    int selectAll();
+
     /**
      * 订阅
      *
      * @param context fragment 实例
      */
     void observable(Fragment context);
 
+    void unSelectAll();
+
     /**
      * 操作回调
      */

app/src/main/java/com/lanzou/cloud/ui/cloud/file/FileFragment.java

@@ -389,6 +389,8 @@ public void onPrepareMenu(@NonNull Menu menu) {
         menu.findItem(R.id.download).setVisible(multiMode);
         menu.findItem(R.id.move).setVisible(multiMode);
         menu.findItem(R.id.detail).setVisible(!multiMode && getCurrentPage().getFolderId() > 0);
+        menu.findItem(R.id.all_select).setVisible(multiMode);
+        menu.findItem(R.id.all_unselect).setVisible(multiMode);
     }
 
     @Override
@@ -440,6 +442,13 @@ public boolean onMenuItemSelected(@NonNull MenuItem item) {
             // 显示详情对话框
             new FileDetailDialog(requireContext(), getCurrentPage().getFolderId())
                     .setFileName(getCurrentPage().getName());
+        } else if (item.getItemId() == R.id.all_select) {
+            selectCount = fileAction.selectAll();
+            changeSelect();
+        } else if (item.getItemId() == R.id.all_unselect) {
+            selectCount = 0;
+            changeSelect();
+            fileAction.unSelectAll();
         }
         return true;
     }

app/src/main/java/com/lanzou/cloud/ui/cloud/file/imple/FileActionImpl.java

@@ -459,4 +459,22 @@ private void handleMoveFiles(long id) {
     public void moveFiles() {
         FolderSelectorActivity.moveFiles(mActivity, moveActivityResultLauncher);
     }
+
+    @SuppressLint("NotifyDataSetChanged")
+    @Override
+    public int selectAll() {
+        for (LanzouFile file : lanzouFiles) {
+            file.setSelected(true);
+        }
+        adapter.notifyDataSetChanged();
+        return lanzouFiles.size();
+    }
+
+    @Override
+    public void unSelectAll() {
+        for (LanzouFile file : lanzouFiles) {
+            file.setSelected(false);
+        }
+        adapter.notifyDataSetChanged();
+    }
 }

app/src/main/java/com/lanzou/cloud/ui/fragment/HomeFragment.kt

@@ -43,7 +43,6 @@ import com.lanzou.cloud.enums.FileSortRule
 import com.lanzou.cloud.enums.LayoutPosition
 import com.lanzou.cloud.event.OnFileNavigateListener
 import com.lanzou.cloud.event.OnUploadListener
-import com.lanzou.cloud.manager.FilePageManager
 import com.lanzou.cloud.model.FileInfoModel
 import com.lanzou.cloud.model.LocalPathModel
 import com.lanzou.cloud.model.PathModel
@@ -389,14 +388,6 @@ class HomeFragment : EngineNavFragment<FragmentHomeBinding>(R.layout.fragment_ho
     leftLp.width = contentWidth
     rightLp.width = contentWidth
 
-    val onFilePageLayoutChangeListener = object : FilePageManager.OnFilePageLayoutChangeListener {
-      override fun onFilePageSelected(position: Int, layoutPosition: LayoutPosition) {
-        homeViewModel.focusPosition(layoutPosition)
-        requireActivity().invalidateMenu()
-        currentFileFragment.refreshPathSubTitle()
-      }
-    }
-
     initPage(binding.tabLeft, binding.vpLeft, leftPaths)
     initPage(binding.tabRight, binding.vpRight, rightPaths)
 
@@ -520,24 +511,6 @@ class HomeFragment : EngineNavFragment<FragmentHomeBinding>(R.layout.fragment_ho
           downloadFiles(currentPath, currentFileFragment.getCheckedFiles())
         }
       }
-
-      /*R.id.fab_right -> {
-        val checkedFiles = currentFileFragment.getCheckedFiles()
-        if (checkedFiles.isEmpty()) {
-          toast("选中文件为空")
-          return
-        }
-        if (currentFilePageType == targetFilePageType) {
-          if (currentFilePageType == FilePageType.LOCAL) {
-            moveFiles(currentFileFragment.getCheckedFiles(false))
-          } else {
-            moveFiles(checkedFiles)
-          }
-          return
-        }
-        val currentPath = targetFileFragment.getCurrentPath()
-        downloadFiles(currentPath, checkedFiles)
-      }*/
     }
   }
 

app/src/main/res/menu/menu_cloud.xml

@@ -27,4 +27,14 @@
         android:title="@string/delete"
         android:visible="false"
         app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/all_select"
+        android:title="@string/all_select"
+        android:visible="false" />
+
+    <item
+        android:id="@+id/all_unselect"
+        android:title="@string/all_unselect"
+        android:visible="false" />
 </menu>

app/src/main/res/values/strings.xml

@@ -54,5 +54,8 @@
     <string name="sort">排序</string>
     <string name="password_update_success">密码修改成功</string>
     <string name="tip_cache_path">请前往设置，设置缓存路径</string>
+    <string name="all_select">全选</string>
+    <string name="reverse_select">反选</string>
+    <string name="all_unselect">全不选</string>
 
 </resources>