1.移除RxJava和retrofit的rxjava转换器的依赖

2.注解ServiceApi增加属性rxJava

Author: catchpig

annotation/src/main/java/com/catchpig/annotation/ServiceApi.kt

@@ -12,30 +12,34 @@ import kotlin.reflect.KClass
 @Retention(AnnotationRetention.RUNTIME)
 @Target(AnnotationTarget.CLASS)
 annotation class ServiceApi(
-        /**
-         * 域名或者IP
-         */
-        val baseUrl: String,
-        /**
-         * 接收数据转换器(封装的有基类-@see BaseResponseBodyConverter)
-         * 也可以不使用基类,直接继承{@see SerializationConverter}
-         */
-        val responseConverter: KClass<out SerializationConverter<*, *>>,
-        /**
-         * 连接超时时间(毫秒)
-         */
-        val connectTimeout: Long = 5000,
-        /**
-         * 读取超时时间(毫秒)
-         */
-        val readTimeout: Long = 5000,
-        /**
-         * 拦截器
-         */
-        val interceptors: Array<KClass<out Interceptor>> = [],
-        /**
-         * debug模式的拦截器
-         */
-        val debugInterceptors: Array<KClass<out Interceptor>> = []
+    /**
+     * 域名或者IP
+     */
+    val baseUrl: String,
+    /**
+     * 接收数据转换器(封装的有基类-@see BaseResponseBodyConverter)
+     * 也可以不使用基类,直接继承{@see SerializationConverter}
+     */
+    val responseConverter: KClass<out SerializationConverter<*, *>>,
+    /**
+     * 连接超时时间(毫秒)
+     */
+    val connectTimeout: Long = 5000,
+    /**
+     * 读取超时时间(毫秒)
+     */
+    val readTimeout: Long = 5000,
+    /**
+     * 拦截器
+     */
+    val interceptors: Array<KClass<out Interceptor>> = [],
+    /**
+     * debug模式的拦截器
+     */
+    val debugInterceptors: Array<KClass<out Interceptor>> = [],
+    /**
+     * 是否使用RxJava做转换器
+     */
+    val rxJava: Boolean = false
 )
 

app/build.gradle

@@ -37,6 +37,7 @@ android {
     buildFeatures {
         viewBinding = true
     }
+    namespace 'com.catchpig.kmvvm'
 }
 
 dependencies {
@@ -54,6 +55,13 @@ dependencies {
     kapt project(path: ':compiler')
 //    implementation "com.gitee.catchpig.kmvvm:mvvm:$kotlin_mvvm"
 //    kapt "com.gitee.catchpig.kmvvm:compiler:$kotlin_mvvm"
+
+
+//    implementation("com.squareup.retrofit2:adapter-rxjava3:$retrofit2_version")
+
+    //rxjava3
+    implementation "io.reactivex.rxjava3:rxjava:$rxjava_version"
+    implementation "io.reactivex.rxjava3:rxandroid:$rxandroid_version"
     //刷新-头部
     implementation "io.github.scwang90:refresh-header-material:$SmartRefreshLayout_version"
     //刷新-底部

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:dist="http://schemas.android.com/apk/distribution"
-    package="com.catchpig.kmvvm">
+    xmlns:dist="http://schemas.android.com/apk/distribution">
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

build.gradle

@@ -28,7 +28,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:7.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong

compiler/src/main/java/com/catchpig/compiler/ServiceApiProcessor.kt

@@ -118,12 +118,13 @@ class ServiceApiProcessor : BaseProcessor() {
                 }
             }
             constructorBuilder = constructorBuilder.addStatement(
-                "serviceMap.put(%S, %T(%S, %L, %L, $interceptorName,$debugInterceptorName))",
+                "serviceMap.put(%S, %T(%S, %L, %L, $interceptorName,$debugInterceptorName,%L))",
                 "$packageName.$className",
                 CLASS_NAME_SERVICE_PARAM,
                 service.baseUrl,
                 service.connectTimeout,
                 service.readTimeout,
+                service.rxJava
             )
         }
         return constructorBuilder.build()

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Fri Sep 10 22:03:05 CST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

mvvm/build.gradle

@@ -30,6 +30,7 @@ android {
     buildFeatures {
         viewBinding = true
     }
+    namespace 'com.catchpig.mvvm'
 }
 
 dependencies {
@@ -60,12 +61,12 @@ dependencies {
 
     //retrofit2
     api "com.squareup.retrofit2:retrofit:$retrofit2_version"
-    api("com.squareup.retrofit2:adapter-rxjava3:$retrofit2_version")
     api("com.squareup.retrofit2:converter-gson:$retrofit2_version")
+    compileOnly("com.squareup.retrofit2:adapter-rxjava3:$retrofit2_version")
 
     //rxjava3
-    api "io.reactivex.rxjava3:rxjava:$rxjava_version"
-    api "io.reactivex.rxjava3:rxandroid:$rxandroid_version"
+    compileOnly "io.reactivex.rxjava3:rxjava:$rxjava_version"
+    compileOnly "io.reactivex.rxjava3:rxandroid:$rxandroid_version"
 
 
     api "com.github.catch-pig:LoadingView:$loading_version"

mvvm/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.catchpig.mvvm">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!--读写文件权限-->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

mvvm/src/main/java/com/catchpig/mvvm/apt/interfaces/GlobalCompiler.kt

@@ -17,7 +17,7 @@ interface GlobalCompiler {
     fun getGlobalConfig(): IGlobalConfig
 
     /**
-     * 发送Rxjava的异常到被注解FlowError修饰的接口实现类
+     * 发送Rxjava或者Flow的异常到被注解FlowError修饰的接口实现类
      * @param any Any
      * @param t Throwable
      */

mvvm/src/main/java/com/catchpig/mvvm/entity/ServiceParam.kt

@@ -7,5 +7,6 @@ data class ServiceParam(
     val connectTimeout: Long,
     val readTimeout: Long,
     val interceptors: MutableList<Interceptor>,
-    val debugInterceptors: MutableList<Interceptor>
+    val debugInterceptors: MutableList<Interceptor>,
+    val rxJava:Boolean
 )