From f71b49bdcd43b91dae5816762e05e1fb2509ea6a Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Sat, 20 Jan 2024 11:45:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=B7=E6=B7=86=E9=85=8D=E7=BD=AE=EF=BC=9A?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4RxExtenion=E4=BD=8D=E7=BD=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B9=E4=BE=BF=E6=B7=B7=E6=B7=86=E8=84=9A=E6=9C=AC=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nnbc123/app/fansteam/FansTeamJoinActivity.kt | 2 +-
 .../java/com/nnbc123/app/relation/cp/model/CpModel.kt     | 2 +-
 .../com/nnbc123/app/ui/im/recent/RecentListFragment.kt    | 2 +-
 .../java/com/nnbc123/core/home/model/HomeModel.kt         | 3 +--
 .../java/com/nnbc123/core/home/model/OrderRecordModel.kt  | 3 +--
 .../com/nnbc123/core/privilege/model/PrivilegeModel.kt    | 2 +-
 .../java/com/nnbc123/core/roombg/model/RoomBgModel.kt     | 2 +-
 .../java/com/nnbc123/core/decoration/DecorationModel.kt   | 2 +-
 .../main/java/com/nnbc123/core/fansteam/FansTeamModel.kt  | 2 +-
 .../java/com/nnbc123/core/redpackage/RedPackageModel.kt   | 6 +++---
 .../com/nnbc123/core/room/model/RoomInviteFansModel.kt    | 4 ++--
 .../java/com/nnbc123/core/room/wishlist/WishListModel.kt  | 8 ++++----
 .../com/nnbc123/core/utils/net/{ => ktx}/RxExtension.kt   | 5 +++--
 core/src/main/java/com/nnbc123/core/vip/VipModel.kt       | 2 +-
 14 files changed, 22 insertions(+), 23 deletions(-)
 rename core/src/main/java/com/nnbc123/core/utils/net/{ => ktx}/RxExtension.kt (96%)

diff --git a/app/src/main/java/com/nnbc123/app/fansteam/FansTeamJoinActivity.kt b/app/src/main/java/com/nnbc123/app/fansteam/FansTeamJoinActivity.kt
index b2fbfbf7a..975d1b978 100644
--- a/app/src/main/java/com/nnbc123/app/fansteam/FansTeamJoinActivity.kt
+++ b/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
 
diff --git a/app/src/main/java/com/nnbc123/app/relation/cp/model/CpModel.kt b/app/src/main/java/com/nnbc123/app/relation/cp/model/CpModel.kt
index 603ac89b7..742957c6e 100644
--- a/app/src/main/java/com/nnbc123/app/relation/cp/model/CpModel.kt
+++ b/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() {
diff --git a/app/src/main/java/com/nnbc123/app/ui/im/recent/RecentListFragment.kt b/app/src/main/java/com/nnbc123/app/ui/im/recent/RecentListFragment.kt
index c9bbe787f..2b069261e 100644
--- a/app/src/main/java/com/nnbc123/app/ui/im/recent/RecentListFragment.kt
+++ b/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
diff --git a/core/src/diff_src_erban/java/com/nnbc123/core/home/model/HomeModel.kt b/core/src/diff_src_erban/java/com/nnbc123/core/home/model/HomeModel.kt
index 2d2911637..1bc6b5bd9 100644
--- a/core/src/diff_src_erban/java/com/nnbc123/core/home/model/HomeModel.kt
+++ b/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
diff --git a/core/src/diff_src_erban/java/com/nnbc123/core/home/model/OrderRecordModel.kt b/core/src/diff_src_erban/java/com/nnbc123/core/home/model/OrderRecordModel.kt
index 15c7c4a34..c938e0fc0 100644
--- a/core/src/diff_src_erban/java/com/nnbc123/core/home/model/OrderRecordModel.kt
+++ b/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
diff --git a/core/src/diff_src_erban/java/com/nnbc123/core/privilege/model/PrivilegeModel.kt b/core/src/diff_src_erban/java/com/nnbc123/core/privilege/model/PrivilegeModel.kt
index e13342875..54b5e9042 100644
--- a/core/src/diff_src_erban/java/com/nnbc123/core/privilege/model/PrivilegeModel.kt
+++ b/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
diff --git a/core/src/diff_src_erban/java/com/nnbc123/core/roombg/model/RoomBgModel.kt b/core/src/diff_src_erban/java/com/nnbc123/core/roombg/model/RoomBgModel.kt
index 9745d29f9..61b2e5601 100644
--- a/core/src/diff_src_erban/java/com/nnbc123/core/roombg/model/RoomBgModel.kt
+++ b/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
diff --git a/core/src/main/java/com/nnbc123/core/decoration/DecorationModel.kt b/core/src/main/java/com/nnbc123/core/decoration/DecorationModel.kt
index aae2db7d1..89ebe5936 100644
--- a/core/src/main/java/com/nnbc123/core/decoration/DecorationModel.kt
+++ b/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.*
diff --git a/core/src/main/java/com/nnbc123/core/fansteam/FansTeamModel.kt b/core/src/main/java/com/nnbc123/core/fansteam/FansTeamModel.kt
index 06baf03a6..f26e675b1 100644
--- a/core/src/main/java/com/nnbc123/core/fansteam/FansTeamModel.kt
+++ b/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
diff --git a/core/src/main/java/com/nnbc123/core/redpackage/RedPackageModel.kt b/core/src/main/java/com/nnbc123/core/redpackage/RedPackageModel.kt
index b1c108fc5..7b768da72 100644
--- a/core/src/main/java/com/nnbc123/core/redpackage/RedPackageModel.kt
+++ b/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
diff --git a/core/src/main/java/com/nnbc123/core/room/model/RoomInviteFansModel.kt b/core/src/main/java/com/nnbc123/core/room/model/RoomInviteFansModel.kt
index ccb514444..d657d7bb3 100644
--- a/core/src/main/java/com/nnbc123/core/room/model/RoomInviteFansModel.kt
+++ b/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.*
diff --git a/core/src/main/java/com/nnbc123/core/room/wishlist/WishListModel.kt b/core/src/main/java/com/nnbc123/core/room/wishlist/WishListModel.kt
index 3f8500402..1203d8455 100644
--- a/core/src/main/java/com/nnbc123/core/room/wishlist/WishListModel.kt
+++ b/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
diff --git a/core/src/main/java/com/nnbc123/core/utils/net/RxExtension.kt b/core/src/main/java/com/nnbc123/core/utils/net/ktx/RxExtension.kt
similarity index 96%
rename from core/src/main/java/com/nnbc123/core/utils/net/RxExtension.kt
rename to core/src/main/java/com/nnbc123/core/utils/net/ktx/RxExtension.kt
index b97f3170f..f020ba8ac 100644
--- a/core/src/main/java/com/nnbc123/core/utils/net/RxExtension.kt
+++ b/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
 
 
 }
diff --git a/core/src/main/java/com/nnbc123/core/vip/VipModel.kt b/core/src/main/java/com/nnbc123/core/vip/VipModel.kt
index 6614514ee..37f7a0bc4 100644
--- a/core/src/main/java/com/nnbc123/core/vip/VipModel.kt
+++ b/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