Merge branch 'dev1.0' into dev1.0.1

# Conflicts:
#	.idea/workspace.xml
#	mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseActivity.java

app/src/main/java/com/xx/merchanthbh/ui/merchantenter/AddBrankAdapter.kt

 package com.xx.merchanthbh.ui.merchantenter
 
+import android.Manifest
 import android.content.Context
 import android.view.View
 import androidx.lifecycle.Observer
 import com.huantansheng.easyphotos.callback.SelectCallback
+import com.tbruyelle.rxpermissions3.RxPermissions
 import com.xx.merchanthbh.R
 import com.xx.merchanthbh.data.http.requst.body.Brankbody
 import com.xx.merchanthbh.data.staticdata.StaticData
 import com.xx.merchanthbh.databinding.ItemAddBrankBinding
 import com.xx.xxviewlibrary.base.AppManager
 import com.xx.xxviewlibrary.base.xxBaseRecyclerViewAdapter
+import com.xx.xxviewlibrary.comm.CommTextDialog
+import com.xx.xxviewlibrary.comm.RefuseDialogBean
 import com.xx.xxviewlibrary.utils.AddImgAdapter
 import com.xx.xxviewlibrary.witget.model.FileBean
+import io.reactivex.rxjava3.disposables.Disposable
+import me.goldze.mvvmhabit.utils.ToastUtils
 
 /**
  * edit 0：新建模式 1：编辑模式
  */
 class AddBrankAdapter(context: Context?,var edit:Int=0) : xxBaseRecyclerViewAdapter<ItemAddBrankBinding, Brankbody>(context)
 {
+
     override fun initLayout(): Int {
        return R.layout.item_add_brank
     }
@@ -92,7 +99,7 @@ class AddBrankAdapter(context: Context?,var edit:Int=0) : xxBaseRecyclerViewAdap
                 override fun onChanged(t: Map<String?, Any?>?) {
                     val hasCamera = t?.get("hasCamera") as Boolean
                     val callback = t["callBack"] as SelectCallback?
-                    startPhoto(hasCamera, callback)
+                    startPhoto(hasCamera, t.get("pMsg") as String,callback)
                 }
             })
 

app/src/main/java/com/xx/merchanthbh/ui/merchantenter/AddBrankViewModel.java

 package com.xx.merchanthbh.ui.merchantenter;
 
+import android.Manifest;
 import android.app.Application;
 import android.text.TextUtils;
 import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.databinding.ObservableField;
+import androidx.fragment.app.FragmentActivity;
 
+import com.tbruyelle.rxpermissions3.RxPermissions;
 import com.xx.merchanthbh.R;
 import com.xx.merchanthbh.data.http.BaseRespons;
 import com.xx.merchanthbh.data.http.requst.MerchantEnterRequst;
@@ -14,6 +17,8 @@ import com.xx.merchanthbh.data.http.requst.body.Brankbody;
 import com.xx.merchanthbh.data.http.respons.Filebean;
 import com.xx.merchanthbh.data.http.respons.IntegralTypeBean;
 import com.xx.merchanthbh.ui.appeal.AppealViewModel;
+import com.xx.xxviewlibrary.comm.CommTextDialog;
+import com.xx.xxviewlibrary.comm.RefuseDialogBean;
 import com.xx.xxviewlibrary.utils.AddImgAdapter;
 import com.xx.xxviewlibrary.witget.model.FileBean;
 import com.huantansheng.easyphotos.EasyPhotos;
