yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.rxlifecycle升级到3

Browse Source 
2.去掉支付宝沙盒模式
This commit is contained in:
huangjian
2020-05-12 12:31:13 +08:00
parent 2615da331b
commit 7a3e1868cc
91 changed files with 162 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
library/build.gradle
View File

@@ -43,7 +43,7 @@ dependencies {
def gson_converter = "2.3.0"
def rxjava = "2.1.7"
def rxjava_android = "2.0.1"
def rxlifecycle = "2.1.0"
def rxlifecycle = "3.1.0"
def loggerVersion = "2.2.0"
def qiniu = "7.3.15"
def SmartRefreshLayoutVersion = "1.0.3"
@@ -74,10 +74,9 @@ dependencies {
api "io.reactivex.rxjava2:rxjava:${rxjava}"
api "io.reactivex.rxjava2:rxandroid:${rxjava_android}"
api "com.trello.rxlifecycle2:rxlifecycle:${rxlifecycle}"
api "com.trello.rxlifecycle2:rxlifecycle-components:${rxlifecycle}"
api "com.trello.rxlifecycle2:rxlifecycle-android:${rxlifecycle}"
api "com.trello.rxlifecycle3:rxlifecycle:${rxlifecycle}"
api "com.trello.rxlifecycle3:rxlifecycle-android:${rxlifecycle}"
api "com.trello.rxlifecycle3:rxlifecycle-components:${rxlifecycle}"
api "com.github.bumptech.glide:glide:${glideVersion}"
annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}"

2
library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpActivity.java
View File

@@ -8,7 +8,7 @@ import com.yizhuan.xchat_android_library.base.factory.BaseMvpProxy;
import com.yizhuan.xchat_android_library.base.factory.PresenterMvpFactory;
import com.yizhuan.xchat_android_library.base.factory.PresenterMvpFactoryImpl;
import com.yizhuan.xchat_android_library.base.factory.PresenterProxyInterface;
import com.trello.rxlifecycle2.components.support.RxAppCompatActivity;
import com.trello.rxlifecycle3.components.support.RxAppCompatActivity;
/**
* <p> 1. 子类的Presenter必须继承自AbstractMvpPresenter；

2
library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpFragment.java
View File

@@ -8,7 +8,7 @@ import com.yizhuan.xchat_android_library.base.factory.BaseMvpProxy;
import com.yizhuan.xchat_android_library.base.factory.PresenterMvpFactory;
import com.yizhuan.xchat_android_library.base.factory.PresenterMvpFactoryImpl;
import com.yizhuan.xchat_android_library.base.factory.PresenterProxyInterface;
import com.trello.rxlifecycle2.components.support.RxFragment;
import com.trello.rxlifecycle3.components.support.RxFragment;
/**
* <p> 1. 子类的Presenter必须继承自AbstractMvpPresenter；

8
library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpPresenter.java
View File

@@ -5,10 +5,10 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.util.Log;
import com.trello.rxlifecycle2.LifecycleProvider;
import com.trello.rxlifecycle2.LifecycleTransformer;
import com.trello.rxlifecycle2.OutsideLifecycleException;
import com.trello.rxlifecycle2.RxLifecycle;
import com.trello.rxlifecycle3.LifecycleProvider;
import com.trello.rxlifecycle3.LifecycleTransformer;
import com.trello.rxlifecycle3.OutsideLifecycleException;
import com.trello.rxlifecycle3.RxLifecycle;
import io.reactivex.Observable;
import io.reactivex.functions.Function;

2
library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackActivity.java
View File

@@ -6,7 +6,7 @@ import android.os.Bundle;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import com.trello.rxlifecycle2.components.support.RxAppCompatActivity;
import com.trello.rxlifecycle3.components.support.RxAppCompatActivity;
import java.lang.reflect.Field;