基础搭建

功能开发
1：bug 修复 企业端,客商端安装包更新弹窗完善

app/src/main/java/com/xx/merchanthbh/ui/huanbohai/HuanBoHaiFragment.java

@@ -32,6 +32,8 @@ import com.xx.merchanthbh.fragment.adapter.ConsultationInformationTitleAdapter;
 import com.xx.merchanthbh.ui.web.CommWabActivity;
 import com.xx.merchanthbh.ui.web.PDFWebViewActivity;
 import com.xx.xxviewlibrary.base.xxBaseRecyclerViewAdapter;
+import com.xx.xxviewlibrary.comm.CommTextDialog;
+import com.xx.xxviewlibrary.comm.RefuseDialogBean;
 import com.youth.banner.indicator.CircleIndicator;
 
 import java.util.List;
@@ -40,35 +42,56 @@ import me.goldze.mvvmhabit.base.BaseFragment;
 
 /*环渤海页面*/
 public class HuanBoHaiFragment extends BaseFragment<FragmentHuanbohaiBinding, HuanBoHaiViewModel> {
-/*    @Override
-    public void onResume() {
-        super.onResume();
+@Override
+public void onResume() {
+    super.onResume();
 
-        // 检查版本
-        viewModel.rxPermissions = new RxPermissions(this);
-        *//*检查版本*//*
-        viewModel.checkVersion(binding.getRoot().getRootView());
+    // 检查版本
+    viewModel.rxPermissions = new RxPermissions(this);
+//        检查版本
+    viewModel.checkVersion(binding.getRoot().getRootView());
 
 // 安装新版本
-        viewModel.openInstall.observe(this, new Observer<String>() {
-            @Override
-            public void onChanged(String s) {
-                if ("1".equals(s)) {
-                    Uri packageURI = Uri.parse("package:" +getContext().getPackageName());
-                    Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, packageURI);
-                    startActivityForResult(intent, 1002);
-                }
+    viewModel.openInstall.observe(this, new Observer<String>() {
+        @Override
+        public void onChanged(String s) {
+            if ("1".equals(s)) {
+                Uri packageURI = Uri.parse("package:" + getContext().getPackageName());
+                Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, packageURI);
+                startActivityForResult(intent, 1002);
             }
-        });
+        }
+    });
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+        if (!Environment.isExternalStorageManager()) {
+            checkPermission();
+        }
+    }
+}
+
+    private void checkPermission() {
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
             if (!Environment.isExternalStorageManager()) {
-                Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
-                intent.setData(Uri.parse("package:" + getContext().getPackageName()));
-                startActivityForResult(intent, 1024);
-            }
-        }
-    }*/
+                // 弹出权限请求对话框
+                showCommTextDialog(new RefuseDialogBean("申请的是授予管理所有文件的权限,用于更新最新安装包" + ",是否同意", "同意", "拒绝"),
+                        new CommTextDialog.onAcceptCallBack() {
+                            @Override
+                            public void acceptBack() {
+
+                                Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
+                                intent.setData(Uri.parse("package:" + getContext().getPackageName()));
+                                startActivityForResult(intent, 1024);
+                            }
+
+                            @Override
+                            public void refuseBack() {
+                                checkPermission(); // 继续检查权限并请求
+                            }
+                        });
+            }}
+    }
     //    重写初始方法调用参数
     @Override
     public void initData() {

app/src/main/java/com/xx/merchanthbh/ui/mine/MineFragment.java

@@ -105,19 +105,6 @@ public class MineFragment extends BaseFragment<FragmentMineBinding, MineViewMode
                 }
             }
         });
-
-
-        viewModel.openInstall.observe(this, new Observer<String>() {
-            @Override
-            public void onChanged(String s) {
-                if ("1".equals(s)) {
-                  /*  var packageURI = Uri.parse("package:" + getContext().getPackageName());
-                    Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, packageURI);
-                    startActivityForResult(intent, 1002);*/
-                }
-
-            }
-        });
     }
 
     @Override
@@ -127,19 +114,48 @@ public class MineFragment extends BaseFragment<FragmentMineBinding, MineViewMode
 
         // 检查版本
         viewModel.rxPermissions = new RxPermissions(this);
