diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RxExtension.kt b/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RxExtension.kt index 11d309271..4fd3acf5f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RxExtension.kt +++ b/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RxExtension.kt @@ -87,8 +87,7 @@ suspend inline fun launchRequest( block() } catch (e: Exception) { e.printStackTrace() - if (e is IOException) throw ServerException(ResUtil.getString(R.string.utils_net_rxextension_06),-1) - else throw e + throw e }.run { if (isSuccess) { data diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/exception/ExceptionHandle.kt b/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/exception/ExceptionHandle.kt index 23eec5fd2..563c77ee8 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/exception/ExceptionHandle.kt +++ b/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/exception/ExceptionHandle.kt @@ -10,13 +10,12 @@ import java.net.UnknownHostException import java.text.ParseException /** - * Created by qisan 2022/5/26 - * com.qisan.wanandroid.http.exception + * Created by wushaocheng 2023/1/31 */ class ExceptionHandle { + companion object { private const val TAG = "ExceptionHandle" - var errorCode = ErrorStatus.UNKNOWN_ERROR var errorMsg = "請求失敗,請稍後重試" fun handleException(e: Throwable): String { @@ -25,25 +24,20 @@ class ExceptionHandle { is SocketTimeoutException, is ConnectException, is HttpException -> { //均视为网络错误 Log.e(TAG, "網絡連接異常: " + e.message) errorMsg = "網絡異常,請檢查您的網絡再試~" - errorCode = ErrorStatus.NETWORK_ERROR } is JsonParseException, is JSONException, is ParseException -> { //均视为解析错误 Log.e(TAG, "數據解析異常: " + e.message) errorMsg = "數據解析異常" - errorCode = ErrorStatus.SERVER_ERROR } is ApiException -> {//服务器返回的错误信息 errorMsg = e.message.toString() - errorCode = ErrorStatus.SERVER_ERROR } is UnknownHostException -> { Log.e(TAG, "網絡連接異常: " + e.message) errorMsg = "網絡異常,請檢查您的網絡再試~" - errorCode = ErrorStatus.NETWORK_ERROR } is IllegalArgumentException -> { errorMsg = "參數錯誤" - errorCode = ErrorStatus.SERVER_ERROR } else -> {//未知错误 try { @@ -52,7 +46,6 @@ class ExceptionHandle { Log.e(TAG, "未知錯誤Debug調試 ") } errorMsg = e.message.toString() - errorCode = ErrorStatus.UNKNOWN_ERROR } } return errorMsg