尝试删除rxjava,只使用rxjava2

app/build.gradle

@@ -236,8 +236,12 @@ dependencies {
 //    implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0'
 
     //    implementation 'com.squareup.retrofit2:adapter-rxjava2:+'
-    implementation ('com.squareup.retrofit2:adapter-rxjava:2.1.0') {
+//    implementation ('com.squareup.retrofit2:adapter-rxjava:2.1.0') {
+//        exclude group: 'com.squareup.retrofit2', module: 'retrofit'
+//    }
+    implementation ('com.squareup.retrofit2:adapter-rxjava2:2.5.0') {
         exclude group: 'com.squareup.retrofit2', module: 'retrofit'
+        exclude group: 'io.reactivex.rxjava2', module: 'rxjava'
     }
 
     //rxjava

app/src/main/java/com/kfzs/duanduan/fragment/FgtBorrowPlay.java

@@ -20,8 +20,8 @@
 //import com.sheep.jiuyan.samllsheep.utils.G;
 //import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 //
-//import rx.android.schedulers.AndroidSchedulers;
-//import rx.schedulers.Schedulers;
+//import io.reactivex.android.schedulers.AndroidSchedulers;
+//import io.reactivex.schedulers.Schedulers;
 //
 ///**
 // * 借着玩界面

app/src/main/java/com/kfzs/duanduan/utils/ApkUtils.java

@@ -13,6 +13,7 @@ import android.text.TextUtils;
 import android.util.Base64;
 import android.view.View;
 
+import com.sheep.gamegroup.absBase.AbsObserver;
 import com.sheep.gamegroup.model.entity.ApkFileInfo;
 import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.util.ActivityManager;
@@ -30,12 +31,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import rx.Observable;
-import rx.Subscriber;
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.functions.Predicate;
+import io.reactivex.schedulers.Schedulers;
 import rx.functions.Action1;
-import rx.functions.Func1;
-import rx.schedulers.Schedulers;
 
 /**
  * apk helper
@@ -97,37 +97,37 @@ public class ApkUtils {
         final ApkFileInfo apkFileInfo = new ApkFileInfo();
         apkFileInfo.setPath(apkPath);
         Observable.just(apkFileInfo)
-                .filter(new Func1<ApkFileInfo, Boolean>() {
+                .filter(new Predicate<ApkFileInfo>() {
                     @Override
-                    public Boolean call(ApkFileInfo item) {
+                    public boolean test(ApkFileInfo item){
                         return !TextUtils.isEmpty(item.getPath());
                     }
                 })
-                .filter(new Func1<ApkFileInfo, Boolean>() {
+                .filter(new Predicate<ApkFileInfo>() {
                     @Override
-                    public Boolean call(ApkFileInfo item) {
+                    public boolean test(ApkFileInfo item) {
                         return item.existsPath();
                     }
                 })
-                .filter(new Func1<ApkFileInfo, Boolean>() {
+                .filter(new Predicate<ApkFileInfo>() {
                     @Override
-                    public Boolean call(ApkFileInfo item) {
+                    public boolean test(ApkFileInfo item) {
                         return !TextUtils.isEmpty(item.initPackageNameFromPath(context).getPackageName());
                     }
                 })
-                .filter(new Func1<ApkFileInfo, Boolean>() {
+                .filter(new Predicate<ApkFileInfo>() {
                     @Override
-                    public Boolean call(ApkFileInfo item) {
+                    public boolean test(ApkFileInfo item) {
                         //已经安装且签名的md5相同，文件与安装应用的md5也相同，则过滤掉
                         return !(item.checkInstall(context) && item.checkApkAndFileSignMd5() && item.checkApkAndFileMd5());
                     }
                 })
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Subscriber<ApkFileInfo>() {
+                .subscribe(new AbsObserver<ApkFileInfo>() {
                     private boolean doneNext;
                     @Override
-                    public void onCompleted() {
+                    public void onComplete() {
                         if(doneNext)
                             return;
                         if(apkFileInfo.isAppInstalled()){//在onNext中未处理且应用已经安装的情况下，直接打开应用

app/src/main/java/com/sheep/gamegroup/absBase/AbsObserver.java

@@ -0,0 +1,30 @@
+package com.sheep.gamegroup.absBase;
+
+import io.reactivex.Observer;
+import io.reactivex.disposables.Disposable;
+
+/**
+ * Created by realicing on 2018/11/19.
+ * realicing@sina.com
+ */
+public abstract class AbsObserver<T> implements Observer<T> {
+    @Override
+    public void onSubscribe(Disposable d) {
+
+    }
+
+    @Override
+    public void onNext(T t) {
+
+    }
+
+    @Override
+    public void onError(Throwable e) {
+
+    }
+
+    @Override
+    public void onComplete() {
+
+    }
+}

app/src/main/java/com/sheep/gamegroup/absBase/BaseActivity.java

@@ -11,10 +11,9 @@ import java.util.concurrent.TimeUnit;
 
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by kemllor on 2017/12/15.
@@ -75,9 +74,9 @@ public abstract class BaseActivity extends RxAppCompatActivity {
             Observable.just(1).delay(50L, TimeUnit.MILLISECONDS)
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new Action1<Integer>() {
+                    .subscribe(new AbsObserver<Integer>() {
                         @Override
-                        public void call(Integer integer) {
+                        public void onNext(Integer integer) {
                             doNextAction(action);
                         }
                     });

app/src/main/java/com/sheep/gamegroup/absBase/BaseListActivity2.java

@@ -20,10 +20,10 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import java.util.List;
 
 import butterknife.BindView;
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
 
 /**
  * Created by realicing on 2018/9/3.
@@ -130,9 +130,9 @@ public abstract class BaseListActivity2<T> extends BaseActivity implements IRefr
             lastCacheList = DataUtil.getInstance().getCacheList(urlKey, getTClass(), conversion, page);
             loadList(lastCacheList);
         }
-        SysAppUtil.checkNet(new Action1<Integer>() {
+        SysAppUtil.checkNet(new AbsObserver<Integer>() {
             @Override
-            public void call(Integer result) {
+            public void onNext(Integer result) {
                 if (result != 0) {//无网络
                     if (check_net_ll != null)
                         check_net_ll.setVisibility(View.VISIBLE);

app/src/main/java/com/sheep/gamegroup/di/modules/NetModule.java

@@ -19,7 +19,7 @@ import dagger.Module;
 import dagger.Provides;
 import okhttp3.OkHttpClient;
 import retrofit2.Retrofit;
-import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 import retrofit2.converter.fastjson.FastJsonConverterFactory;
 //import retrofit2.converter.gson.GsonConverterFactory;
 
@@ -53,7 +53,7 @@ public class NetModule {
                 .addConverterFactory(StringConverterFactory.create())
                 .addConverterFactory(FastJsonConverterFactory.create())
 //                .addConverterFactory(GsonConverterFactory.create(EntityUtils.gson))//
-                .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
                 .build();
         return retrofit;
     }

app/src/main/java/com/sheep/gamegroup/helper/FindAppHelper.java

@@ -19,9 +19,9 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.util.Locale;
 
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.FIND_APP;
 

app/src/main/java/com/sheep/gamegroup/helper/TaskHelper.java

@@ -30,9 +30,9 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import java.util.List;
 import java.util.Locale;
 
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_APP;
 import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_CHANG_SI;

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -22,7 +22,7 @@ import retrofit2.http.Path;
 import retrofit2.http.Query;
 import retrofit2.http.QueryMap;
 import retrofit2.http.Streaming;
-import rx.Observable;
+import io.reactivex.Observable;
 
 /**
  * 暂时没接口
@@ -1324,7 +1324,7 @@ public interface ApiService {
     @GET("app/user_sign/signs")
     Observable<BaseMessage> getUserSignSigns();
     /**
-     * 获取最后一次刮奖结果
+     * 获取下次刮奖金额
      */
     @GET("app/user_sign/scratch_amount")
     Observable<BaseMessage> getUserSignScratch_amount();

app/src/main/java/com/sheep/gamegroup/model/entity/Applications.java

@@ -44,6 +44,8 @@ public class Applications implements IDownload, Serializable {
 
     private String manufacturer;//厂商
 
+    private String main_publicize;//主宣传图（视频）
+
     private int score_count;//评分人数
 
     private int download_type;//1：非预约下载 2：预约下载
@@ -350,6 +352,14 @@ public class Applications implements IDownload, Serializable {
         this.ext_detail = ext_detail;
     }
 
+    public String getMain_publicize() {
+        return main_publicize;
+    }
+
+    public void setMain_publicize(String main_publicize) {
+        this.main_publicize = main_publicize;
+    }
+
     @Override
     public String getPackage_names() {
         return package_name;

app/src/main/java/com/sheep/gamegroup/model/util/AbsSubscriber.java

@@ -1,19 +0,0 @@
-package com.sheep.gamegroup.model.util;
-
-import rx.Subscriber;
-
-/**
- * Created by realicing on 2018/10/30.
- * realicing@sina.com
- */
-public abstract class AbsSubscriber<T> extends Subscriber<T> {
-    @Override
-    public void onCompleted() {
-
-    }
-
-    @Override
-    public void onError(Throwable e) {
-
-    }
-}

app/src/main/java/com/sheep/gamegroup/model/util/ExceptionHandle.java

@@ -7,7 +7,7 @@ import com.alibaba.fastjson.JSONException;
 import java.io.IOException;
 import java.net.ConnectException;
 
-import retrofit2.adapter.rxjava.HttpException;
+import retrofit2.HttpException;
 
 /**
  * Created by ljy on 2018/3/19.

app/src/main/java/com/sheep/gamegroup/model/util/RxBus.java

@@ -1,38 +0,0 @@
-package com.sheep.gamegroup.model.util;
-
-import rx.subjects.PublishSubject;
-import rx.subjects.SerializedSubject;
-import rx.subjects.Subject;
-
-/**
- * 广播发送
- * Created by ljy on 2018/3/23.
- */
-
-public class RxBus {
-    private static volatile RxBus rxBus;
-
-    private final Subject<Object,Object> bus;
-
-    public RxBus() {
-        bus = new SerializedSubject<>(PublishSubject.create());
-    }
-
-    public static RxBus getDefault(){
-        if (rxBus == null){
-            synchronized (RxBus.class){
-                if (rxBus == null){
-                    rxBus = new RxBus();
-                }
-            }
-        }
-        return rxBus;
-    }
-
-    /**
-     * 发送一个事件
-     */
-    public void post(Object o){
-        bus.onNext(o);
-    }
-}

app/src/main/java/com/sheep/gamegroup/model/util/SheepSubscriber.java

@@ -2,8 +2,6 @@ package com.sheep.gamegroup.model.util;
 
 import android.app.Activity;
 import android.content.Context;
-import android.text.TextUtils;
-import android.util.Log;
 import android.widget.Toast;
 
 import com.alibaba.fastjson.JSONObject;
@@ -11,22 +9,22 @@ import com.sheep.gamegroup.model.api.BaseMessageConverter;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.util.ActivityManager;
 import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.NetUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.gamegroup.view.activity.ActPay;
 import com.sheep.gamegroup.view.activity.LoginAct;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
-import rx.Subscriber;
+import io.reactivex.Observer;
+import io.reactivex.disposables.Disposable;
+
 
 /**
  * Created by ljy on 2018/3/19.
  */
 
-public abstract class SheepSubscriber<T> extends Subscriber<T> {
+public abstract class SheepSubscriber<T> implements Observer<T> {
 
     private Context context;
 
@@ -35,8 +33,7 @@ public abstract class SheepSubscriber<T> extends Subscriber<T> {
     }
 
     @Override
-    public void onStart() {
-        super.onStart();
+    public void onSubscribe(Disposable d) {
         //接下来可以检查网络连接等操作
         if(context == null)
             context = SheepApp.getInstance();
@@ -44,8 +41,8 @@ public abstract class SheepSubscriber<T> extends Subscriber<T> {
 
             Toast.makeText(context, "当前网络不可用，请检查网络情况", Toast.LENGTH_SHORT).show();
             // 一定好主动调用下面这一句,取消本次Subscriber订阅
-            if (!isUnsubscribed()) {
-                unsubscribe();
+            if (!d.isDisposed()) {
+                d.dispose();
             }
             return;
         }
@@ -111,6 +108,6 @@ public abstract class SheepSubscriber<T> extends Subscriber<T> {
     public abstract void onError(BaseMessage baseMessage);
 
     @Override
-    public void onCompleted() {
+    public void onComplete() {
     }
 }

app/src/main/java/com/sheep/gamegroup/presenter/BindOrChangeWeixinPresenter.java

@@ -8,8 +8,8 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import javax.inject.Inject;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by ljy on 2018/3/18.

app/src/main/java/com/sheep/gamegroup/presenter/CommitWxCodeMakeMoneyPresenter.java

@@ -8,8 +8,8 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import javax.inject.Inject;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by realicing on 2018/3/23.

app/src/main/java/com/sheep/gamegroup/presenter/CommitWxMakeMoneyPresenter.java

@@ -8,8 +8,8 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import javax.inject.Inject;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by realicing on 2018/3/23.

app/src/main/java/com/sheep/gamegroup/presenter/LieMakeMoneyPresenter.java

@@ -7,8 +7,8 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import javax.inject.Inject;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by realicing on 2018/3/23.

app/src/main/java/com/sheep/gamegroup/presenter/LoginPresenter.java

@@ -21,8 +21,8 @@ import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import javax.inject.Inject;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by Administrator on 2018/3/10.

app/src/main/java/com/sheep/gamegroup/presenter/PhonePresenter.java

@@ -17,8 +17,8 @@ import java.util.Map;
 
 import javax.inject.Inject;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by ljy on 2018/3/15.

app/src/main/java/com/sheep/gamegroup/presenter/ReNamePresenter.java

@@ -10,8 +10,8 @@ import java.util.HashMap;
 
 import javax.inject.Inject;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by Administrator on 2018/3/10.

app/src/main/java/com/sheep/gamegroup/presenter/RealNameAutherPresenter.java

@@ -11,8 +11,8 @@ import java.util.Iterator;
 
 import javax.inject.Inject;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by Administrator on 2018/3/10.

app/src/main/java/com/sheep/gamegroup/presenter/RechargeQPresenter.java

@@ -8,8 +8,8 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import javax.inject.Inject;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by ljy on 2018/3/18.

app/src/main/java/com/sheep/gamegroup/presenter/SignCardPresenter.java

@@ -7,8 +7,8 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import javax.inject.Inject;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by ljy on 2018/3/18.

app/src/main/java/com/sheep/gamegroup/presenter/SignRankingsPresenter.java

@@ -7,8 +7,8 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import javax.inject.Inject;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by ljy on 2018/3/18.

app/src/main/java/com/sheep/gamegroup/presenter/SignRecordPresenter.java

@@ -7,8 +7,8 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import javax.inject.Inject;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by ljy on 2018/3/18.

app/src/main/java/com/sheep/gamegroup/presenter/SmallSheepPresenter.java

@@ -15,8 +15,8 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by ljy on 2018/3/19.

app/src/main/java/com/sheep/gamegroup/presenter/TaskDetailPresenter.java

@@ -9,9 +9,9 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import javax.inject.Inject;
 
 import retrofit2.http.Query;
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 
 /**

app/src/main/java/com/sheep/gamegroup/presenter/TaskDialogPresenter.java

@@ -10,8 +10,8 @@ import com.alibaba.fastjson.JSONObject;
 
 import javax.inject.Inject;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by ljy on 2018/3/22.

app/src/main/java/com/sheep/gamegroup/presenter/TaskListPresenter.java

@@ -8,8 +8,8 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import javax.inject.Inject;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by ljy on 2018/3/21.

app/src/main/java/com/sheep/gamegroup/presenter/TryMakeMoneyPresenter.java

@@ -10,8 +10,8 @@ import java.util.HashMap;
 
 import javax.inject.Inject;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by ljy on 2018/3/19.

app/src/main/java/com/sheep/gamegroup/presenter/WithdrawalListPresenter.java

@@ -7,8 +7,8 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import javax.inject.Inject;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by ljy on 2018/3/21.

app/src/main/java/com/sheep/gamegroup/presenter/WithdrawalPresenter.java

@@ -8,8 +8,8 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import javax.inject.Inject;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by ljy on 2018/3/18.

app/src/main/java/com/sheep/gamegroup/statistics/AppStatistics.java

@@ -8,8 +8,8 @@ import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by zhanghai on 2018/4/3.

app/src/main/java/com/sheep/gamegroup/util/ApiJSONUtil.java

@@ -10,9 +10,9 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by realicing on 2018/11/2.

app/src/main/java/com/sheep/gamegroup/util/ApiUtil.java

@@ -3,6 +3,7 @@ package com.sheep.gamegroup.util;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
+import com.sheep.gamegroup.absBase.AbsObserver;
 import com.sheep.gamegroup.absBase.IHomePageSearch;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.NewAboutUs;
@@ -11,10 +12,10 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import org.afinal.simplecache.ApiKey;
 
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
 
 /**
  * Created by realicing on 2018/11/6.
@@ -72,9 +73,9 @@ public class ApiUtil {
         if(newAboutUs != null && !TextUtils.isEmpty(newAboutUs.getComplaintQq())){
             Observable.just(newAboutUs.getComplaintQq())
                     .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new Action1<String>() {
+                    .subscribe(new AbsObserver<String>() {
                         @Override
-                        public void call(String qq) {
+                        public void onNext(String qq) {
                             action1.call(qq);
                         }
                     });

app/src/main/java/com/sheep/gamegroup/util/CertificationUtil.java

@@ -17,9 +17,9 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * 游戏认证

app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -110,9 +110,9 @@ import java.util.Map;
 import java.util.Set;
 
 import okhttp3.Call;
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.LINK_SHARE;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.NEWBIE_TASK;

app/src/main/java/com/sheep/gamegroup/util/DataUtil.java

@@ -31,9 +31,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static android.app.Activity.RESULT_OK;
 

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -148,9 +148,9 @@ import java.util.Locale;
 
 import me.iwf.photopicker.PhotoPicker;
 import me.iwf.photopicker.PhotoPreview;
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.ASK_MAKE_MONEY_INVITATION;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.FIND_ITEM;

app/src/main/java/com/sheep/gamegroup/util/ObservableUtil.java

@@ -4,7 +4,7 @@ import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.GameListType;
 
-import rx.Observable;
+import io.reactivex.Observable;
 
 /**
  * Created by realicing on 2018/10/31.

app/src/main/java/com/sheep/gamegroup/util/SysAppUtil.java

@@ -21,6 +21,7 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.cache.InternalCacheDiskCacheFactory;
 import com.kfzs.duanduan.utils.ApkUtils;
+import com.sheep.gamegroup.absBase.AbsObserver;
 import com.sheep.gamegroup.model.entity.AppInfo;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogConfig;
@@ -50,13 +51,13 @@ import java.util.Calendar;
 import java.util.List;
 import java.util.Locale;
 
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.functions.Function;
+import io.reactivex.schedulers.Schedulers;
 import okhttp3.Call;
 import okhttp3.Response;
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.functions.Func1;
-import rx.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.UPGRADE_DIALOG_BT;
 
@@ -115,11 +116,11 @@ public class SysAppUtil {
         return DataUtil.getInstance().isNewSmallSheep();
     }
 
-    public static void clearCache(final Action1<Object> action1) {
+    public static void clearCache(final AbsObserver<Object> action1) {
         Observable.just(1)
-                .map(new Func1<Integer, Integer>() {
+                .map(new Function<Integer, Integer>() {
                     @Override
-                    public Integer call(Integer integer) {
+                    public Integer apply(Integer integer) throws Exception {
                         Glide.get(SheepApp.getInstance()).clearDiskCache();//清理图片
                         ClassFileHelper.getInstance().clearDir();//清理下载文件
                         DataUtil.getInstance().clearScreenShots();//清除所有截图
@@ -128,17 +129,7 @@ public class SysAppUtil {
                 })
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<Integer>() {
-                    @Override
-                    public void call(Integer integer) {
-                        action1.call(integer);
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        action1.call(throwable);
-                    }
-                });
+                .subscribe(action1);
     }
     public static String getAppCacheSize() {
         try {
@@ -270,11 +261,11 @@ public class SysAppUtil {
         return TextUtils.isEmpty(sb) ? "Dalvik/2.1.0 (Linux; U; Android 5.1.1; letv x501 Build/LMY48Z)" : sb.toString();
     }
 
-    public static void checkNet(Action1<Integer> action1) {
+    public static void checkNet(AbsObserver<Integer> action1) {
         Observable.just(1)
-                .map(new Func1<Integer, Integer>() {
+                .map(new Function<Integer, Integer>() {
                     @Override
-                    public Integer call(Integer integer) {
+                    public Integer apply(Integer integer) throws Exception {
                         int result;
                         try {
                             Response response = OkHttpUtils.get().url("http://www.baidu.com").build().execute();

app/src/main/java/com/sheep/gamegroup/util/TestUtil.java

@@ -68,9 +68,9 @@ import java.util.Map;
 
 import cn.jpush.android.api.JPushInterface;
 import okhttp3.Call;
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static android.content.Context.NOTIFICATION_SERVICE;
 import static com.sheep.gamegroup.util.CommonUtil.LONG_MAO_APP_PACKAGE_NAME;

app/src/main/java/com/sheep/gamegroup/util/UMConfigUtils.java

@@ -19,8 +19,8 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 //import com.umeng.analytics.MobclickAgent;
 

app/src/main/java/com/sheep/gamegroup/view/activity/ActArticle.java

@@ -18,6 +18,7 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.sheep.gamegroup.absBase.AbsObserver;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.greendao.download.DownLoadInfo;
@@ -32,7 +33,6 @@ import com.sheep.gamegroup.util.DownloadUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
-import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.ViewHolder;
@@ -55,9 +55,9 @@ import java.util.Locale;
 import java.util.Map;
 
 import butterknife.BindView;
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
 
 import static android.content.Intent.ACTION_PACKAGE_ADDED;
 import static android.content.Intent.ACTION_PACKAGE_REMOVED;
@@ -237,9 +237,9 @@ public class ActArticle extends BaseActivity implements Action1<Integer> {
     @Override
     public void initData() {
         empty_view.setVisibility(View.INVISIBLE);
-        SysAppUtil.checkNet(new Action1<Integer>() {
+        SysAppUtil.checkNet(new AbsObserver<Integer>() {
             @Override
-            public void call(Integer result) {
+            public void onNext(Integer result) {
                 if (result != 0) {//无网络
                     if (check_net_ll != null)
                         check_net_ll.setVisibility(View.VISIBLE);

app/src/main/java/com/sheep/gamegroup/view/activity/ActBindMobileRegister.java

@@ -30,8 +30,8 @@ import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 import java.util.Locale;
 
 import butterknife.BindView;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by ljy on 2018/3/27.

app/src/main/java/com/sheep/gamegroup/view/activity/ActCommentGameApp.java

@@ -21,10 +21,10 @@ import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 import java.util.concurrent.TimeUnit;
 
 import butterknife.BindView;
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by realicing on 2018/11/1.

app/src/main/java/com/sheep/gamegroup/view/activity/ActCreditCardTaskList.java

@@ -23,8 +23,8 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import butterknife.BindView;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by realicing on 2018/4/24.

app/src/main/java/com/sheep/gamegroup/view/activity/ActFindGame.java

@@ -53,9 +53,9 @@
 //import java.util.Map;
 //
 //import butterknife.BindView;
-//import rx.android.schedulers.AndroidSchedulers;
+//import io.reactivex.android.schedulers.AndroidSchedulers;
 //import rx.functions.Action1;
-//import rx.schedulers.Schedulers;
+//import io.reactivex.schedulers.Schedulers;
 //
 //import static android.content.Intent.ACTION_PACKAGE_ADDED;
 //import static android.content.Intent.ACTION_PACKAGE_REMOVED;

app/src/main/java/com/sheep/gamegroup/view/activity/ActGameAccount.java

@@ -29,9 +29,9 @@ import org.greenrobot.eventbus.Subscribe;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_GAME_ACCOUNT_ADD;
 

app/src/main/java/com/sheep/gamegroup/view/activity/ActGcGameAppDetail.java

@@ -52,8 +52,8 @@ import java.util.List;
 import java.util.Locale;
 
 import butterknife.BindView;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.FIND_SHARE;
 

app/src/main/java/com/sheep/gamegroup/view/activity/ActInvitation.java

@@ -66,9 +66,9 @@ import java.util.Locale;
 
 import butterknife.BindView;
 import butterknife.OnClick;
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.LINK_SHARE;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.QR_COPY;

app/src/main/java/com/sheep/gamegroup/view/activity/ActMain.java

@@ -17,6 +17,7 @@ import android.widget.TextView;
 
 import com.kfzs.duanduan.utils.StatusBarUtils;
 import com.kfzs.duanduan.view.DialogStorageLow;
+import com.sheep.gamegroup.absBase.AbsObserver;
 import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.greendao.download.DownLoadInfo;
 import com.sheep.gamegroup.helper.DownloadHelper;
@@ -53,10 +54,10 @@ import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
 import butterknife.BindView;
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
 
 import static android.content.Intent.ACTION_PACKAGE_ADDED;
 import static android.content.Intent.ACTION_PACKAGE_REMOVED;
@@ -299,9 +300,9 @@ public class ActMain extends BaseActYmPermissionCheck  {
             Observable.just(1).delay(PERIOD * pressCount, TimeUnit.MILLISECONDS)
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new Action1<Integer>() {
+                    .subscribe(new AbsObserver<Integer>() {
                         @Override
-                        public void call(Integer integer) {
+                        public void onNext(Integer integer) {
                             doBackPress();
                         }
                     });

app/src/main/java/com/sheep/gamegroup/view/activity/ActModifyThird.java

@@ -33,8 +33,8 @@ import java.util.Map;
 
 import butterknife.BindView;
 import butterknife.OnClick;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * 验证手机号后绑定第三方账号QQ或者微信

app/src/main/java/com/sheep/gamegroup/view/activity/ActMyMoney.java

@@ -32,8 +32,8 @@ import org.afinal.simplecache.ApiKey;
 
 import butterknife.BindView;
 import butterknife.OnClick;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.MY_MONEY_TAB;
 

app/src/main/java/com/sheep/gamegroup/view/activity/ActNewAboutUs.java

@@ -23,8 +23,8 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import butterknife.BindView;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * 关于小绵羊

app/src/main/java/com/sheep/gamegroup/view/activity/ActNewbieTaskList.java

@@ -19,8 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * 新手任务

app/src/main/java/com/sheep/gamegroup/view/activity/ActPay.java

@@ -23,8 +23,8 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import java.util.List;
 import java.util.Locale;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by realicing on 2018/10/18.

app/src/main/java/com/sheep/gamegroup/view/activity/ActPlayGameDetail.java

@@ -42,9 +42,9 @@ import org.greenrobot.eventbus.Subscribe;
 import java.util.Locale;
 
 import butterknife.BindView;
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static android.content.Intent.ACTION_PACKAGE_ADDED;
 import static android.content.Intent.ACTION_PACKAGE_REMOVED;

app/src/main/java/com/sheep/gamegroup/view/activity/ActPlayGameList.java

@@ -14,7 +14,7 @@ import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import java.util.Locale;
 
-import rx.Observable;
+import io.reactivex.Observable;
 /**
  * Created by realicing on 2018/10/31.
  * realicing@sina.com

app/src/main/java/com/sheep/gamegroup/view/activity/ActPlayGameRecommendList.java

@@ -13,7 +13,7 @@ import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import java.util.Locale;
 
-import rx.Observable;
+import io.reactivex.Observable;
 
 /**
  * Created by realicing on 2018/10/31.

app/src/main/java/com/sheep/gamegroup/view/activity/ActPlayGameUserLikeList.java

@@ -11,7 +11,7 @@ import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.view.adapter.PlayGameItemAdapter;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
-import rx.Observable;
+import io.reactivex.Observable;
 
 /**
  * Created by realicing on 2018/10/31.

app/src/main/java/com/sheep/gamegroup/view/activity/ActReservation.java

@@ -9,6 +9,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.sheep.gamegroup.absBase.AbsObserver;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.greendao.download.DownLoadInfo;
@@ -40,9 +41,9 @@ import java.util.Locale;
 import java.util.Map;
 
 import butterknife.BindView;
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static android.content.Intent.ACTION_PACKAGE_ADDED;
 import static android.content.Intent.ACTION_PACKAGE_REMOVED;
@@ -222,9 +223,9 @@ public class ActReservation extends BaseActivity {
     @Override
     public void initData() {
         empty_view.setVisibility(View.INVISIBLE);
-        SysAppUtil.checkNet(new Action1<Integer>() {
+        SysAppUtil.checkNet(new AbsObserver<Integer>() {
             @Override
-            public void call(Integer result) {
+            public void onNext(Integer result) {
                 if (result != 0) {//无网络
                     if (check_net_ll != null)
                         check_net_ll.setVisibility(View.VISIBLE);

app/src/main/java/com/sheep/gamegroup/view/activity/ActSearchAppOrTask.java

@@ -42,8 +42,8 @@ import java.util.List;
 
 import butterknife.BindView;
 import butterknife.OnClick;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by realicing on 2018/9/13.

app/src/main/java/com/sheep/gamegroup/view/activity/ActSearchGame.java

@@ -47,9 +47,9 @@ import java.util.List;
 
 import butterknife.BindView;
 import butterknife.OnClick;
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.SEARCH_GAME_COMMIT;
 import static com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp.PUBLIC_TAG_PREFIX_TEXTVIEW_LIST;

app/src/main/java/com/sheep/gamegroup/view/activity/ActSetting.java

@@ -6,6 +6,7 @@ import android.view.View;
 import android.widget.TextView;
 
 import com.kfzs.duanduan.utils.ApkUtils;
+import com.sheep.gamegroup.absBase.AbsObserver;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.util.CommonUtil;
@@ -21,7 +22,6 @@ import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import butterknife.BindView;
 import butterknife.OnClick;
-import rx.functions.Action1;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_CLEAN;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_CLEAN_SURE;
@@ -72,9 +72,9 @@ public class ActSetting extends BaseActivity {
                             @Override
                             public void onClick(View view) {
                                 USER_CLEAN_SURE.onEvent();
-                                SysAppUtil.clearCache(new Action1<Object>() {
+                                SysAppUtil.clearCache(new AbsObserver<Object>() {
                                     @Override
-                                    public void call(Object o) {
+                                    public void onNext(Object o) {
                                         DataUtil.putAsInt(DataKey.KEY_ORDER, 1);
                                         G.showToast("清理缓存完成");
                                         initCacheSize();

app/src/main/java/com/sheep/gamegroup/view/activity/ActSignCard.java

@@ -42,9 +42,9 @@ import java.util.Locale;
 
 import butterknife.BindView;
 import butterknife.OnClick;
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by realicing on 2018/9/11.

app/src/main/java/com/sheep/gamegroup/view/activity/ActSysNfDetail.java

@@ -14,8 +14,8 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * created on：2018/9/3 on 20:50

app/src/main/java/com/sheep/gamegroup/view/activity/ActUnderstandSheep.java

@@ -20,8 +20,8 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import butterknife.BindView;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * 一分钟快速了解小绵羊

app/src/main/java/com/sheep/gamegroup/view/activity/ActUserAppHome.java

@@ -48,8 +48,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by realicing on 2018/11/5.

app/src/main/java/com/sheep/gamegroup/view/activity/ActUserLabelList.java

@@ -31,8 +31,8 @@ import java.util.List;
 
 import butterknife.BindView;
 import butterknife.OnClick;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by realicing on 2018/6/8.

app/src/main/java/com/sheep/gamegroup/view/activity/ActXiaomiGame.java

@@ -9,8 +9,9 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.sheep.gamegroup.event.BigEvent;
+import com.sheep.gamegroup.absBase.AbsObserver;
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.XiaomiGameEntity;
 import com.sheep.gamegroup.util.CommonUtil;
@@ -170,9 +171,9 @@ public class ActXiaomiGame extends BaseActivity {
 
     @Override
     public void initData() {
-        SysAppUtil.checkNet(new Action1<Integer>() {
+        SysAppUtil.checkNet(new AbsObserver<Integer>() {
             @Override
-            public void call(Integer result) {
+            public void onNext(Integer result) {
                 if (result != 0) {//无网络
                     if (check_net_ll != null)
                         check_net_ll.setVisibility(View.VISIBLE);

app/src/main/java/com/sheep/gamegroup/view/activity/FeedbackAct.java

@@ -18,9 +18,9 @@ import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import butterknife.BindView;
 import butterknife.OnClick;
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_FEEDBACK_COMMIT;
 

app/src/main/java/com/sheep/gamegroup/view/activity/GameTaskOrderListAct.java

@@ -26,8 +26,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by ljy on 2018/6/15.

app/src/main/java/com/sheep/gamegroup/view/activity/LoginAct.java

@@ -52,9 +52,9 @@ import javax.inject.Inject;
 
 import butterknife.BindView;
 import butterknife.OnClick;
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.LOGIN_QQ;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.LOGIN_WX;

app/src/main/java/com/sheep/gamegroup/view/activity/MessageInteractionDetailActivity.java

@@ -23,8 +23,8 @@ import java.util.List;
 
 import butterknife.BindView;
 import butterknife.OnClick;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * created on：2018/8/28 on 17:15

app/src/main/java/com/sheep/gamegroup/view/activity/PersonalInfoAct.java

@@ -10,6 +10,7 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
+import com.sheep.gamegroup.absBase.AbsObserver;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
@@ -31,9 +32,9 @@ import java.util.Map;
 
 import butterknife.BindView;
 import butterknife.OnClick;
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.BIND_PHONE;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.BIND_QQ;
@@ -394,16 +395,15 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
         SheepApp.getInstance().getNetComponent().getApiService().changeBaseInfo(jsonObject)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<BaseMessage>() {
+                .subscribe(new AbsObserver<BaseMessage>() {
                     @Override
-                    public void call(BaseMessage baseMessage) {
+                    public void onNext(BaseMessage baseMessage) {
                         setLoaddingText("完成");
                         onGetNetImageUrl(url);
                         dismissLoaddingDialog();
                     }
-                }, new Action1<Throwable>() {
                     @Override
-                    public void call(Throwable throwable) {
+                    public void onError(Throwable throwable) {
                         updateError("失败");
                     }
                 });

app/src/main/java/com/sheep/gamegroup/view/activity/RechargeAct.java

@@ -26,8 +26,8 @@ import java.util.List;
 
 import butterknife.BindView;
 import butterknife.OnClick;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.RECHARGE_PAY;
 

app/src/main/java/com/sheep/gamegroup/view/activity/SignRechargeAct.java

@@ -26,8 +26,8 @@ import java.util.List;
 
 import butterknife.BindView;
 import butterknife.OnClick;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by Administrator on 2018/3/19.

app/src/main/java/com/sheep/gamegroup/view/activity/SplashAct.java

@@ -44,8 +44,8 @@ import butterknife.BindView;
 import butterknife.OnClick;
 import pub.devrel.easypermissions.AfterPermissionGranted;
 import pub.devrel.easypermissions.EasyPermissions;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.CommonUtil.JUMP_FIND_ACT;
 import static com.sheep.gamegroup.util.CommonUtil.JUMP_FIND_GMAE;

app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

@@ -94,9 +94,9 @@ import javax.inject.Inject;
 
 import butterknife.BindView;
 import butterknife.OnClick;
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.model.entity.TaskChild.STATUS_RUNNING;
 import static com.sheep.gamegroup.model.entity.TaskEty.INSPECT_TYPE_PERSION;

app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAddQQAct.java

@@ -27,8 +27,8 @@ import com.tencent.smtt.sdk.WebViewClient;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * 新手添加QQ群任务详情页面

app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailCreditCardAct.java

@@ -37,9 +37,9 @@ import java.util.Locale;
 
 import butterknife.BindView;
 import butterknife.OnClick;
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_CREDIT_CARD;
 

app/src/main/java/com/sheep/gamegroup/view/activity/WebviewAct.java

@@ -21,8 +21,8 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import butterknife.BindView;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by ljy on 2018/4/16.

app/src/main/java/com/sheep/gamegroup/view/adapter/GiftCenterAdapter.java

@@ -27,9 +27,9 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import java.util.List;
 import java.util.Locale;
 
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.GIFT_BAG_COPY_CODE;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.GIFT_BAG_LOOK_TIP;

app/src/main/java/com/sheep/gamegroup/view/adapter/WelfareAdapter.java

@@ -27,9 +27,9 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.util.List;
 
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.RECEIVE_AWARD_GAME_TASK;
 import static com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp.PUBLIC_TAG_PREFIX_TEXTVIEW_LIST;

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogAddAccount.java

@@ -35,9 +35,9 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import java.util.ArrayList;
 import java.util.List;
 
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_GAME_TECENT;
 import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_GAME_XIAO_MI;

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogGameOrTaskOrGift.java

@@ -33,9 +33,9 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 
 import org.afinal.simplecache.ApiKey;
 
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.GIFT_BAG_COPY_CODE;
 import static com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp.PUBLIC_TAG_PREFIX_TEXTVIEW_LIST;

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogNewbieTaskList.java

@@ -21,8 +21,8 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.util.List;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 
 public class DialogNewbieTaskList {

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogOrienteeringDetails.java

@@ -32,8 +32,8 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import java.util.List;
 import java.util.Locale;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by realicing on 2018/6/12.

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogPayAccount.java

@@ -32,9 +32,9 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import java.util.ArrayList;
 import java.util.List;
 
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * 游戏充值账号输入

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogPayGame.java

@@ -38,9 +38,9 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import java.util.ArrayList;
 import java.util.List;
 
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_INSTEAD_OF_RECHARGE_PAY;
 

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogSuccessUtil.java

@@ -5,16 +5,16 @@ import android.support.v7.app.AlertDialog;
 import android.view.View;
 import android.widget.TextView;
 
+import com.sheep.gamegroup.absBase.AbsObserver;
 import com.sheep.gamegroup.util.ActivityManager;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import java.util.concurrent.TimeUnit;
 
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by realicing on 2018/11/7.
@@ -50,9 +50,9 @@ public class DialogSuccessUtil {
         Observable.just(1).delay(3, TimeUnit.SECONDS)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Action1<Integer>() {
+                .subscribe(new AbsObserver<Integer>() {
                     @Override
-                    public void call(Integer integer) {
+                    public void onNext(Integer integer) {
                         try {
                             if(dialog.isShowing())
                                 close.performClick();

app/src/main/java/com/sheep/gamegroup/view/fragment/AbsFgtMyMoney.java

@@ -23,9 +23,9 @@ import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 import java.util.List;
 
 import butterknife.BindView;
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * 我的资产 --> 充值记录

app/src/main/java/com/sheep/gamegroup/view/fragment/BaseListFragment.java

@@ -6,6 +6,7 @@ import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
 import com.jcodecraeer.xrecyclerview.XRecyclerView;
+import com.sheep.gamegroup.absBase.AbsObserver;
 import com.sheep.gamegroup.absBase.ILoadMore;
 import com.sheep.gamegroup.absBase.IRefresh;
 import com.sheep.gamegroup.model.entity.BaseMessage;
@@ -116,9 +117,9 @@ public abstract class BaseListFragment<T> extends BaseFragment implements IRefre
     protected List<T> list = ListUtil.emptyList();
 
     public void initNetAndData() {
-        SysAppUtil.checkNet(new Action1<Integer>() {
+        SysAppUtil.checkNet(new AbsObserver<Integer>() {
             @Override
-            public void call(Integer result) {
+            public void onNext(Integer result) {
                 if (result != 0) {//无网络
                     if (check_net_ll != null)
                         check_net_ll.setVisibility(View.VISIBLE);

app/src/main/java/com/sheep/gamegroup/view/fragment/BaseListFragment2.java

@@ -6,9 +6,10 @@ import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
 import com.jcodecraeer.xrecyclerview.XRecyclerView;
-import com.sheep.gamegroup.model.api.ApiService;
+import com.sheep.gamegroup.absBase.AbsObserver;
 import com.sheep.gamegroup.absBase.ILoadMore;
 import com.sheep.gamegroup.absBase.IRefresh;
+import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
@@ -23,10 +24,10 @@ import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 import java.util.List;
 
 import butterknife.BindView;
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
 
 /**
  * Created by realicing on 2018/9/3.
@@ -134,9 +135,9 @@ public abstract class BaseListFragment2<T> extends BaseFragment implements IRefr
             lastCacheList = DataUtil.getInstance().getCacheList(urlKey, getTClass());
             loadList(lastCacheList);
         }
-        SysAppUtil.checkNet(new Action1<Integer>() {
+        SysAppUtil.checkNet(new AbsObserver<Integer>() {
             @Override
-            public void call(Integer result) {
+            public void onNext(Integer result) {
                 if (result != 0) {//无网络
                     if (check_net_ll != null)
                         check_net_ll.setVisibility(View.VISIBLE);

app/src/main/java/com/sheep/gamegroup/view/fragment/BaseListFragment3.java

@@ -5,6 +5,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
+import com.sheep.gamegroup.absBase.AbsObserver;
 import com.sheep.gamegroup.absBase.BaseRefreshLoadMoreFragment;
 import com.sheep.gamegroup.absBase.ILoadMore;
 import com.sheep.gamegroup.absBase.IRefresh;
@@ -22,10 +23,10 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import java.util.List;
 
 import butterknife.BindView;
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by realicing on 2018/10/9.
@@ -119,9 +120,9 @@ public abstract class BaseListFragment3<T> extends BaseRefreshLoadMoreFragment{
             lastCacheList = DataUtil.getInstance().getCacheList(urlKey, getTClass(), conversion, page);
             loadList(lastCacheList);
         }
-        SysAppUtil.checkNet(new Action1<Integer>() {
+        SysAppUtil.checkNet(new AbsObserver<Integer>() {
             @Override
-            public void call(Integer result) {
+            public void onNext(Integer result) {
                 if (result != 0) {//无网络
                     if (check_net_ll != null)
                         check_net_ll.setVisibility(View.VISIBLE);

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtArticleComment.java

@@ -28,7 +28,7 @@ import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 import java.util.Locale;
 
 import butterknife.BindView;
-import rx.Observable;
+import io.reactivex.Observable;
 
 /**
  * Created by realicing on 2018/11/2.