更改Rxjava版本

app/build.gradle

@@ -5,6 +5,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
+
 kapt {
     arguments {
         arg("moduleName", project.getName())
@@ -194,10 +195,8 @@ dependencies {
     //    api deps.support.multidex
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     implementation 'com.google.android.gms:play-services-maps:16.1.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1'
     //annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
     annotationProcessor 'com.alibaba:arouter-compiler:1.1.4'
-    kapt 'com.github.bumptech.glide:compiler:4.7.1'
     //kapt 'com.jakewharton:butterknife-compiler:8.4.0'
     kapt 'com.alibaba:arouter-compiler:1.1.4'
     //kapt deps.alibaba.arouter_compiler
@@ -207,9 +206,9 @@ dependencies {
     api 'com.android.support:cardview-v7:+'
     api 'com.android.support:multidex:1.0.2'
     api "com.android.support.constraint:constraint-layout:1.1.1"
-    api 'io.reactivex.rxjava2:rxjava:2.1.8'
-    api 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    api 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
+    api 'io.reactivex.rxjava3:rxjava:3.0.0'
+    api 'io.reactivex.rxjava3:rxandroid:3.0.0'
+    api 'com.squareup.retrofit2:adapter-rxjava3:2.9.0'
     api 'com.yanzhenjie:permission:2.0.0-rc12'
     api 'com.tbruyelle.rxpermissions2:rxpermissions:0.9.5@aar'
     api 'com.github.bumptech.glide:glide:4.7.1'

app/src/main/AndroidManifest.xml

@@ -102,12 +102,12 @@
              sign the APK for publishing.
              You can define the keys for the debug and release targets in src/debug/ and src/release/.
         -->
-        <meta-data
+       <!-- <meta-data
             android:name="com.google.android.geo.API_KEY"
             android:value="@string/google_maps_key" />
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_channel_id"
-            android:value="@string/default_notification_channel_id" />
+            android:value="@string/default_notification_channel_id" />-->
         <activity
             android:name=".ui.home.map.GoogleMapsActivity"
             android:label="@string/title_activity_google_maps"
@@ -288,11 +288,11 @@
             android:exported="true"
             android:theme="@style/MyTranslucentTheme" />
 
-        <service android:name=".ui.service.MyFirebaseMessagingService">
+       <!-- <service android:name=".ui.service.MyFirebaseMessagingService">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
-        </service> <!-- [END firebase_service] -->
+        </service>--> <!-- [END firebase_service] -->
         <service
             android:name=".ui.service.MyJobService"
             android:exported="false">

app/src/main/java/cn/dankal/basiclib/api/AddressService.java

@@ -6,7 +6,7 @@ import java.util.Map;
 import cn.dankal.entities.shop.AddressEntity;
 import cn.dankal.entities.shop.address.AddressListEntity;
 import cn.dankal.entities.shop.address.LogisticsEntity;
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 import retrofit2.http.Body;

app/src/main/java/cn/dankal/basiclib/api/AddressServiceFactory.java

@@ -6,9 +6,9 @@ import cn.dankal.basiclib.rx.RefreshTokenHelper;
 import cn.dankal.entities.shop.AddressEntity;
 import cn.dankal.entities.shop.address.AddressListEntity;
 import cn.dankal.entities.shop.address.LogisticsEntity;
-import io.reactivex.Observable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 import okhttp3.ResponseBody;
 import retrofit2.Retrofit;
 

app/src/main/java/cn/dankal/basiclib/api/BaseApi.java

@@ -13,7 +13,7 @@ import cn.dankal.basiclib.domain.TokenInterceptor;
 import cn.dankal.client.BuildConfig;
 import okhttp3.OkHttpClient;
 import retrofit2.Retrofit;
-import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
+import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory;
 import retrofit2.converter.fastjson.FastJsonConverterFactory;
 
 /**
@@ -34,7 +34,7 @@ public class BaseApi {
     public static Retrofit getRetrofit() {
         return new Retrofit.Builder()
                 .addConverterFactory(FastJsonConverterFactory.create())
-                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .addCallAdapterFactory(RxJava3CallAdapterFactory.create())
                 .client(getOkhttpInstance())
                 .baseUrl(BASE_URL)
                 .build();
@@ -42,7 +42,7 @@ public class BaseApi {
 
     public static Retrofit getRetrofitTow() {
         return new Retrofit.Builder().addConverterFactory(FastJsonConverterFactory.create())
-                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .addCallAdapterFactory(RxJava3CallAdapterFactory.create())
                 .client(getOkhttpInstance())
                 .baseUrl(BASE_EXPRESS_URL)
                 .build();
@@ -50,7 +50,7 @@ public class BaseApi {
 
     public static Retrofit getRetrofitThree() {
         return new Retrofit.Builder().addConverterFactory(FastJsonConverterFactory.create())
-                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .addCallAdapterFactory(RxJava3CallAdapterFactory.create())
                 .client(getOkhttpInstance())
                 .baseUrl(BASE_ADDRESS_URL)
                 .build();
@@ -63,7 +63,7 @@ public class BaseApi {
                 .addConverterFactory(FastJsonConverterFactory.create())
                 .client(getOkhttpInstance())
                 .baseUrl(baseurl)
-                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .addCallAdapterFactory(RxJava3CallAdapterFactory.create())
                 .build();
     }
 

app/src/main/java/cn/dankal/basiclib/api/HomeService.java

@@ -7,7 +7,7 @@ import cn.dankal.entities.home.HotSearchListEntity;
 import cn.dankal.entities.home.RestaurantEntity;
 import cn.dankal.entities.home.TopHomeInfoEntity;
 import cn.dankal.entities.shop.ShopEntity;
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import retrofit2.http.Body;
 import retrofit2.http.GET;
 import retrofit2.http.POST;

app/src/main/java/cn/dankal/basiclib/api/HomeServiceFactory.java

@@ -7,9 +7,9 @@ import cn.dankal.entities.home.BottomAroundEntity;
 import cn.dankal.entities.home.HotSearchListEntity;
 import cn.dankal.entities.home.RestaurantEntity;
 import cn.dankal.entities.home.TopHomeInfoEntity;
-import io.reactivex.Observable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 import retrofit2.Retrofit;
 
 /**

app/src/main/java/cn/dankal/basiclib/api/MallService.java

@@ -19,7 +19,7 @@ import cn.dankal.entities.shop.RecommendShopEntity;
 import cn.dankal.entities.shop.ShopDetailEntity;
 import cn.dankal.entities.shop.ShopEntity;
 import cn.dankal.entities.shop.StoreEntity;
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import okhttp3.ResponseBody;
 import retrofit2.http.Body;
 import retrofit2.http.GET;

app/src/main/java/cn/dankal/basiclib/api/MallServiceFactory.java

@@ -19,9 +19,9 @@ import cn.dankal.entities.shop.RecommendShopEntity;
 import cn.dankal.entities.shop.ShopDetailEntity;
 import cn.dankal.entities.shop.ShopEntity;
 import cn.dankal.entities.shop.StoreEntity;
-import io.reactivex.Observable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 import okhttp3.ResponseBody;
 import retrofit2.Retrofit;
 

app/src/main/java/cn/dankal/basiclib/api/RestaurantService.java

@@ -15,7 +15,7 @@ import cn.dankal.entities.home.RestaurantDetailEntity;
 import cn.dankal.entities.home.RestaurantSpecEntity;
 import cn.dankal.entities.shop.QueueEntity;
 import cn.dankal.entities.shop.ShopTypeContentEntity;
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import okhttp3.ResponseBody;
 import retrofit2.http.Body;
 import retrofit2.http.GET;

app/src/main/java/cn/dankal/basiclib/api/RestaurantServiceFactory.java

@@ -16,9 +16,9 @@ import cn.dankal.entities.home.RestaurantDetailEntity;
 import cn.dankal.entities.home.RestaurantSpecEntity;
 import cn.dankal.entities.shop.QueueEntity;
 import cn.dankal.entities.shop.ShopTypeContentEntity;
-import io.reactivex.Observable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 import okhttp3.ResponseBody;
 import retrofit2.Retrofit;
 

app/src/main/java/cn/dankal/basiclib/api/UserService.java

@@ -42,7 +42,7 @@ import cn.dankal.entities.user.UserCosTokenEntity;
 import cn.dankal.entities.user.UserInfoEntity;
 import cn.dankal.entities.user.UserQueueListEntity;
 import cn.dankal.entities.user.UserRegisterSuccessEntity;
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import okhttp3.ResponseBody;
 import retrofit2.http.Body;
 import retrofit2.http.DELETE;

app/src/main/java/cn/dankal/basiclib/api/UserServiceFactory.java

@@ -32,9 +32,9 @@ import cn.dankal.entities.user.StampListEntity;
 import cn.dankal.entities.user.UserCosTokenEntity;
 import cn.dankal.entities.user.UserInfoEntity;
 import cn.dankal.entities.user.UserRegisterSuccessEntity;
-import io.reactivex.Observable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 import okhttp3.ResponseBody;
 import retrofit2.Retrofit;
 

app/src/main/java/cn/dankal/basiclib/base/BaseView.java

 package cn.dankal.basiclib.base;
 
-import io.reactivex.disposables.Disposable;
+
+import io.reactivex.rxjava3.disposables.Disposable;
 
 /**
  * description: MVP模式中V层接口

app/src/main/java/cn/dankal/basiclib/base/activity/BaseActivity.java

@@ -20,7 +20,6 @@ import android.view.WindowManager;
 
 
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.tbruyelle.rxpermissions2.RxPermissions;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -39,6 +38,7 @@ import cn.dankal.basiclib.util.SPUtils;
 import cn.dankal.basiclib.util.TitleBarUtils;
 import cn.dankal.basiclib.util.ToastUtils;
 import cn.dankal.basiclib.util.language.MultiLanguage;
+import cn.dankal.basiclib.util.rx.RxPermissions;
 import cn.dankal.basiclib.widget.CommonDialog;
 import cn.dankal.basiclib.widget.DebugWatermarkText;
 import cn.dankal.basiclib.widget.TipDialog;
@@ -47,9 +47,9 @@ import cn.dankal.basiclib.widget.statubar.StatusBarUtil;
 import cn.dankal.basiclib.widget.titlebar.ITitleBar;
 import cn.dankal.basiclib.widget.titlebar.SingleTextTitle;
 import cn.dankal.client.R;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
+import io.reactivex.rxjava3.disposables.CompositeDisposable;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Consumer;
 
 /**
  * @author Dankal Android Developer

app/src/main/java/cn/dankal/basiclib/base/fragment/BaseFragment.java

@@ -15,11 +15,9 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 
-import com.tbruyelle.rxpermissions2.RxPermissions;
-
-
 
 import cn.dankal.basiclib.DKUserManager;
+import cn.dankal.basiclib.util.rx.RxPermissions;
 import cn.dankal.client.R;
 import cn.dankal.basiclib.base.BaseView;
 import cn.dankal.basiclib.base.activity.BaseActivity;
@@ -32,9 +30,9 @@ import cn.dankal.basiclib.widget.CommonDialog;
 import cn.dankal.basiclib.widget.TipDialog;
 import cn.dankal.basiclib.widget.titlebar.ITitleBar;
 import cn.dankal.basiclib.widget.titlebar.SingleTextTitle;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
+import io.reactivex.rxjava3.disposables.CompositeDisposable;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Consumer;
 
 /**
  *

app/src/main/java/cn/dankal/basiclib/common/qiniu/QiniuApi.java

 package cn.dankal.basiclib.common.qiniu;
 
 import cn.dankal.basiclib.api.BaseApi;
-import io.reactivex.Observable;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * Created by Fred on 2016/11/29.

app/src/main/java/cn/dankal/basiclib/common/qiniu/QiniuService.java

 package cn.dankal.basiclib.common.qiniu;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import retrofit2.http.GET;
 
 /**

app/src/main/java/cn/dankal/basiclib/common/qiniu/UploadHelper.java

@@ -2,7 +2,7 @@ package cn.dankal.basiclib.common.qiniu;
 
 
 import cn.dankal.basiclib.util.StringUtil;
-import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 
 
 /**

app/src/main/java/cn/dankal/basiclib/common/sms/SmsCodeImpl.java

@@ -15,9 +15,9 @@ import cn.dankal.basiclib.util.ActivityManager;
 import cn.dankal.basiclib.util.StringUtil;
 import cn.dankal.basiclib.util.ToastUtils;
 import cn.dankal.entities.user.CodeEntity;
-import io.reactivex.Flowable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 /**
  * Date: 2018/8/1.

app/src/main/java/cn/dankal/basiclib/eventbus/AppBus.java

@@ -6,10 +6,10 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.subjects.Subject;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.subjects.Subject;
 
 /**
  * Created by Fred on 2018/07/17.

app/src/main/java/cn/dankal/basiclib/rx/AbstractDialogSubscriber.java

 package cn.dankal.basiclib.rx;
 
 import cn.dankal.basiclib.base.BaseView;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 /**
  * @author Dankal Android Developer

app/src/main/java/cn/dankal/basiclib/rx/AbstractNoDialogSubscriber.java

 package cn.dankal.basiclib.rx;
 
 import cn.dankal.basiclib.base.BaseView;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 /**
  * @author Dankal Android Developer

app/src/main/java/cn/dankal/basiclib/rx/AbstractSubscriber.java

@@ -8,8 +8,8 @@ import cn.dankal.basiclib.base.BaseView;
 import cn.dankal.basiclib.domain.HttpStatusCode;
 import cn.dankal.basiclib.exception.LocalException;
 import cn.dankal.basiclib.util.ActivityUtils;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 /**
  * @author Dankal Android Developer

app/src/main/java/cn/dankal/basiclib/rx/NormalSubscriber.java

@@ -10,7 +10,7 @@ import cn.dankal.client.R;
 import cn.dankal.basiclib.domain.HttpStatusCode;
 import cn.dankal.basiclib.exception.LocalException;
 import cn.dankal.basiclib.util.ActivityUtils;
-import io.reactivex.Observer;
+import io.reactivex.rxjava3.core.Observer;
 
 /**
  * @author Dankal Android Developer

app/src/main/java/cn/dankal/basiclib/rx/RefreshTokenHelper.java

 package cn.dankal.basiclib.rx;
 
 import cn.dankal.basiclib.exception.ExceptionHandle;
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableSource;
+import io.reactivex.rxjava3.functions.Function;
+
 
 /**
  * @author Dankal Android Develoer

app/src/main/java/cn/dankal/basiclib/template/personal/ChangeAvatarImpl.java

@@ -12,7 +12,7 @@ import android.support.annotation.NonNull;
 import android.support.v4.content.FileProvider;
 import android.widget.ImageView;
 
-import com.tbruyelle.rxpermissions2.RxPermissions;
+import cn.dankal.basiclib.util.rx.RxPermissions;
 
 import java.io.File;
 import java.text.DecimalFormat;

app/src/main/java/cn/dankal/basiclib/util/DensityAdaptationUtils.java

@@ -7,7 +7,8 @@ import android.content.res.Configuration;
 import android.support.annotation.Nullable;
 import android.util.DisplayMetrics;
 
-import io.reactivex.annotations.NonNull;
+import io.reactivex.rxjava3.annotations.NonNull;
+
 
 /**
  * description: 今日头条适配方案

app/src/main/java/cn/dankal/basiclib/util/HnUploadListImageControl.java

@@ -7,14 +7,15 @@ import java.util.List;
 import java.util.Map;
 
 import cn.dankal.basiclib.cos.CosUploadUtil;
-import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.ObservableOnSubscribe;
-import io.reactivex.ObservableSource;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.functions.Consumer;
-import io.reactivex.functions.Function;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableEmitter;
+import io.reactivex.rxjava3.core.ObservableOnSubscribe;
+import io.reactivex.rxjava3.core.ObservableSource;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+
 
 /**
  * Created by zhengpeng on 2019/7/13.

app/src/main/java/cn/dankal/basiclib/util/ToastUtils.java

@@ -15,6 +15,7 @@ import android.os.Looper;
 import android.support.annotation.ColorInt;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.LayoutRes;
+import android.support.annotation.NonNull;
 import android.support.annotation.StringRes;
 import android.util.Log;
 import android.view.Display;
@@ -27,7 +28,6 @@ import android.widget.Toast;
 
 import java.lang.reflect.Field;
 
-import io.reactivex.annotations.NonNull;
 
 public class ToastUtils {
 

app/src/main/java/cn/dankal/basiclib/util/rx/Permission.java

+package cn.dankal.basiclib.util.rx;
+
+/**
+ * Author: roczheng
+ * Date: 2021/3/4
+ * Time: 20:28
+ * Description:
+ */
+import java.util.List;
+
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.functions.BiConsumer;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.functions.Predicate;
+
+public class Permission {
+    public final String name;
+    public final boolean granted;
+    public final boolean shouldShowRequestPermissionRationale;
+
+    public Permission(String name, boolean granted) {
+        this(name, granted, false);
+    }
+
+    public Permission(String name, boolean granted, boolean shouldShowRequestPermissionRationale) {
+        this.name = name;
+        this.granted = granted;
+        this.shouldShowRequestPermissionRationale = shouldShowRequestPermissionRationale;
+    }
+
+    public Permission(List<Permission> permissions) {
+        name = combineName(permissions);
+        granted = combineGranted(permissions);
+        shouldShowRequestPermissionRationale = combineShouldShowRequestPermissionRationale(permissions);
+    }
+
+    @Override
+    @SuppressWarnings("SimplifiableIfStatement")
+    public boolean equals(final Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        final Permission that = (Permission) o;
+
+        if (granted != that.granted) return false;
+        if (shouldShowRequestPermissionRationale != that.shouldShowRequestPermissionRationale)
+            return false;
+        return name.equals(that.name);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = name.hashCode();
+        result = 31 * result + (granted ? 1 : 0);
+        result = 31 * result + (shouldShowRequestPermissionRationale ? 1 : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "Permission{" +
+                "name='" + name + '\'' +
+                ", granted=" + granted +
+                ", shouldShowRequestPermissionRationale=" + shouldShowRequestPermissionRationale +
+                '}';
+    }
+
+    private String combineName(List<Permission> permissions) {
+        return Observable.fromIterable(permissions)
+                .map(new Function<Permission, String>() {
+                    @Override
+                    public String apply(Permission permission) throws Exception {
+                        return permission.name;
+                    }
+                }).collectInto(new StringBuilder(), new BiConsumer<StringBuilder, String>() {
+                    @Override
+                    public void accept(StringBuilder s, String s2) throws Exception {
+                        if (s.length() == 0) {
+                            s.append(s2);
+                        } else {
+                            s.append(", ").append(s2);
+                        }
+                    }
+                }).blockingGet().toString();
+    }
+
+    private Boolean combineGranted(List<Permission> permissions) {
+        return Observable.fromIterable(permissions)
+                .all(new Predicate<Permission>() {
+                    @Override
+                    public boolean test(Permission permission) throws Exception {
+                        return permission.granted;
+                    }
+                }).blockingGet();
+    }
+
+    private Boolean combineShouldShowRequestPermissionRationale(List<Permission> permissions) {
+        return Observable.fromIterable(permissions)
+                .any(new Predicate<Permission>() {
+                    @Override
+                    public boolean test(Permission permission) throws Exception {
+                        return permission.shouldShowRequestPermissionRationale;
+                    }
+                }).blockingGet();
+    }
+}

app/src/main/java/cn/dankal/basiclib/util/rx/RxPermissions.java

+package cn.dankal.basiclib.util.rx;
+
+/**
+ * Author: roczheng
+ * Date: 2021/3/4
+ * Time: 20:20
+ * Description:
+ */
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.app.FragmentManager;
+import android.os.Build;
+import android.support.annotation.NonNull;
+import android.text.TextUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableSource;
+import io.reactivex.rxjava3.core.ObservableTransformer;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+
+public class RxPermissions {
+
+    static final String TAG = "RxPermissions";
+    static final Object TRIGGER = new Object();
+
+    RxPermissionsFragment mRxPermissionsFragment;
+
+    public RxPermissions(@NonNull Activity activity) {
+        mRxPermissionsFragment = getRxPermissionsFragment(activity);
+    }
+
+    private RxPermissionsFragment getRxPermissionsFragment(Activity activity) {
+        RxPermissionsFragment rxPermissionsFragment = findRxPermissionsFragment(activity);
+        boolean isNewInstance = rxPermissionsFragment == null;
+        if (isNewInstance) {
+            rxPermissionsFragment = new RxPermissionsFragment();
+            FragmentManager fragmentManager = activity.getFragmentManager();
+            fragmentManager
+                    .beginTransaction()
+                    .add(rxPermissionsFragment, TAG)
+                    .commitAllowingStateLoss();
+            fragmentManager.executePendingTransactions();
+        }
+        return rxPermissionsFragment;
+    }
+
+    private RxPermissionsFragment findRxPermissionsFragment(Activity activity) {
+        return (RxPermissionsFragment) activity.getFragmentManager().findFragmentByTag(TAG);
+    }
+
+    public void setLogging(boolean logging) {
+        mRxPermissionsFragment.setLogging(logging);
+    }
+
+    /**
+     * Map emitted items from the source observable into {@code true} if permissions in parameters
+     * are granted, or {@code false} if not.
+     * <p>
+     * If one or several permissions have never been requested, invoke the related framework method
+     * to ask the user if he allows the permissions.
+     */
+    @SuppressWarnings("WeakerAccess")
+    public <T> ObservableTransformer<T, Boolean> ensure(final String... permissions) {
+        return new ObservableTransformer<T, Boolean>() {
+            @Override
+            public ObservableSource<Boolean> apply(Observable<T> o) {
+                return request(o, permissions)
+                        // Transform Observable<Permission> to Observable<Boolean>
+                        .buffer(permissions.length)
+                        .flatMap(new Function<List<Permission>, ObservableSource<Boolean>>() {
+                            @Override
+                            public ObservableSource<Boolean> apply(List<Permission> permissions) throws Exception {
+                                if (permissions.isEmpty()) {
+                                    // Occurs during orientation change, when the subject receives onComplete.
+                                    // In that case we don't want to propagate that empty list to the
+                                    // subscriber, only the onComplete.
+                                    return Observable.empty();
+                                }
+                                // Return true if all permissions are granted.
+                                for (Permission p : permissions) {
+                                    if (!p.granted) {
+                                        return Observable.just(false);
+                                    }
+                                }
+                                return Observable.just(true);
+                            }
+                        });
+            }
+        };
+    }
+
+    /**
+     * Map emitted items from the source observable into {@link Permission} objects for each
+     * permission in parameters.
+     * <p>
+     * If one or several permissions have never been requested, invoke the related framework method
+     * to ask the user if he allows the permissions.
+     */
+    @SuppressWarnings("WeakerAccess")
+    public <T> ObservableTransformer<T, Permission> ensureEach(final String... permissions) {
+        return new ObservableTransformer<T, Permission>() {
+            @Override
+            public ObservableSource<Permission> apply(Observable<T> o) {
+                return request(o, permissions);
+            }
+        };
+    }
+
+    /**
+     * Map emitted items from the source observable into one combined {@link Permission} object. Only if all permissions are granted,
+     * permission also will be granted. If any permission has {@code shouldShowRationale} checked, than result also has it checked.
+     * <p>
+     * If one or several permissions have never been requested, invoke the related framework method
+     * to ask the user if he allows the permissions.
+     */
+    public <T> ObservableTransformer<T, Permission> ensureEachCombined(final String... permissions) {
+        return new ObservableTransformer<T, Permission>() {
+            @Override
+            public ObservableSource<Permission> apply(Observable<T> o) {
+                return request(o, permissions)
+                        .buffer(permissions.length)
+                        .flatMap(new Function<List<Permission>, ObservableSource<Permission>>() {
+                            @Override
+                            public ObservableSource<Permission> apply(List<Permission> permissions) throws Exception {
+                                if (permissions.isEmpty()) {
+                                    return Observable.empty();
+                                }
+                                return Observable.just(new Permission(permissions));
+                            }
+                        });
+            }
+        };
+    }
+
+    /**
+     * Request permissions immediately, <b>must be invoked during initialization phase
+     * of your application</b>.
+     */
+    @SuppressWarnings({"WeakerAccess", "unused"})
+    public Observable<Boolean> request(final String... permissions) {
+        return Observable.just(TRIGGER).compose(ensure(permissions));
+    }
+
+    /**
+     * Request permissions immediately, <b>must be invoked during initialization phase
+     * of your application</b>.
+     */
+    @SuppressWarnings({"WeakerAccess", "unused"})
+    public Observable<Permission> requestEach(final String... permissions) {
+        return Observable.just(TRIGGER).compose(ensureEach(permissions));
+    }
+
+    /**
+     * Request permissions immediately, <b>must be invoked during initialization phase
+     * of your application</b>.
+     */
+    public Observable<Permission> requestEachCombined(final String... permissions){
+        return Observable.just(TRIGGER).compose(ensureEachCombined(permissions));
+    }
+
+    private Observable<Permission> request(final Observable<?> trigger, final String... permissions) {
+        if (permissions == null || permissions.length == 0) {
+            throw new IllegalArgumentException("RxPermissions.request/requestEach requires at least one input permission");
+        }
+        return oneOf(trigger, pending(permissions))
+                .flatMap(new Function<Object, Observable<Permission>>() {
+                    @Override
+                    public Observable<Permission> apply(Object o) throws Exception {
+                        return requestImplementation(permissions);
+                    }
+                });
+    }
+
+    private Observable<?> pending(final String... permissions) {
+        for (String p : permissions) {
+            if (!mRxPermissionsFragment.containsByPermission(p)) {
+                return Observable.empty();
+            }
+        }
+        return Observable.just(TRIGGER);
+    }
+
+    private Observable<?> oneOf(Observable<?> trigger, Observable<?> pending) {
+        if (trigger == null) {
+            return Observable.just(TRIGGER);
+        }
+        return Observable.merge(trigger, pending);
+    }
+
+    @TargetApi(Build.VERSION_CODES.M)
+    private Observable<Permission> requestImplementation(final String... permissions) {
+        List<Observable<Permission>> list = new ArrayList<>(permissions.length);
+        List<String> unrequestedPermissions = new ArrayList<>();
+
+        // In case of multiple permissions, we create an Observable for each of them.
+        // At the end, the observables are combined to have a unique response.
+        for (String permission : permissions) {
+            mRxPermissionsFragment.log("Requesting permission " + permission);
+            if (isGranted(permission)) {
+                // Already granted, or not Android M
+                // Return a granted Permission object.
+                list.add(Observable.just(new Permission(permission, true, false)));
+                continue;
+            }
+
+            if (isRevoked(permission)) {
+                // Revoked by a policy, return a denied Permission object.
+                list.add(Observable.just(new Permission(permission, false, false)));
+                continue;
+            }
+
+            PublishSubject<Permission> subject = mRxPermissionsFragment.getSubjectByPermission(permission);
+            // Create a new subject if not exists
+            if (subject == null) {
+                unrequestedPermissions.add(permission);
+                subject = PublishSubject.create();
+                mRxPermissionsFragment.setSubjectForPermission(permission, subject);
+            }
+
+            list.add(subject);
+        }
+
+        if (!unrequestedPermissions.isEmpty()) {
+            String[] unrequestedPermissionsArray = unrequestedPermissions.toArray(new String[unrequestedPermissions.size()]);
+            requestPermissionsFromFragment(unrequestedPermissionsArray);
+        }
+        return Observable.concat(Observable.fromIterable(list));
+    }
+
+    /**
+     * Invokes Activity.shouldShowRequestPermissionRationale and wraps
+     * the returned value in an observable.
+     * <p>
+     * In case of multiple permissions, only emits true if
+     * Activity.shouldShowRequestPermissionRationale returned true for
+     * all revoked permissions.
+     * <p>
+     * You shouldn't call this method if all permissions have been granted.
+     * <p>
+     * For SDK &lt; 23, the observable will always emit false.
+     */
+    @SuppressWarnings("WeakerAccess")
+    public Observable<Boolean> shouldShowRequestPermissionRationale(final Activity activity, final String... permissions) {
+        if (!isMarshmallow()) {
+            return Observable.just(false);
+        }
+        return Observable.just(shouldShowRequestPermissionRationaleImplementation(activity, permissions));
+    }
+
+    @TargetApi(Build.VERSION_CODES.M)
+    private boolean shouldShowRequestPermissionRationaleImplementation(final Activity activity, final String... permissions) {
+        for (String p : permissions) {
+            if (!isGranted(p) && !activity.shouldShowRequestPermissionRationale(p)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @TargetApi(Build.VERSION_CODES.M)
+    void requestPermissionsFromFragment(String[] permissions) {
+        mRxPermissionsFragment.log("requestPermissionsFromFragment " + TextUtils.join(", ", permissions));
+        mRxPermissionsFragment.requestPermissions(permissions);
+    }
+
+    /**
+     * Returns true if the permission is already granted.
+     * <p>
+     * Always true if SDK &lt; 23.
+     */
+    @SuppressWarnings("WeakerAccess")
+    public boolean isGranted(String permission) {
+        return !isMarshmallow() || mRxPermissionsFragment.isGranted(permission);
+    }
+
+    /**
+     * Returns true if the permission has been revoked by a policy.
+     * <p>
+     * Always false if SDK &lt; 23.
+     */
+    @SuppressWarnings("WeakerAccess")
+    public boolean isRevoked(String permission) {
+        return isMarshmallow() && mRxPermissionsFragment.isRevoked(permission);
+    }
+
+    boolean isMarshmallow() {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
+    }
+
+    void onRequestPermissionsResult(String permissions[], int[] grantResults) {
+        mRxPermissionsFragment.onRequestPermissionsResult(permissions, grantResults, new boolean[permissions.length]);
+    }
+
+}
+

app/src/main/java/cn/dankal/basiclib/util/rx/RxPermissionsFragment.java

+package cn.dankal.basiclib.util.rx;
+
+/**
+ * Author: roczheng
+ * Date: 2021/3/4
+ * Time: 20:22
+ * Description:
+ */
+
+import android.annotation.TargetApi;
+import android.app.Fragment;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.util.Log;
+
+import com.luck.picture.lib.permissions.RxPermissions;
+
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import java.util.HashMap;
+import java.util.Map;
+
+public class RxPermissionsFragment extends Fragment {
+
+    private static final int PERMISSIONS_REQUEST_CODE = 42;
+
+    // Contains all the current permission requests.
+    // Once granted or denied, they are removed from it.
+    private Map<String, PublishSubject<Permission>> mSubjects = new HashMap<>();
+    private boolean mLogging;
+
+    public RxPermissionsFragment() {
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setRetainInstance(true);
+    }
+
+    @TargetApi(Build.VERSION_CODES.M)
+    void requestPermissions(@NonNull String[] permissions) {
+        requestPermissions(permissions, PERMISSIONS_REQUEST_CODE);
+    }
+
+    @TargetApi(Build.VERSION_CODES.M)
+    public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+        if (requestCode != PERMISSIONS_REQUEST_CODE) return;
+
+        boolean[] shouldShowRequestPermissionRationale = new boolean[permissions.length];
+
+        for (int i = 0; i < permissions.length; i++) {
+            shouldShowRequestPermissionRationale[i] = shouldShowRequestPermissionRationale(permissions[i]);
+        }
+
+        onRequestPermissionsResult(permissions, grantResults, shouldShowRequestPermissionRationale);
+    }
+
+    void onRequestPermissionsResult(String permissions[], int[] grantResults, boolean[] shouldShowRequestPermissionRationale) {
+        for (int i = 0, size = permissions.length; i < size; i++) {
+            log("onRequestPermissionsResult  " + permissions[i]);
+            // Find the corresponding subject
+            PublishSubject<Permission> subject = mSubjects.get(permissions[i]);
+            if (subject == null) {
+                // No subject found
+                Log.e(RxPermissions.TAG, "RxPermissions.onRequestPermissionsResult invoked but didn't find the corresponding permission request.");
+                return;
+            }
+            mSubjects.remove(permissions[i]);
+            boolean granted = grantResults[i] == PackageManager.PERMISSION_GRANTED;
+            subject.onNext(new Permission(permissions[i], granted, shouldShowRequestPermissionRationale[i]));
+            subject.onComplete();
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.M)
+    boolean isGranted(String permission) {
+        return getActivity().checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED;
+    }
+
+    @TargetApi(Build.VERSION_CODES.M)
+    boolean isRevoked(String permission) {
+        return getActivity().getPackageManager().isPermissionRevokedByPolicy(permission, getActivity().getPackageName());
+    }
+
+    public void setLogging(boolean logging) {
+        mLogging = logging;
+    }
+
+    public PublishSubject<Permission> getSubjectByPermission(@NonNull String permission) {
+        return mSubjects.get(permission);
+    }
+
+    public boolean containsByPermission(@NonNull String permission) {
+        return mSubjects.containsKey(permission);
+    }
+
+    public PublishSubject<Permission> setSubjectForPermission(@NonNull String permission, @NonNull PublishSubject<Permission> subject) {
+        return mSubjects.put(permission, subject);
+    }
+
+    void log(String message) {
+        if (mLogging) {
+            Log.d(RxPermissions.TAG, message);
+        }
+    }
+
+}

app/src/main/java/cn/dankal/basiclib/widget/banner/DkBanner.java

@@ -25,12 +25,11 @@ import java.util.concurrent.TimeUnit;
 
 import cn.dankal.client.R;
 import cn.dankal.basiclib.util.Logger;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 import static cn.dankal.basiclib.util.DisplayHelper.dp2px;
 

app/src/main/java/cn/dankal/basiclib/widget/banner/DkBannerTow.java

@@ -22,11 +22,11 @@ import java.util.concurrent.TimeUnit;
 
 import cn.dankal.client.R;
 import cn.dankal.basiclib.util.Logger;
-import io.reactivex.Observable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 import static cn.dankal.basiclib.util.DisplayHelper.dp2px;
 

app/src/main/java/cn/dankal/client/MainActivity.kt

@@ -23,6 +23,7 @@ import cn.dankal.basiclib.base.activity.BaseActivity
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber
 import cn.dankal.basiclib.util.SPUtils
 import cn.dankal.basiclib.util.ToastUtils
+import cn.dankal.basiclib.util.rx.RxPermissions
 import cn.dankal.basiclib.widget.CommonDialog
 import cn.dankal.basiclib.widget.statubar.QMUIStatusBarHelper
 import cn.dankal.entities.home.QRCodeEntity
@@ -38,11 +39,9 @@ import com.google.android.gms.maps.OnMapReadyCallback
 import com.google.android.gms.tasks.OnCompleteListener
 import com.google.firebase.iid.FirebaseInstanceId
 import com.google.gson.Gson
-import com.tbruyelle.rxpermissions2.RxPermissions
 import com.yanzhenjie.permission.Permission
 import com.yzq.zxinglibrary.common.Constant
-import io.reactivex.disposables.Disposable
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.android.synthetic.main.activity_main_sdk.*
 import okhttp3.ResponseBody
 import java.lang.reflect.Field

app/src/main/java/cn/dankal/client/adapter/car/CarShopAdapter.java

@@ -26,7 +26,7 @@ import cn.dankal.entities.event.UpdateCarEvent;
 import cn.dankal.entities.shop.AddCarResultEntity;
 import cn.dankal.client.R;
 import cn.dankal.entities.car.ShopCarEntity;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.Disposable;
 import okhttp3.ResponseBody;
 
 /**

app/src/main/java/cn/dankal/client/ui/car/CarFragment.kt

@@ -19,7 +19,7 @@ import cn.dankal.entities.event.UpdateCarEvent
 import cn.dankal.client.constants.ConstantsShopType
 import cn.dankal.client.ui.shop.SureOrderActivity
 import cn.dankal.client.util.UIUtile
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.android.synthetic.main.fragment_car.*
 import kotlinx.android.synthetic.main.fragment_select_coupon.*
 import okhttp3.ResponseBody

app/src/main/java/cn/dankal/client/ui/home/FoodAllEvaluateActivity.kt

@@ -14,7 +14,7 @@ import com.scwang.smartrefresh.layout.api.RefreshLayout
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter
 import com.scwang.smartrefresh.layout.header.ClassicsHeader
 import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.android.synthetic.main.activity_food_all_evaluate.*
 
 /**

app/src/main/java/cn/dankal/client/ui/home/HomeActivity.kt

@@ -31,7 +31,7 @@ import cn.dankal.entities.home.TopHomeInfoEntity
 import com.scwang.smartrefresh.layout.header.ClassicsHeader
 import com.yanzhenjie.permission.Permission
 import com.yzq.zxinglibrary.android.CaptureActivity
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.android.synthetic.main.fragment_home.*
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe

app/src/main/java/cn/dankal/client/ui/home/HomeFragment.kt

@@ -39,7 +39,7 @@ import cn.dankal.entities.event.LocationChangeEvent
 import com.scwang.smartrefresh.layout.header.ClassicsHeader
 import com.yanzhenjie.permission.Permission
 import com.yzq.zxinglibrary.android.CaptureActivity
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.android.synthetic.main.fragment_home.*
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe

app/src/main/java/cn/dankal/client/ui/home/MenuItemFragment.java

@@ -17,7 +17,7 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.tbruyelle.rxpermissions2.RxPermissions;
+import cn.dankal.basiclib.util.rx.RxPermissions;
 import com.yanzhenjie.permission.Permission;
 import com.yzq.zxinglibrary.android.CaptureActivity;
 import com.zhy.view.flowlayout.FlowLayout;
@@ -51,7 +51,7 @@ import cn.dankal.client.ui.home.details.MerchantDetailsActivity;
 import cn.dankal.client.ui.home.details.RecommendMerchantActivity;
 import cn.dankal.client.ui.home.map.GoogleMapsActivity;
 import cn.dankal.client.util.UIUtile;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 
 public class MenuItemFragment extends BaseFragment {

app/src/main/java/cn/dankal/client/ui/home/details/DetailsShopFragment.java

@@ -67,7 +67,7 @@ import cn.dankal.client.constants.ConstantsRestaurantType;
 import cn.dankal.client.ui.shop.QueueActivity;
 import cn.dankal.client.ui.shop.QueueResultActivity;
 import cn.dankal.client.util.UIUtile;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 
 public class DetailsShopFragment extends BaseFragment implements OnRefreshLoadMoreListener {

app/src/main/java/cn/dankal/client/ui/home/details/MerchantDetailsActivity.java

@@ -49,7 +49,7 @@ import cn.dankal.client.R;
 import cn.dankal.client.constants.ConstantsHomeType;
 import cn.dankal.client.constants.ConstantsShopType;
 import cn.dankal.client.ui.home.ScanResultActivity;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 /**
  * 상가 의 상세 한 상황.

app/src/main/java/cn/dankal/client/ui/home/details/MerchantMallFragment.java

@@ -34,7 +34,7 @@ import cn.dankal.client.adapter.shop.MallTypeContentAdapter;
 import cn.dankal.client.adapter.shop.MallTypeTitleAdapter;
 import cn.dankal.client.constants.ConstantsShopType;
 import cn.dankal.client.ui.shop.ShopDetailActivity;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 /**
  * Created by zhengpeng on 2019/6/24.

app/src/main/java/cn/dankal/client/ui/home/details/OrderResultActivity.kt

@@ -28,7 +28,7 @@ import cn.dankal.entities.event.ShopCarRefreshEvent
 import com.google.gson.Gson
 import com.yzq.zxinglibrary.android.CaptureActivity
 import com.yzq.zxinglibrary.common.Constant
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.android.synthetic.main.activity_order_result.*
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.ThreadMode

app/src/main/java/cn/dankal/client/ui/home/details/RecommendMerchantActivity.java

@@ -22,7 +22,7 @@ import cn.dankal.basiclib.util.image.PicUtils;
 import cn.dankal.client.util.UIUtile;
 import cn.dankal.entities.home.RestaurantEntity;
 import cn.dankal.client.R;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 /**
  * 추천 업 체

app/src/main/java/cn/dankal/client/ui/home/details/SelectCouponFragment.kt

@@ -10,7 +10,7 @@ import cn.dankal.basiclib.rx.AbstractDialogSubscriber
 import cn.dankal.client.R
 import cn.dankal.entities.user.CouponListEntity
 import cn.dankal.client.adapter.personal.MyCouponAdapter
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.android.synthetic.main.fragment_select_coupon.*
 
 

app/src/main/java/cn/dankal/client/ui/home/details/presenter/DishesPresenter.java

@@ -8,7 +8,7 @@ import cn.dankal.basiclib.rx.AbstractDialogSubscriber;
 import cn.dankal.client.ui.home.details.view.DishesView;
 import cn.dankal.entities.home.BusinessTimeEntity;
 import cn.dankal.entities.home.IsOrderStoreEntity;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 /**
  * Created by zhengpeng on 2019/8/10.

app/src/main/java/cn/dankal/client/ui/personal/AfterListActivity.kt

@@ -17,7 +17,7 @@ import com.scwang.smartrefresh.layout.api.RefreshLayout
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter
 import com.scwang.smartrefresh.layout.header.ClassicsHeader
 import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.android.synthetic.main.activity_after_list.*
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe

app/src/main/java/cn/dankal/client/ui/personal/MyCouponFragment.kt

@@ -10,7 +10,7 @@ import cn.dankal.client.R
 import cn.dankal.entities.user.CouponListEntity
 import cn.dankal.client.adapter.personal.MyCouponAdapter
 import cn.dankal.client.util.UIUtile
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.android.synthetic.main.fragment_select_coupon.*
 
 

app/src/main/java/cn/dankal/client/ui/personal/MyQueueFragment.java

@@ -21,7 +21,7 @@ import cn.dankal.entities.personal.QueueEntity;
 import cn.dankal.client.R;
 import cn.dankal.client.adapter.personal.QueueListAdapter;
 import cn.dankal.client.constants.ConstantsRestaurantType;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 public class MyQueueFragment extends BaseFragment {
 

app/src/main/java/cn/dankal/client/ui/personal/PersonalFragment.kt

@@ -13,7 +13,7 @@ import cn.dankal.entities.user.UserInfoEntity
 import cn.dankal.client.R
 import cn.dankal.client.ui.personal.order.food.FoodOrderActivity
 import cn.dankal.client.ui.personal.order.mall.MallOrderActivity
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.android.synthetic.main.fragment_personal.*
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe

app/src/main/java/cn/dankal/client/ui/personal/PersonalInfoActivity.kt

@@ -24,7 +24,7 @@ import com.luck.picture.lib.PictureSelector
 import com.luck.picture.lib.config.PictureConfig
 import com.luck.picture.lib.config.PictureMimeType
 import com.luck.picture.lib.entity.LocalMedia
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.android.synthetic.main.activity_personal_info.*
 import okhttp3.ResponseBody
 import org.greenrobot.eventbus.EventBus

app/src/main/java/cn/dankal/client/ui/personal/SystemMessageActivity.kt

@@ -9,7 +9,7 @@ import cn.dankal.client.util.UIUtile
 import cn.dankal.entities.personal.SystemMessageEntity
 import com.chad.library.adapter.base.BaseViewHolder
 import com.scwang.smartrefresh.layout.api.RefreshLayout
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 
 class SystemMessageActivity : BaseListActivity<SystemMessageEntity.DataBean>() {
     override fun getItemLayout(): Int {

app/src/main/java/cn/dankal/client/ui/personal/UnCouponFragment.kt

@@ -10,7 +10,7 @@ import cn.dankal.client.R
 import cn.dankal.entities.user.CouponListEntity
 import cn.dankal.client.adapter.personal.MyCouponAdapter
 import cn.dankal.client.util.UIUtile
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.android.synthetic.main.fragment_select_coupon.*
 
 

app/src/main/java/cn/dankal/client/ui/personal/order/food/FoodEvaluationActivity.kt

@@ -39,7 +39,7 @@ import com.luck.picture.lib.PictureSelector
 import com.luck.picture.lib.config.PictureConfig
 import com.luck.picture.lib.config.PictureMimeType
 import com.luck.picture.lib.entity.LocalMedia
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.android.synthetic.main.activity_food_evaluation.*
 import kotlinx.android.synthetic.main.activity_merchant_home.*
 import okhttp3.ResponseBody

app/src/main/java/cn/dankal/client/ui/personal/order/food/FoodOrderFragment.kt

@@ -17,7 +17,7 @@ import com.scwang.smartrefresh.layout.api.RefreshLayout
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter
 import com.scwang.smartrefresh.layout.header.ClassicsHeader
 import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.android.synthetic.main.fragment_food_order.*
 
 private const val ARG_PARAM1 = "param1"

app/src/main/java/cn/dankal/client/ui/personal/order/mall/AfterSaleInfoActivity.kt

@@ -18,9 +18,9 @@ import cn.dankal.entities.personal.AfterInfoEntity
 import cn.dankal.entities.shop.MerchantHomeEntity
 import cn.dankal.client.R
 import cn.dankal.client.util.UIUtile
-import io.reactivex.Flowable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.android.synthetic.main.activity_after_sale_info.*
 import okhttp3.ResponseBody
 import org.greenrobot.eventbus.EventBus

app/src/main/java/cn/dankal/client/ui/personal/order/mall/ApplyAfterSaleTowActivity.kt

@@ -25,7 +25,7 @@ import com.luck.picture.lib.PictureSelector
 import com.luck.picture.lib.config.PictureConfig
 import com.luck.picture.lib.config.PictureMimeType
 import com.luck.picture.lib.entity.LocalMedia
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.android.synthetic.main.activity_apply_after_sale_tow.*
 import java.util.*
 import kotlin.collections.HashMap

app/src/main/java/cn/dankal/client/ui/personal/order/mall/ExpressActivity.java

@@ -21,9 +21,9 @@ import cn.dankal.entities.home.ExpressEntity;
 import cn.dankal.client.R;
 import cn.dankal.client.adapter.shop.ExpressAdapter;
 import cn.dankal.entities.shop.address.LogisticsEntity;
-import io.reactivex.Observable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class ExpressActivity extends BaseActivity {
 

app/src/main/java/cn/dankal/client/ui/personal/order/mall/LeaveMessageActivity.kt

@@ -21,7 +21,7 @@ import com.scwang.smartrefresh.layout.api.RefreshLayout
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter
 import com.scwang.smartrefresh.layout.header.ClassicsHeader
 import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.android.synthetic.main.activity_leave_message.*
 import okhttp3.ResponseBody
 

app/src/main/java/cn/dankal/client/ui/personal/order/mall/MallOrderDetailsActivity.kt

@@ -33,7 +33,7 @@ import cn.dankal.client.constants.ConstantsRestaurantType
 import cn.dankal.client.constants.ConstantsShopType
 import cn.dankal.client.ui.shop.MallPayResultActivity
 import cn.dankal.client.util.UIUtile
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.android.synthetic.main.activity_mall_order_details.*
 import okhttp3.ResponseBody
 

app/src/main/java/cn/dankal/client/ui/personal/order/mall/MallOrderDetailsPayActivity.kt

@@ -22,9 +22,9 @@ import cn.dankal.client.ui.shop.MallPayResultActivity
 import cn.dankal.client.util.UIUtile
 import com.mhq.smartorder.wxapi.WxConstants
 import com.tencent.mm.opensdk.modelpay.PayReq
-import io.reactivex.Flowable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.android.synthetic.main.activity_mall_order_pay_details.*
 import okhttp3.ResponseBody
 import org.greenrobot.eventbus.EventBus

app/src/main/java/cn/dankal/client/ui/personal/order/mall/MallOrderFragment.kt

@@ -26,7 +26,7 @@ import com.scwang.smartrefresh.layout.footer.ClassicsFooter
 import com.scwang.smartrefresh.layout.header.ClassicsHeader
 import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener
 import com.tencent.mm.opensdk.modelpay.PayReq
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.android.synthetic.main.fragment_mall_order.*
 import okhttp3.ResponseBody
 import org.greenrobot.eventbus.EventBus

app/src/main/java/cn/dankal/client/ui/shop/AddAddressActivity.java

@@ -37,10 +37,10 @@ import cn.dankal.entities.shop.AddressEntity;
 import cn.dankal.entities.shop.address.AddressListEntity;
 import cn.dankal.client.R;
 import cn.dankal.client.adapter.MyAutoCompleteTvAdapter;
-import io.reactivex.Observable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * Created by zhengpeng on 2019/5/7.

app/src/main/java/cn/dankal/client/ui/shop/CommentMallActivity.kt

@@ -20,7 +20,7 @@ import cn.dankal.client.constants.ConstantsShopType
 import cn.dankal.client.util.UIUtile
 import com.chad.library.adapter.base.BaseViewHolder
 import com.scwang.smartrefresh.layout.api.RefreshLayout
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.android.synthetic.main.activity_comment_mall.*
 import java.util.HashMap
 

app/src/main/java/cn/dankal/client/ui/shop/DetailsMerchantFragment.java

@@ -35,7 +35,7 @@ import cn.dankal.client.R;
 import cn.dankal.client.adapter.shop.MallTypeContentAdapter;
 import cn.dankal.client.adapter.shop.MallTypeTitleAdapter;
 import cn.dankal.client.constants.ConstantsShopType;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 
 public class DetailsMerchantFragment extends BaseFragment implements OnRefreshLoadMoreListener {

app/src/main/java/cn/dankal/client/ui/shop/MallEvaluateDetailsActivity.kt

@@ -17,7 +17,7 @@ import cn.dankal.client.adapter.shop.CommentImageAdapter
 import cn.dankal.client.constants.ConstantsShopType
 import com.chad.library.adapter.base.BaseViewHolder
 import com.scwang.smartrefresh.layout.api.RefreshLayout
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 
 /**
  * 상세 한 상황 을 평가 하 다.

app/src/main/java/cn/dankal/client/ui/shop/MallListActivity.kt

@@ -19,7 +19,7 @@ import com.scwang.smartrefresh.layout.api.RefreshLayout
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter
 import com.scwang.smartrefresh.layout.header.ClassicsHeader
 import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.android.synthetic.main.activity_mall_list.*
 import java.util.HashMap
 

app/src/main/java/cn/dankal/client/ui/shop/ShopDetailActivity.kt

@@ -37,7 +37,7 @@ import cn.dankal.client.util.UIUtile
 import com.zhy.view.flowlayout.FlowLayout
 import com.zhy.view.flowlayout.TagAdapter
 import com.zhy.view.flowlayout.TagFlowLayout
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.android.synthetic.main.activity_shop_detail.*
 import kotlinx.android.synthetic.main.item_mall_evaluation.*
 import okhttp3.ResponseBody

app/src/main/java/cn/dankal/client/ui/shop/ShopItemFragment.java

@@ -33,7 +33,7 @@ import cn.dankal.client.R;
 import cn.dankal.client.adapter.shop.ShopAdapter;
 import cn.dankal.entities.shop.ShopEntity;
 import cn.dankal.client.constants.ConstantsShopType;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 public class ShopItemFragment extends BaseFragment {
 

app/src/main/java/cn/dankal/user/login/LoginActivity.kt

@@ -27,12 +27,12 @@ import kotlinx.android.synthetic.main.activity_login_sdk.*
 import com.google.android.gms.tasks.OnCompleteListener
 import com.google.firebase.iid.FirebaseInstanceId
 import com.mhq.smartorder.wxapi.WXEntryActivity
-import com.tbruyelle.rxpermissions2.RxPermissions
+import cn.dankal.basiclib.util.rx.RxPermissions
 import com.tencent.mm.opensdk.modelmsg.SendAuth
 import com.tencent.mm.opensdk.openapi.IWXAPI
 import com.tencent.mm.opensdk.openapi.WXAPIFactory
 import com.yanzhenjie.permission.Permission
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import okhttp3.ResponseBody
 
 

app/src/main/java/com/luck/picture/lib/PictureBaseActivity.java

@@ -38,11 +38,11 @@ import java.util.List;
 
 import cn.dankal.basiclib.util.language.MultiLanguage;
 import cn.dankal.client.R;
-import io.reactivex.Flowable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.functions.Consumer;
-import io.reactivex.functions.Function;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.functions.Consumer;;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * @author：luck

app/src/main/java/com/luck/picture/lib/PictureExternalPreviewActivity.java

@@ -52,8 +52,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import cn.dankal.client.R;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 /**
  * author：luck

app/src/main/java/com/luck/picture/lib/PictureSelectorActivity.java

@@ -58,8 +58,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import cn.dankal.client.R;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 /**
  * @author：luck

app/src/main/java/com/luck/picture/lib/permissions/Permission.java

@@ -13,11 +13,11 @@ public class Permission {
     public final boolean granted;
     public final boolean shouldShowRequestPermissionRationale;
 
-    Permission(String name, boolean granted) {
+    public Permission(String name, boolean granted) {
         this(name, granted, false);
     }
 
-    Permission(String name, boolean granted, boolean shouldShowRequestPermissionRationale) {
+    public  Permission(String name, boolean granted, boolean shouldShowRequestPermissionRationale) {
         this.name = name;
         this.granted = granted;
         this.shouldShowRequestPermissionRationale = shouldShowRequestPermissionRationale;

app/src/main/java/com/luck/picture/lib/permissions/RxPermissions.java

@@ -10,11 +10,11 @@ import android.text.TextUtils;
 import java.util.ArrayList;
 import java.util.List;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.ObservableTransformer;
-import io.reactivex.functions.Function;
-import io.reactivex.subjects.PublishSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableSource;
+import io.reactivex.rxjava3.core.ObservableTransformer;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.subjects.PublishSubject;
 
 /**
  * author：luck

app/src/main/java/com/luck/picture/lib/permissions/RxPermissionsFragment.java

@@ -11,7 +11,7 @@ import android.util.Log;
 import java.util.HashMap;
 import java.util.Map;
 
-import io.reactivex.subjects.PublishSubject;
+import io.reactivex.rxjava3.subjects.PublishSubject;
 
 /**
  * author：luck

app/src/main/java/com/luck/picture/lib/rxbus2/RxBus.java

@@ -8,17 +8,18 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import io.reactivex.BackpressureStrategy;
-import io.reactivex.Flowable;
-import io.reactivex.Scheduler;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
-import io.reactivex.functions.Function;
-import io.reactivex.functions.Predicate;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.subjects.Subject;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.BackpressureStrategy;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.functions.Predicate;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.subjects.Subject;
+
 
 /**
  * RxBus

gradle.properties

@@ -12,3 +12,4 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 assembleApp=true
+