update RxJava1.0 to RxJava2.0

brooklet · Aug 14, 2017 · 6f67079 · 6f67079
1 parent 5ad833f
commit 6f67079
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 33 deletions.
diff --git a/app/src/main/java/com/lengyue524/sampletaishan/MainActivity.java b/app/src/main/java/com/lengyue524/sampletaishan/MainActivity.java
@@ -22,12 +22,12 @@
 import java.io.File;
 import java.util.ArrayList;
 
+import io.reactivex.functions.Function;
 import me.iwf.photopicker.PhotoPicker;
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
-import rx.functions.Func1;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.schedulers.Schedulers;
+import io.reactivex.functions.Consumer;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 
 public class MainActivity extends AppCompatActivity {
 
@@ -96,21 +96,21 @@ private void compressWithRx(File file) {
                 .asObservable()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .doOnError(new Action1<Throwable>() {
+                .doOnError(new Consumer<Throwable>() {
                     @Override
-                    public void call(Throwable throwable) {
+                    public void accept(Throwable throwable) {
                         throwable.printStackTrace();
                     }
                 })
-                .onErrorResumeNext(new Func1<Throwable, Observable<? extends byte[]>>() {
+                .onErrorResumeNext(new Function<Throwable, Observable<? extends byte[]>>() {
                     @Override
-                    public Observable<? extends byte[]> call(Throwable throwable) {
+                    public Observable<? extends byte[]> apply(Throwable throwable) {
                         return Observable.empty();
                     }
                 })
-                .subscribe(new Action1<byte[]>() {
+                .subscribe(new Consumer<byte[]>() {
                     @Override
-                    public void call(byte[] bytes) {
+                    public void accept(byte[] bytes) {
                         showResult(bytes);
                     }
                 });
@@ -126,21 +126,21 @@ private void compressWithRx(Bitmap bitmap) {
                 .asObservable()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .doOnError(new Action1<Throwable>() {
+                .doOnError(new Consumer<Throwable>() {
                     @Override
-                    public void call(Throwable throwable) {
+                    public void accept(Throwable throwable) {
                         throwable.printStackTrace();
                     }
                 })
-                .onErrorResumeNext(new Func1<Throwable, Observable<? extends byte[]>>() {
+                .onErrorResumeNext(new Function<Throwable, Observable<? extends byte[]>>() {
                     @Override
-                    public Observable<? extends byte[]> call(Throwable throwable) {
+                    public Observable<? extends byte[]> apply(Throwable throwable) {
                         return Observable.empty();
                     }
                 })
-                .subscribe(new Action1<byte[]>() {
+                .subscribe(new Consumer<byte[]>() {
                     @Override
-                    public void call(byte[] bytes) {
+                    public void accept(byte[] bytes) {
                         showResult(bytes);
                     }
                 });

diff --git a/rxtaishan/build.gradle b/rxtaishan/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
-group='com.github.lengyue524'
+group='com.github.brooklet'
 
 android {
     compileSdkVersion 21
@@ -23,6 +23,7 @@ android {
 
 dependencies {
     compile project (':taishan')
-    compile 'io.reactivex:rxjava:1.1.9'
-    compile 'io.reactivex:rxandroid:1.2.1'
+    testCompile 'junit:junit:4.12'
+    compile 'io.reactivex.rxjava2:rxjava:2.1.2'
+    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
 }
diff --git a/rxtaishan/src/main/java/com/lengyue524/rxtaishan/RxTaiShan.java b/rxtaishan/src/main/java/com/lengyue524/rxtaishan/RxTaiShan.java
@@ -14,11 +14,13 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 
-import rx.Observable;
-import rx.Subscriber;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.ObservableEmitter;
+import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.annotations.NonNull;
+import io.reactivex.schedulers.Schedulers;
+import io.reactivex.functions.Consumer;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 
 public class RxTaiShan {
     private TaiShan mTaiShan;
@@ -57,17 +59,18 @@ public void launch() {
         if (compressListener != null) {
             compressListener.onStart();
         }
+
         asObservable().observeOn(Schedulers.computation())
-                .subscribeOn(AndroidSchedulers.mainThread()).subscribe(new Action1<byte[]>() {
+                .subscribeOn(AndroidSchedulers.mainThread()).subscribe(new Consumer<byte[]>() {
             @Override
-            public void call(byte[] bytes) {
+            public void accept(byte[] bytes) {
                 if (compressListener != null) {
                     compressListener.onSuccess(bytes);
                 }
             }
-        }, new Action1<Throwable>() {
+        }, new Consumer<Throwable>() {
             @Override
-            public void call(Throwable throwable) {
+            public void accept(Throwable throwable) {
                 if (compressListener != null) {
                     compressListener.onError(throwable);
                 }
@@ -76,9 +79,9 @@ public void call(Throwable throwable) {
     }
 
     public Observable<byte[]> asObservable() {
-        return Observable.create(new Observable.OnSubscribe<byte[]>() {
+        return Observable.create(new ObservableOnSubscribe<byte[]>() {
             @Override
-            public void call(Subscriber<? super byte[]> subscriber) {
+            public void subscribe(@NonNull ObservableEmitter<byte[]> subscriber) throws Exception {
                 subscriber.onNext(mTaiShan.launch());
             }
         });

diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':app', ':taishan', ':rxtaishan', ':rxtaishan'
+include ':app', ':taishan', ':rxtaishan'
diff --git a/taishan/build.gradle b/taishan/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
-group='com.github.lengyue524'
+group='com.github.brooklet'
 
 android {
     compileSdkVersion 21
@@ -22,4 +22,5 @@ android {
 }
 
 dependencies {
+    testCompile 'junit:junit:4.12'
 }