基础搭建

功能开发
1.1.0

app/build.gradle

@@ -38,7 +38,7 @@ android {
         minSdk 23
         targetSdk 31
         versionCode 2
-        versionName "1.0.1"
+        versionName "1.1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         signingConfig signingConfigs.reseale

consumer/build.gradle

@@ -34,8 +34,8 @@ android {
         applicationId "com.xx.hbhconsumer"
         minSdk 23
         targetSdk 31
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         signingConfig signingConfigs.release
     }

hbhbcompany/build.gradle

@@ -37,8 +37,8 @@ android {
         applicationId "com.xx.hbhbcompany"
         minSdk 24
         targetSdk 31
-        versionCode 1
-        versionName "1.0.1"
+        versionCode 2
+        versionName "1.1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseActivity.java

@@ -208,12 +208,51 @@ public abstract class BaseActivity<V extends ViewDataBinding, VM extends BaseVie
                if ( !rp.isGranted(Manifest.permission.CAMERA) || !rp.isGranted(Manifest.permission.READ_EXTERNAL_STORAGE))
                 {
 
-                        ToastUtils.showLong(o.get("pMsg").toString());
 
+                        showCommTextDialog(new RefuseDialogBean(o.get("pMsg").toString() + ",是否同意", "同意", "拒绝"), new CommTextDialog.onAcceptCallBack() {
+                            @Override
+                            public void acceptBack() {
+                                rp.request(Manifest.permission.CAMERA,Manifest.permission.READ_EXTERNAL_STORAGE).subscribe(new io.reactivex.rxjava3.core.Observer<Boolean>() {
+                                    @Override
+                                    public void onSubscribe(@NonNull Disposable d) {
+
+                                    }
+
+                                    @Override
+                                    public void onNext(@NonNull Boolean aBoolean) {
+
+                                        if (aBoolean)
+                                        {
+                                            boolean hasCamera = (boolean) o.get("hasCamera");
+                                            int maxCount = (int) o.get("maxCount");
+                                            if (o.get("maxCount") == null) {
+                                                maxCount = 1;
+                                            }
+                                            SelectCallback callback = (SelectCallback) o.get("callBack");
+                                            startPhoto(hasCamera, maxCount, callback);
+                                        }else {
+                                            ToastUtils.showShort("请开启拍照，和文件读取权限，否则无法正常使用完整功能");
+                                        }
+                                    }
+
+                                    @Override
+                                    public void onError(@NonNull Throwable e) {
+                                        ToastUtils.showShort("请开启拍照，和文件读取权限，否则无法正常使用完整功能");
+                                    }
+
+                                    @Override
+                                    public void onComplete() {
 
                                     }
+                                });
+                            }
 
+                            @Override
+                            public void refuseBack() {
 
+                            }
+                        });
+                }else {
                    rp.request(Manifest.permission.CAMERA,Manifest.permission.READ_EXTERNAL_STORAGE).subscribe(new io.reactivex.rxjava3.core.Observer<Boolean>() {
                        @Override
                        public void onSubscribe(@NonNull Disposable d) {
@@ -247,6 +286,9 @@ public abstract class BaseActivity<V extends ViewDataBinding, VM extends BaseVie
 
                        }
                    });
+               }
+
+
 
             }
         });

mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseFragment.java

@@ -204,12 +204,51 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
                 if ( !rp.isGranted(Manifest.permission.CAMERA) || !rp.isGranted(Manifest.permission.READ_EXTERNAL_STORAGE))
                 {
 
-                    ToastUtils.showShort(o.get("pMsg").toString());
 
+                    showCommTextDialog(new RefuseDialogBean(o.get("pMsg").toString() + ",是否同意", "同意", "拒绝"), new CommTextDialog.onAcceptCallBack() {
+                        @Override
+                        public void acceptBack() {
+                            rp.request(Manifest.permission.CAMERA,Manifest.permission.READ_EXTERNAL_STORAGE).subscribe(new io.reactivex.rxjava3.core.Observer<Boolean>() {
+                                @Override
+                                public void onSubscribe(@NonNull Disposable d) {
 
                                 }
 
+                                @Override
+                                public void onNext(@NonNull Boolean aBoolean) {
+
+                                    if (aBoolean)
+                                    {
+                                        boolean hasCamera = (boolean) o.get("hasCamera");
+                                        int maxCount = (int) o.get("maxCount");
+                                        if (o.get("maxCount") == null) {
+                                            maxCount = 1;
+                                        }
+                                        SelectCallback callback = (SelectCallback) o.get("callBack");
+                                        startPhoto(hasCamera, callback);
+                                    }else {
+                                        ToastUtils.showShort("请开启拍照，和文件读取权限，否则无法正常使用完整功能");
+                                    }
+                                }
 
+                                @Override
+                                public void onError(@NonNull Throwable e) {
+                                    ToastUtils.showShort("请开启拍照，和文件读取权限，否则无法正常使用完整功能");
+                                }
+
+                                @Override
+                                public void onComplete() {
+
+                                }
+                            });
+                        }
+
+                        @Override
+                        public void refuseBack() {
+
+                        }
+                    });
+                }else {
                     rp.request(Manifest.permission.CAMERA,Manifest.permission.READ_EXTERNAL_STORAGE).subscribe(new io.reactivex.rxjava3.core.Observer<Boolean>() {
                         @Override
                         public void onSubscribe(@NonNull Disposable d) {
@@ -222,7 +261,10 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
                             if (aBoolean)
                             {
                                 boolean hasCamera = (boolean) o.get("hasCamera");
-
+                                int maxCount = (int) o.get("maxCount");
+                                if (o.get("maxCount") == null) {
+                                    maxCount = 1;
+                                }
                                 SelectCallback callback = (SelectCallback) o.get("callBack");
                                 startPhoto(hasCamera,  callback);
                             }else {
@@ -240,6 +282,9 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
 
                         }
                     });
+                }
+
+
 
             }
         });