-        /*检查版本*/
-//        viewModel.checkVersion(binding.getRoot().getRootView());
+//        检查版本
+        viewModel.checkVersion(binding.getRoot().getRootView());
 
 // 安装新版本
         viewModel.openInstall.observe(this, new Observer<String>() {
             @Override
             public void onChanged(String s) {
                 if ("1".equals(s)) {
-                    Uri packageURI = Uri.parse("package:" +getContext().getPackageName());
+                    Uri packageURI = Uri.parse("package:" + getContext().getPackageName());
                     Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, packageURI);
                     startActivityForResult(intent, 1002);
                 }
             }
         });
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            if (!Environment.isExternalStorageManager()) {
+                checkPermission();
+            }
+        }
+    }
+
+    private void checkPermission() {
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            if (!Environment.isExternalStorageManager()) {
+                // 弹出权限请求对话框
+                showCommTextDialog(new RefuseDialogBean("申请的是授予管理所有文件的权限,用于更新最新安装包" + ",是否同意", "同意", "拒绝"),
+                        new CommTextDialog.onAcceptCallBack() {
+                            @Override
+                            public void acceptBack() {
+
+                                Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
+                                intent.setData(Uri.parse("package:" + getContext().getPackageName()));
+                                startActivityForResult(intent, 1024);
+                            }
+
+                            @Override
+                            public void refuseBack() {
+                                checkPermission(); // 继续检查权限并请求
+                            }
+                        });
+            }}
     }
 }
\ No newline at end of file

hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/mine/MineFragment.java

@@ -27,6 +27,8 @@ import com.xx.hbhbcompany.data.staticdata.StaticData;
 import com.xx.hbhbcompany.databinding.FragmentMineBinding;
 import com.xx.hbhbcompany.ui.login.LoginActivity;
 import com.xx.xxviewlibrary.base.AppManager;
+import com.xx.xxviewlibrary.comm.CommTextDialog;
+import com.xx.xxviewlibrary.comm.RefuseDialogBean;
 
 import me.goldze.mvvmhabit.base.BaseFragment;
 import me.goldze.mvvmhabit.utils.StringUtils;
@@ -102,27 +104,48 @@ public class MineFragment extends BaseFragment<FragmentMineBinding, MineViewMode
     @Override
     public void onResume() {
         super.onResume();
+
         // 检查版本
         viewModel.rxPermissions = new RxPermissions(this);
-
+        /*检查版本*/
+        viewModel.checkVersion(binding.getRoot().getRootView());
         // 安装新版本
         viewModel.openInstall.observe(this, new Observer<String>() {
             @Override
             public void onChanged(String s) {
                 if ("1".equals(s)) {
-                    Uri packageURI = Uri.parse("package:" + getContext().getPackageName());
+                    Uri packageURI = Uri.parse("package:" +getContext().getPackageName());
                     Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, packageURI);
                     startActivityForResult(intent, 1002);
                 }
             }
         });
 
-//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-//            if (!Environment.isExternalStorageManager()) {
-//                Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
-//                intent.setData(Uri.parse("package:" + getContext().getPackageName()));
-//                startActivityForResult(intent, 1024);
-//            }
-//        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            if (!Environment.isExternalStorageManager()) {
+                checkPermission();
+            }
+        }
+    }
+    private void checkPermission() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            if (!Environment.isExternalStorageManager()) {
+                // 弹出权限请求对话框
+                showCommTextDialog(new RefuseDialogBean("申请的是授予管理所有文件的权限,用于更新最新安装包" + ",是否同意", "同意", "拒绝"),
+                        new CommTextDialog.onAcceptCallBack() {
+                            @Override
+                            public void acceptBack() {
+
+                                Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
+                                intent.setData(Uri.parse("package:" + getContext().getPackageName()));
+                                startActivityForResult(intent, 1024);
+                            }
+
+                            @Override
+                            public void refuseBack() {
+                                checkPermission(); // 继续检查权限并请求
+                            }
+                        });
+            }}
     }
 }

hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/work/WorkFragment.java

@@ -20,6 +20,8 @@ import com.xx.hbhbcompany.data.http.requst.WorkRequest;
 import com.xx.hbhbcompany.data.http.respons.WorkIconBean;
 import com.xx.hbhbcompany.databinding.FragmentWorkBinding;
 import com.xx.xxviewlibrary.base.xxBaseRecyclerViewAdapter;
+import com.xx.xxviewlibrary.comm.CommTextDialog;
+import com.xx.xxviewlibrary.comm.RefuseDialogBean;
 
 import java.util.List;
 
@@ -121,5 +123,33 @@ public class WorkFragment extends BaseFragment<FragmentWorkBinding, WorkViewMode
             }
         });
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            if (!Environment.isExternalStorageManager()) {
+                checkPermission();
+            }
+        }
+
+    }
+
+    private void checkPermission() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            if (!Environment.isExternalStorageManager()) {
+                // 弹出权限请求对话框
+                showCommTextDialog(new RefuseDialogBean("申请的是授予管理所有文件的权限,用于更新最新安装包" + ",是否同意", "同意", "拒绝"),
+                        new CommTextDialog.onAcceptCallBack() {
+                            @Override
+                            public void acceptBack() {
+
+                                Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
+                                intent.setData(Uri.parse("package:" + getContext().getPackageName()));
+                                startActivityForResult(intent, 1024);
+                            }
+
+                            @Override
+                            public void refuseBack() {
+                                checkPermission(); // 继续检查权限并请求
+                            }
+                        });
+            }}
     }
 }