@@ -46,6 +51,9 @@ public class AddBrankViewModel extends BaseViewModel<MerchantEnterRequst> {
     public AddBrankAdapter adapter;
 
 
+    public RxPermissions rp;
+
+
     public ObservableField<Boolean> edit = new ObservableField<>(true);
 
     //编辑状态
@@ -60,7 +68,7 @@ public class AddBrankViewModel extends BaseViewModel<MerchantEnterRequst> {
         model=new MerchantEnterRequst();
 
         this.create=create;
-
+        rp=new RxPermissions((FragmentActivity) AppManager.getAppManager().currentActivity());
     }
 
     public void initAdapter(AddBrankAdapter mAdapter)
@@ -88,7 +96,6 @@ public class AddBrankViewModel extends BaseViewModel<MerchantEnterRequst> {
             max = 5 - appealPicsAdapter.getItemCount() + 1;
         }
 
-
         startPhotoPage(true, max,"申请的是摄像头和照片视频读取权限，用于在添加品牌时读取和写入相册和文件内容", new SelectCallback() {
             @Override
             public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
@@ -137,9 +144,13 @@ public class AddBrankViewModel extends BaseViewModel<MerchantEnterRequst> {
 
             }
         });
+
     }
 
 
+
+
+
     public void goEdit(View view)
     {
 

xxviewlibrary/build.gradle

@@ -67,6 +67,7 @@ dependencies {
     api rootProject.ext.dependencies["SmartRefreshHeader"]
     api rootProject.ext.dependencies["SmartRefreshFooter"]
     api rootProject.ext.dependencies["Xzing"]
+    api rootProject.ext.dependencies["rxpermissions"]
     api 'com.github.stfalcon-studio:StfalconImageViewer:v1.0.1'
     api 'com.tencent.mm.opensdk:wechat-sdk-android:6.8.0'
 

xxviewlibrary/src/main/java/com/xx/xxviewlibrary/base/xxBaseRecyclerViewAdapter.java

 package com.xx.xxviewlibrary.base;
 
+import android.Manifest;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.databinding.ViewDataBinding;
+import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.Observer;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.huantansheng.easyphotos.EasyPhotos;
 import com.huantansheng.easyphotos.callback.SelectCallback;
+import com.huantansheng.easyphotos.models.album.entity.Photo;
+import com.tbruyelle.rxpermissions3.RxPermissions;
+import com.xx.xxviewlibrary.comm.CommTextDialog;
+import com.xx.xxviewlibrary.comm.RefuseDialogBean;
 import com.xx.xxviewlibrary.utils.GlideEngine;
+import com.xx.xxviewlibrary.witget.model.FileBean;
 
+import java.io.File;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -88,10 +99,33 @@ public abstract class xxBaseRecyclerViewAdapter<T extends ViewDataBinding,K> ext
 
 
 
-    public void startPhoto(boolean hasCamera, SelectCallback callback)
+    public void startPhoto(boolean hasCamera,String pmsg,SelectCallback callback)
     {
-        EasyPhotos.createAlbum(AppManager.getAppManager().currentActivity(), hasCamera, false, GlideEngine.getInstance()).setCount(1)
-                .start(callback);
+
+        RxPermissions rp=new RxPermissions((FragmentActivity) AppManager.getAppManager().currentActivity());
+
+        if ( !rp.isGranted(Manifest.permission.CAMERA) || !rp.isGranted(Manifest.permission.READ_EXTERNAL_STORAGE))
+        {
+
+            CommTextDialog textDialog = new CommTextDialog(mContext,new RefuseDialogBean(pmsg, "同意", "拒绝"), new CommTextDialog.onAcceptCallBack() {
+                @Override
+                public void acceptBack() {
+                    EasyPhotos.createAlbum(AppManager.getAppManager().currentActivity(), hasCamera, false, GlideEngine.getInstance()).setCount(1)
+                            .start(callback);
+                }
+
+                @Override
+                public void refuseBack() {
+
+
+                }
+            });
+            textDialog.show();
+        }else {
+            EasyPhotos.createAlbum(AppManager.getAppManager().currentActivity(), hasCamera, false, GlideEngine.getInstance()).setCount(1)
+                    .start(callback);
+        }
+
     }
 
     public void  setOnItemClick(OnItemClick<K> click )