rebase

modules/mogo-module-chat/src/main/java/com/mogo/chat/net/CoroutineDSL.kt

@@ -1,92 +0,0 @@
-package com.mogo.chat.net
-
-import androidx.lifecycle.LifecycleOwner
-import com.mogo.chat.exception.ApiException
-import com.mogo.chat.exception.ApiException.Companion.NULL_REQUEST_DATA_API_EXCEPTION
-import com.mogo.chat.exception.CommonException.Companion.NETWORK_EXCEPTION
-import com.mogo.chat.exception.CommonException.Companion.NULL_EXCEPTION
-import com.mogo.chat.base.BaseResponse
-import kotlinx.coroutines.*
-import java.net.SocketTimeoutException
-import java.net.UnknownHostException
-import java.util.concurrent.TimeoutException
-
-class Request<T> {
-    private lateinit var loader: suspend () -> T
-
-    private var start: (() -> Unit)? = null
-
-    private var onSuccess: ((T) -> Unit)? = null
-
-    private var onError: ((java.lang.Exception) -> Unit)? = null
-
-    private var onComplete: (() -> Unit)? = null
-
-    private var addLifecycle: LifecycleOwner? = null
-
-
-    infix fun loader(loader: suspend () -> T) {
-        this.loader = loader
-    }
-
-    infix fun start(start: (() -> Unit)?) {
-        this.start = start
-    }
-
-    infix fun onSuccess(onSuccess: ((T) -> Unit)?) {
-        this.onSuccess = onSuccess
-    }
-
-    infix fun onError(onError: ((java.lang.Exception) -> Unit)?) {
-        this.onError = onError
-    }
-
-    infix fun onComplete(onComplete: (() -> Unit)?) {
-        this.onComplete = onComplete
-    }
-
-    infix fun addLifecycle(addLifecycle: LifecycleOwner?) {
-        this.addLifecycle = addLifecycle
-    }
-
-    fun request() {
-
-        GlobalScope.launch(context = Dispatchers.Main) {
-
-            start?.invoke()
-            try {
-                val deferred = GlobalScope.async(Dispatchers.IO, start = CoroutineStart.LAZY) {
-                    loader()
-                }
-                val result = deferred.await()
-                if (result != null && result is BaseResponse<*>) {
-                    if (result.code == 0) {
-                        onSuccess?.invoke(result)
-                    } else {
-                        throw ApiException(result.code, result.msg)
-                    }
-                } else {
-                    throw NULL_REQUEST_DATA_API_EXCEPTION
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-                //数据打点
-                if (e == null) {
-                    onError?.invoke(NULL_EXCEPTION)
-                }
-                when (e) {
-                    is UnknownHostException -> onError?.invoke(NETWORK_EXCEPTION)
-                    is TimeoutException -> onError?.invoke(NETWORK_EXCEPTION)
-                    is SocketTimeoutException -> onError?.invoke(NETWORK_EXCEPTION)
-                    else -> onError?.invoke(java.lang.Exception(e.message))
-                }
-            } finally {
-                onComplete?.invoke()
-            }
-        }
-    }
-}
-
-inline fun <T> request(buildRequest: Request<T>.() -> Unit) {
-    Request<T>().apply(buildRequest).request()
-}

modules/mogo-module-chat/src/main/java/com/mogo/chat/net/HttpApi.kt

@@ -1,7 +1,7 @@
 package com.mogo.chat.net
 
-import com.mogo.chat.base.BaseResponse
 import com.mogo.chat.model.bean.*
+import com.mogo.eagle.core.data.BaseResponse
 import retrofit2.http.*
 
 interface HttpApi {