适配Android 13,优化内部逻辑

molihuan · Dec 26, 2022 · 3fecf13 · 3fecf13
1 parent 29f0574
commit 3fecf13
Show file tree

Hide file tree

Showing 24 changed files with 849 additions and 324 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@
 .externalNativeBuild
 .cxx
 local.properties
+app/build
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -31,7 +31,7 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", includes: ["*.aar", "*.jar"])
     //文件选择器(包含权限请求)
-    implementation 'io.github.molihuan:pathselector:1.1.5'
+    implementation 'io.github.molihuan:pathselector:1.1.6'
     //RxFFmpeg依赖
     implementation 'com.github.microshow:RxFFmpeg:4.9.0-lite'
     //bugly依赖
@@ -47,6 +47,7 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.12.0'
     //XUI
 
+
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'com.google.android.material:material:1.5.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'

diff --git a/app/release/app-release.apk → app/release/1.6.0尝鲜版.apk b/app/release/app-release.apk → app/release/1.6.0尝鲜版.apk
diff --git a/app/src/main/java/com/molihua/hlbmerge/App.java b/app/src/main/java/com/molihua/hlbmerge/App.java
@@ -4,6 +4,7 @@
 
 import com.molihua.hlbmerge.dao.ConfigData;
 import com.molihuan.pathselector.PathSelector;
+import com.molihuan.pathselector.configs.PathSelectorConfig;
 import com.tencent.bugly.Bugly;
 import com.tencent.mmkv.MMKV;
 import com.xuexiang.xui.XUI;
@@ -32,6 +33,8 @@ public void onCreate() {
         ConfigData.init();
         //路径选择器debug
         PathSelector.setDebug(true);
+        //取消自动申请权限
+        PathSelectorConfig.setAutoGetPermission(false);
 
         super.onCreate();
     }

diff --git a/app/src/main/java/com/molihua/hlbmerge/activity/AbstractMainActivity.java b/app/src/main/java/com/molihua/hlbmerge/activity/AbstractMainActivity.java
@@ -4,6 +4,7 @@
 
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 import com.google.android.material.navigation.NavigationView;
+import com.molihua.hlbmerge.fragment.AbstractMainFileShowFragment;
 import com.molihua.hlbmerge.interfaces.IMainFileShowFragment;
 import com.molihua.hlbmerge.interfaces.IMainTitlebarFragment;
 
@@ -23,4 +24,6 @@ public abstract class AbstractMainActivity extends BaseActivity implements IMain
     public abstract void showHideNavigation(boolean status);
 
     public abstract void handleShowHide(boolean isShow);
+
+    public abstract AbstractMainFileShowFragment getMainFileShowFragment();
 }
diff --git a/app/src/main/java/com/molihua/hlbmerge/activity/impl/MainActivity.java b/app/src/main/java/com/molihua/hlbmerge/activity/impl/MainActivity.java
@@ -66,6 +66,8 @@ public void getComponents() {
 
     @Override
     public void initData() {
+
+        //申请权限
         PermissionsTools.getStoragePermissions(this);
 
         mainTitlebarFragment = new MainTitlebarFragment();
@@ -187,6 +189,11 @@ public NavigationView getNavigationView() {
         return navigationView;
     }
 
+    @Override
+    public AbstractMainFileShowFragment getMainFileShowFragment() {
+        return mainFileShowFragment;
+    }
+
     @Override
     public void showHideNavigation(boolean status) {
         if (status) {

diff --git a/app/src/main/java/com/molihua/hlbmerge/dialog/impl/MergeOptionDialog.java b/app/src/main/java/com/molihua/hlbmerge/dialog/impl/MergeOptionDialog.java
@@ -6,6 +6,7 @@
 import android.widget.CompoundButton;
 
 import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 
 import com.molihua.hlbmerge.R;
 import com.molihua.hlbmerge.dao.ConfigData;
@@ -17,6 +18,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @ClassName: JudgeMergeDialog
@@ -26,14 +28,29 @@
  */
 public class MergeOptionDialog {
 
-
-    public static MaterialDialog showMergeOptionDialog(CacheFile cacheFile, Context context) {
+    /**
+     * 单个合并
+     *
+     * @param cacheFile
+     * @param fragment
+     * @return
+     */
+    public static MaterialDialog showMergeOptionDialog(CacheFile cacheFile, Fragment fragment) {
         List<CacheFile> cacheFileList = new ArrayList<>();
         cacheFileList.add(cacheFile);
-        return showMergeOptionDialog(cacheFileList, context);
+        return showMergeOptionDialog(cacheFileList, fragment);
     }
 
-    public static MaterialDialog showMergeOptionDialog(List<CacheFile> cacheFileList, Context context) {
+    /**
+     * 多个合并
+     *
+     * @param cacheFileList
+     * @param fragment
+     * @return
+     */
+    public static MaterialDialog showMergeOptionDialog(List<CacheFile> cacheFileList, Fragment fragment) {
+        Context context = fragment.getContext();
+        Objects.requireNonNull(context, "context is null");
 
         View dialog_judgemerge = LayoutInflater.from(context).inflate(R.layout.dialog_judge_merge, null);
         MaterialSpinner dialog_materialspinner = dialog_judgemerge.findViewById(R.id.dialog_materialspinner);
@@ -68,7 +85,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                     @Override
                     public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
                         //打开合并进度窗口
-                        MergeProgressDialog.showMergeProgressDialog(cacheFileList, context);
+                        MergeProgressDialog.showMergeProgressDialog(cacheFileList, fragment);
                     }
                 })
                 .negativeText("取消")