From 3dfeabdf3bd033a8db3f9575bed0d2dd3928279c Mon Sep 17 00:00:00 2001 From: TongTongStudio Date: Sun, 26 Jul 2026 05:16:47 +0800 Subject: [PATCH] =?UTF-8?q?feat(deps):=20=E5=8D=87=E7=BA=A7=20RxJava=20?= =?UTF-8?q?=E8=87=B3=20v3=20=E5=B9=B6=E6=9B=B4=E6=96=B0=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AppFrame/build.gradle | 26 ++++++++++--------- .../arialyy/frame/base/net/HttpCallback.java | 22 +++++++++------- .../arialyy/frame/base/net/NetManager.java | 4 +-- app/build.gradle | 16 ++++++------ 4 files changed, 36 insertions(+), 32 deletions(-) diff --git a/AppFrame/build.gradle b/AppFrame/build.gradle index 0069327e..9f5b84fc 100644 --- a/AppFrame/build.gradle +++ b/AppFrame/build.gradle @@ -54,23 +54,25 @@ dependencies { androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) + testImplementation 'junit:junit:4.12' api "androidx.appcompat:appcompat:${rootProject.ext.XAppcompatVersion}" - api 'com.google.code.gson:gson:2.8.2' - api 'io.reactivex:rxandroid:1.2.0' - api 'io.reactivex:rxjava:1.1.5' + api 'com.google.code.gson:gson:2.8.5' + api 'io.reactivex.rxjava3:rxjava:3.0.0' + api 'io.reactivex.rxjava3:rxandroid:3.0.0' - implementation 'com.squareup.okhttp3:okhttp:3.10.0' - implementation 'com.squareup.retrofit2:retrofit:2.1.0' - implementation 'com.squareup.retrofit2:adapter-rxjava:2.1.0' - implementation 'com.squareup.retrofit2:converter-gson:2.1.0' - implementation 'com.squareup.okhttp3:logging-interceptor:3.2.0' - implementation 'com.github.franmontiel:PersistentCookieJar:v1.0.1' implementation 'androidx.multidex:multidex:2.0.1' + implementation 'com.squareup.okhttp3:okhttp:3.10.0' + implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0' + implementation 'com.squareup.retrofit2:retrofit:2.9.0' +// implementation 'com.squareup.retrofit2:adapter-rxjava:2.9.0' + implementation 'com.squareup.retrofit2:adapter-rxjava3:2.9.0' + implementation 'com.squareup.retrofit2:converter-gson:2.9.0' + implementation 'com.github.franmontiel:PersistentCookieJar:v1.0.1' - api 'androidx.lifecycle:lifecycle-runtime:2.0.0' - api 'androidx.lifecycle:lifecycle-extensions:2.0.0' - kapt 'androidx.lifecycle:lifecycle-compiler:2.0.0' + api 'androidx.lifecycle:lifecycle-runtime:2.2.0' + api 'androidx.lifecycle:lifecycle-extensions:2.2.0' + kapt 'androidx.lifecycle:lifecycle-compiler:2.2.0' } diff --git a/AppFrame/src/main/java/com/arialyy/frame/base/net/HttpCallback.java b/AppFrame/src/main/java/com/arialyy/frame/base/net/HttpCallback.java index b1def39a..90f99060 100644 --- a/AppFrame/src/main/java/com/arialyy/frame/base/net/HttpCallback.java +++ b/AppFrame/src/main/java/com/arialyy/frame/base/net/HttpCallback.java @@ -2,33 +2,35 @@ package com.arialyy.frame.base.net; import com.arialyy.frame.util.show.FL; import com.arialyy.frame.util.show.L; -import rx.Observable; -import rx.android.schedulers.AndroidSchedulers; -import rx.functions.Func1; -import rx.schedulers.Schedulers; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +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.schedulers.Schedulers; /** * Created by “Aria.Lao” on 2016/10/26. * HTTP数据回调 */ -public abstract class HttpCallback implements INetResponse, Observable.Transformer { +public abstract class HttpCallback implements INetResponse, ObservableTransformer { @Override public void onFailure(Throwable e) { L.e("HttpCallback", FL.getExceptionString(e)); } - @Override public Observable call(Observable observable) { + @Override public ObservableSource apply(Observable observable) { Observable tObservable = observable.subscribeOn(Schedulers.io()) .unsubscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .map(new Func1() { - @Override public T call(T t) { + .map(new Function() { + @Override public T apply(T t) { onResponse(t); return t; } }) - .onErrorReturn(new Func1() { - @Override public T call(Throwable throwable) { + .onErrorReturn(new Function() { + @Override public T apply(Throwable throwable) { onFailure(throwable); return null; } diff --git a/AppFrame/src/main/java/com/arialyy/frame/base/net/NetManager.java b/AppFrame/src/main/java/com/arialyy/frame/base/net/NetManager.java index 71d2f144..92e10e25 100644 --- a/AppFrame/src/main/java/com/arialyy/frame/base/net/NetManager.java +++ b/AppFrame/src/main/java/com/arialyy/frame/base/net/NetManager.java @@ -12,7 +12,7 @@ import com.google.gson.Gson; import java.util.concurrent.TimeUnit; import okhttp3.OkHttpClient; import retrofit2.Retrofit; -import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory; +import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory; import retrofit2.converter.gson.GsonConverterFactory; /** @@ -79,7 +79,7 @@ public class NetManager { ; final Retrofit.Builder builder = new Retrofit.Builder().client(okHttpClient) .baseUrl(NetConstant.BASE_URL) - .addCallAdapterFactory(RxJavaCallAdapterFactory.create()); + .addCallAdapterFactory(RxJava3CallAdapterFactory.create()); builder.addConverterFactory(f); return builder.build().create(service); } diff --git a/app/build.gradle b/app/build.gradle index b76b57e7..df119e26 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -76,18 +76,22 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') + + api 'com.github.PhilJay:MPAndroidChart:v3.0.3' + + implementation 'androidx.cardview:cardview:1.0.0' + testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test:runner:1.2.0' androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0' debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7' - implementation 'androidx.cardview:cardview:1.0.0' - implementation 'com.google.android.material:material:1.0.0' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0' implementation "org.jetbrains.kotlin:kotlin-stdlib:${rootProject.ext.kotlin_version}" - api 'com.github.PhilJay:MPAndroidChart:v3.0.3' + + implementation 'com.google.android.material:material:1.0.0' implementation 'com.github.bumptech.glide:glide:3.7.0' implementation 'com.pddstudio:highlightjs-android:1.5.0' @@ -111,7 +115,3 @@ dependencies { debugImplementation 'com.amitshekhar.android:debug-db:1.0.6' } - -repositories { - mavenCentral() -}