混淆配置：调整RxExtenion位置，方便混淆脚本筛选

app/src/main/java/com/nnbc123/app/fansteam/FansTeamJoinActivity.kt

@@ -14,7 +14,7 @@ import com.nnbc123.app.ui.webview.DialogWebViewActivity
 import com.nnbc123.core.UriProvider
 import com.nnbc123.core.gift.GiftModel
 import com.nnbc123.core.manager.AvRoomDataManager
-import com.nnbc123.core.utils.net.handleBeanData
+import com.nnbc123.core.utils.net.ktx.handleBeanData
 import com.nnbc123.core.utils.ext.subAndReplaceDot
 import com.nnbc123.core.utils.ext.toast
 

app/src/main/java/com/nnbc123/app/relation/cp/model/CpModel.kt

@@ -2,7 +2,7 @@ package com.nnbc123.app.relation.cp.model
 
 import com.nnbc123.core.base.BaseModel
 import com.nnbc123.core.relation.cp.*
-import com.nnbc123.core.utils.net.launchRequest
+import com.nnbc123.core.utils.net.ktx.launchRequest
 import com.nnbc123.library.net.rxnet.RxNet
 
 object CpModel : BaseModel() {

app/src/main/java/com/nnbc123/app/ui/im/recent/RecentListFragment.kt

@@ -14,7 +14,7 @@ import com.nnbc123.core.user.bean.AttentionInfo
 import com.nnbc123.core.user.bean.UserInfo
 import com.nnbc123.core.user.event.LoadLoginUserInfoEvent
 import com.nnbc123.core.utils.SharedPreferenceUtils
-import com.nnbc123.core.utils.net.io2main
+import com.nnbc123.core.utils.net.ktx.io2main
 import com.nnbc123.core.utils.ext.toast
 import com.nnbc123.app.R
 import com.nnbc123.app.avroom.activity.AVRoomActivity

core/src/diff_src_erban/java/com/nnbc123/core/home/model/HomeModel.kt

@@ -3,7 +3,6 @@ package com.nnbc123.core.home.model
 import com.nnbc123.core.DemoCache
 import com.nnbc123.core.auth.AuthModel
 import com.nnbc123.core.base.BaseModel
-import com.nnbc123.core.bean.response.BeanResult
 import com.nnbc123.core.bean.response.ServiceResult
 import com.nnbc123.core.community.CommunityConstant
 import com.nnbc123.core.community.bean.UnReadCountInfo
@@ -16,7 +15,7 @@ import com.nnbc123.core.room.game.GameInfo
 import com.nnbc123.core.user.bean.AnchorGradeInfo
 import com.nnbc123.core.user.bean.UserInfo
 import com.nnbc123.core.utils.net.RxHelper
-import com.nnbc123.core.utils.net.launchRequest
+import com.nnbc123.core.utils.net.ktx.launchRequest
 import com.nnbc123.library.net.rxnet.RxNet
 import io.reactivex.Single
 import kotlinx.coroutines.Dispatchers

core/src/diff_src_erban/java/com/nnbc123/core/home/model/OrderRecordModel.kt

@@ -3,8 +3,7 @@ package com.nnbc123.core.home.model
 import com.nnbc123.core.base.BaseModel
 import com.nnbc123.core.bean.response.ServiceResult
 import com.nnbc123.core.home.bean.*
-import com.nnbc123.core.privilege.bean.PrivilegeCardInfo
-import com.nnbc123.core.utils.net.launchRequest
+import com.nnbc123.core.utils.net.ktx.launchRequest
 import com.nnbc123.library.net.rxnet.RxNet
 import retrofit2.http.GET
 import retrofit2.http.Query

core/src/diff_src_erban/java/com/nnbc123/core/privilege/model/PrivilegeModel.kt

@@ -4,7 +4,7 @@ import com.nnbc123.core.base.BaseModel
 import com.nnbc123.core.bean.response.ServiceResult
 import com.nnbc123.core.home.bean.*
 import com.nnbc123.core.privilege.bean.PrivilegeCardInfo
-import com.nnbc123.core.utils.net.launchRequest
+import com.nnbc123.core.utils.net.ktx.launchRequest
 import com.nnbc123.library.net.rxnet.RxNet
 import retrofit2.http.GET
 import retrofit2.http.POST

core/src/diff_src_erban/java/com/nnbc123/core/roombg/model/RoomBgModel.kt

@@ -4,7 +4,7 @@ import com.nnbc123.core.base.BaseModel
 import com.nnbc123.core.bean.response.ServiceResult
 import com.nnbc123.core.home.bean.*
 import com.nnbc123.core.roombg.bean.RoomBgInfo
-import com.nnbc123.core.utils.net.launchRequest
+import com.nnbc123.core.utils.net.ktx.launchRequest
 import com.nnbc123.library.net.rxnet.RxNet
 import retrofit2.http.GET
 import retrofit2.http.POST

core/src/main/java/com/nnbc123/core/decoration/DecorationModel.kt

@@ -3,7 +3,7 @@ package com.nnbc123.core.decoration
 import com.nnbc123.core.base.BaseModel
 import com.nnbc123.core.bean.response.ServiceResult
 import com.nnbc123.core.utils.net.RxHelper
-import com.nnbc123.core.utils.net.launchRequest
+import com.nnbc123.core.utils.net.ktx.launchRequest
 import com.nnbc123.library.net.rxnet.RxNet
 import io.reactivex.Single
 import retrofit2.http.*

core/src/main/java/com/nnbc123/core/fansteam/FansTeamModel.kt

@@ -3,7 +3,7 @@ package com.nnbc123.core.fansteam
 import com.nnbc123.core.base.BaseModel
 import com.nnbc123.core.bean.response.ServiceResult
 import com.nnbc123.core.manager.AvRoomDataManager
-import com.nnbc123.core.utils.net.launchRequest
+import com.nnbc123.core.utils.net.ktx.launchRequest
 import com.nnbc123.library.net.rxnet.RxNet
 import retrofit2.http.GET
 import retrofit2.http.Query

core/src/main/java/com/nnbc123/core/redpackage/RedPackageModel.kt

@@ -3,9 +3,9 @@ package com.nnbc123.core.redpackage
 
 
 import com.nnbc123.core.bean.response.ServiceResult
-import com.nnbc123.core.utils.net.handleBeanData
-import com.nnbc123.core.utils.net.handleStringData
-import com.nnbc123.core.utils.net.io2main
+import com.nnbc123.core.utils.net.ktx.handleBeanData
+import com.nnbc123.core.utils.net.ktx.handleStringData
+import com.nnbc123.core.utils.net.ktx.io2main
 import com.nnbc123.library.net.rxnet.RxNet
 import io.reactivex.Observable
 import io.reactivex.Single

core/src/main/java/com/nnbc123/core/room/model/RoomInviteFansModel.kt

@@ -4,8 +4,8 @@ package com.nnbc123.core.room.model
 
 import com.nnbc123.core.room.bean.RoomInviteFansInfo
 import com.nnbc123.core.bean.response.ServiceResult
-import com.nnbc123.core.utils.net.handleBeanData
-import com.nnbc123.core.utils.net.io2main
+import com.nnbc123.core.utils.net.ktx.handleBeanData
+import com.nnbc123.core.utils.net.ktx.io2main
 import com.nnbc123.library.net.rxnet.RxNet
 import io.reactivex.Single
 import retrofit2.http.*

core/src/main/java/com/nnbc123/core/room/wishlist/WishListModel.kt

@@ -4,10 +4,10 @@ import com.nnbc123.core.base.BaseModel
 import com.nnbc123.core.bean.response.ServiceResult
 import com.nnbc123.core.gift.bean.SimpleUserInfo
 import com.nnbc123.core.manager.AvRoomDataManager
-import com.nnbc123.core.utils.net.handleBeanData
-import com.nnbc123.core.utils.net.handleStringData
-import com.nnbc123.core.utils.net.io2main
-import com.nnbc123.core.utils.net.launchRequest
+import com.nnbc123.core.utils.net.ktx.handleBeanData
+import com.nnbc123.core.utils.net.ktx.handleStringData
+import com.nnbc123.core.utils.net.ktx.io2main
+import com.nnbc123.core.utils.net.ktx.launchRequest
 import com.nnbc123.library.net.rxnet.RxNet
 import io.reactivex.Single
 import retrofit2.http.Field

core/src/main/java/com/nnbc123/core/utils/net/ktx/RxExtension.kt

@@ -1,8 +1,9 @@
-package com.nnbc123.core.utils.net
+package com.nnbc123.core.utils.net.ktx
 
 
 import com.nnbc123.core.bean.response.ServiceResult
 import com.nnbc123.core.utils.ext.ifNullOrEmpty
+import com.nnbc123.core.utils.net.ServerException
 import io.reactivex.Single
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
@@ -27,7 +28,7 @@ fun <T> Single<ServiceResult<T>>.handleBeanData(): Single<T> {
                 } else {
                     return@flatMap Single.error<T>(Throwable(it.message.ifNullOrEmpty { "未知错误" }))
                 }
-            }
+            }s
 
 
 }

core/src/main/java/com/nnbc123/core/vip/VipModel.kt

@@ -4,7 +4,7 @@ import com.nnbc123.core.base.BaseModel
 import com.nnbc123.core.bean.response.ServiceResult
 import com.nnbc123.core.manager.AvRoomDataManager
 import com.nnbc123.core.pay.bean.ChargeBean
-import com.nnbc123.core.utils.net.launchRequest
+import com.nnbc123.core.utils.net.ktx.launchRequest
 import com.nnbc123.library.net.rxnet.RxNet
 import retrofit2.http.Field
 import retrofit2.http.FormUrlEncoded