Переглянути джерело

feat: 删除无用的http请求代码

XiaodongLin 8 місяців тому
батько
коміт
246b8ab3dc

+ 0 - 15
app/src/main/java/com/adealink/weparty/module/family/FamilyModule.kt

@@ -125,14 +125,6 @@ object FamilyModule : BaseDynamicModule<IFamilyService>(IFamilyService::class),
                 return null
             }
 
-            override fun getFamilyLevelConfig(level: Int): FamilyLevelConfig? {
-                return null
-            }
-
-            override fun pullFamilyLevelConfig() {
-
-            }
-
             override suspend fun getFamilyMemberRelation(req: FamilyMemberRelationReq): Rlt<FamilyMemberRelationRsp?> {
                 return Rlt.Success(FamilyMemberRelationRsp())
             }
@@ -184,13 +176,6 @@ object FamilyModule : BaseDynamicModule<IFamilyService>(IFamilyService::class),
         return getService().getMyFamilyInfo()
     }
 
-    override fun getFamilyLevelConfig(level: Int): FamilyLevelConfig? {
-        return getService().getFamilyLevelConfig(level)
-    }
-
-    override fun pullFamilyLevelConfig() {
-        return getService().pullFamilyLevelConfig()
-    }
 
     override suspend fun getFamilyMemberRelation(req: FamilyMemberRelationReq): Rlt<FamilyMemberRelationRsp?> {
         return getService().getFamilyMemberRelation(req)

+ 0 - 4
app/src/main/java/com/adealink/weparty/module/family/IFamilyService.kt

@@ -49,10 +49,6 @@ interface IFamilyService : IService<IFamilyService> {
 
     fun getMyFamilyInfo(): FamilyInfo?
 
-    fun getFamilyLevelConfig(level: Int): FamilyLevelConfig?
-
-    fun pullFamilyLevelConfig()
-
     suspend fun getFamilyMemberRelation(req: FamilyMemberRelationReq): Rlt<FamilyMemberRelationRsp?>
 
     suspend fun familyMemberBanMsg(req: GroupGagReq): Rlt<Res<Any>>

+ 15 - 14
app/src/main/java/com/adealink/weparty/module/game/gamehub/GameHubManager.kt

@@ -149,20 +149,21 @@ class GameHubManager : BaseFrame<IGameHubListener>(), IGameHubManager {
     }
 
     private suspend fun getGameRemoteVersionConfig(game: Game): Map<Game, GameHubItemVersionData> {
-        when (val rlt = gameHubHttpService.getGameHubVersionConfig(GameHubConfig(game.type))) {
-            is Rlt.Failed -> {
-                return emptyMap()
-            }
-
-            is Rlt.Success -> {
-                val versionMap = mutableMapOf<Game, GameHubItemVersionData>()
-                val data = rlt.data.data
-                data?.get(game.type)?.let {
-                    versionMap[game] = it
-                }
-                return versionMap
-            }
-        }
+//        when (val rlt = gameHubHttpService.getGameHubVersionConfig(GameHubConfig(game.type))) {
+//            is Rlt.Failed -> {
+//                return emptyMap()
+//            }
+//
+//            is Rlt.Success -> {
+//                val versionMap = mutableMapOf<Game, GameHubItemVersionData>()
+//                val data = rlt.data.data
+//                data?.get(game.type)?.let {
+//                    versionMap[game] = it
+//                }
+//                return versionMap
+//            }
+//        }
+        return emptyMap()
     }
 
     private suspend fun getGameInfo(game: Game, remoteVersion: GameHubItemVersionData?): GameHubItemInfo {

+ 1 - 2
app/src/main/java/com/adealink/weparty/ui/MainStartUpFragment.kt

@@ -89,7 +89,7 @@ class MainStartUpFragment : BaseFragment() {
         MessageModule.activityOnCreateMainTask()
         BackpackModule.checkGiftBackpack()
         RoomModule.init()
-        GameModule.checkPlayingGame()
+//        GameModule.checkPlayingGame()
 
         if (activity?.isUiValid()==true) {
             roomAttrViewModel?.getMyRoomInfo(true)
@@ -113,7 +113,6 @@ class MainStartUpFragment : BaseFragment() {
         LevelModule.pullLevelConfigs()
         CoupleModule.pullCoupleConfig()
         WalletModule.init()
-        FamilyModule.pullFamilyLevelConfig()
         ProfileModule.pullUserNoteNameData()
         walletViewModel?.addGlobalConfigListener()
         walletViewModel?.getUserChargeNotify()

+ 1 - 1
module/couple/src/main/java/com/adealink/weparty/couple/CoupleServiceImpl.kt

@@ -53,7 +53,7 @@ class CoupleServiceImpl: ICoupleService {
     }
 
     override fun pullCoupleConfig() {
-        coupleManager.pullCoupleConfigs()
+//        coupleManager.pullCoupleConfigs()
         coupleManager.pullIntimacyConfigInfo()
     }
 

+ 0 - 8
module/family/src/main/java/com/adealink/weparty/family/FamilyServiceImpl.kt

@@ -95,14 +95,6 @@ class FamilyServiceImpl : IFamilyService {
         return familyManager.getMyFamilyInfo()
     }
 
-    override fun getFamilyLevelConfig(level: Int): FamilyLevelConfig? {
-        return familyManager.getFamilyLevelConfig(level)
-    }
-
-    override fun pullFamilyLevelConfig() {
-        return familyManager.pullFamilyLevelConfig()
-    }
-
     override suspend fun getFamilyMemberRelation(req: FamilyMemberRelationReq): Rlt<FamilyMemberRelationRsp?> {
         return familyManager.getFamilyMemberRelation(req)
     }

+ 0 - 24
module/family/src/main/java/com/adealink/weparty/family/manager/FamilyManager.kt

@@ -65,7 +65,6 @@ class FamilyManager : BaseFrame<IFamilyListener>(), IFamilyManager, ILoginListen
     private val familyHttpService by lazy {
         App.instance.networkService.getHttpService(FamilyHttpService::class.java)
     }
-    private val serverFamilyConfig = HashMap<Int, FamilyLevelConfig>() //服务端请求的vip config
     private var myFamilyInfo: FamilyInfo? = null
     private var applyJoinFamilyUnHandleNum: Int? = null
 
@@ -462,12 +461,6 @@ class FamilyManager : BaseFrame<IFamilyListener>(), IFamilyManager, ILoginListen
         }
     }
 
-    override fun pullFamilyLevelConfig() {
-        launch {
-            getFamilyLevelConfig()
-        }
-    }
-
     override suspend fun getFamilyMemberInfo(req: FamilyMemberInfoReq): Rlt<FamilyMemberInfo?> {
         return when (val result = familyHttpService.familyMemberInfo(req)) {
             is Rlt.Failed -> {
@@ -508,10 +501,6 @@ class FamilyManager : BaseFrame<IFamilyListener>(), IFamilyManager, ILoginListen
         return familyHttpService.familyMemberBanMsg(req)
     }
 
-    override fun getFamilyLevelConfig(level: Int): FamilyLevelConfig? {
-        return serverFamilyConfig[level]
-    }
-
     override suspend fun familyUpgrade(): Rlt<Res<FamilyInfo>> {
         return when (val result = familyHttpService.familyUpgrade()) {
             is Rlt.Success -> {
@@ -555,19 +544,6 @@ class FamilyManager : BaseFrame<IFamilyListener>(), IFamilyManager, ILoginListen
         }
     }
 
-    private suspend fun getFamilyLevelConfig() {
-        val configRlt =
-            familyHttpService.getFamilyLevelConfig(req = GetFamilyLevelConfigReq(levelType = 1))
-                .apply {
-                    Log.logRltI(TAG_FAMILY, "getFamilyLevelConfig", this)
-                }
-        if (configRlt is Rlt.Success) {
-            configRlt.data.data?.commonLevelConfigMap?.forEach { entry ->
-                serverFamilyConfig[entry.key] = entry.value
-            }
-        }
-    }
-
     override suspend fun familyMemberRoleUpdate(req: FamilyMemberRoleUpdateReq): Rlt<Any> {
         when (val result = familyHttpService.familyMemberRoleUpdate(req)) {
             is Rlt.Success -> {

+ 0 - 4
module/family/src/main/java/com/adealink/weparty/family/manager/IFamilyManager.kt

@@ -77,10 +77,6 @@ interface IFamilyManager : IBaseFrame<IFamilyListener> {
 
     suspend fun gerUserFamilyInfoDetail(familyId: Long): Rlt<FamilyInfoDetail>
 
-    fun getFamilyLevelConfig(level: Int): FamilyLevelConfig?
-
-    fun pullFamilyLevelConfig()
-
     suspend fun getFamilyMemberInfo(req: FamilyMemberInfoReq): Rlt<FamilyMemberInfo?>
 
     suspend fun getFamilyMemberRelation(req: FamilyMemberRelationReq): Rlt<FamilyMemberRelationRsp?>

+ 8 - 7
module/gift/src/main/java/com/adealink/weparty/gift/manager/GiftManager.kt

@@ -566,13 +566,14 @@ class GiftManager : BaseFrame<IGiftListener>(), IGiftManager, IRoomListener {
 
     override fun getFreeGiftConfig(refreshReceiveTime: Boolean) {
         Log.d(TAG_GIFT_GET, "getFreeGiftConfig")
-        launch {
-            val result = getRemoteFreeGiftConfig(refreshReceiveTime)
-            if (result is Rlt.Success) {
-                notifyFreeGiftInfoUpdated(result.data)
-                return@launch
-            }
-        }
+//        暂时注释免费礼物相关的代码,没在用
+//        launch {
+//            val result = getRemoteFreeGiftConfig(refreshReceiveTime)
+//            if (result is Rlt.Success) {
+//                notifyFreeGiftInfoUpdated(result.data)
+//                return@launch
+//            }
+//        }
     }
 
     override suspend fun renewalCustomGift(time: Long, resourceId: Long): Rlt<Res<Any>> {

+ 1 - 1
module/gift/src/main/java/com/adealink/weparty/gift/treasure/viewmodel/TreasureGiftViewModel.kt

@@ -44,7 +44,7 @@ class TreasureGiftViewModel : BaseViewModel(), ITreasureGiftViewModel, IGiftTrea
     override fun pullRoomPacketQueue(): LiveData<Rlt<List<TreasurePackageInfo>>> {
         val liveData = OnceMutableLiveData<Rlt<List<TreasurePackageInfo>>>()
         viewModelScope.launch {
-            liveData.send(treasureGiftManager.getRoomPackets(RoomModule.getJoinedRoomId() ?: 0))
+//            liveData.send(treasureGiftManager.getRoomPackets(RoomModule.getJoinedRoomId() ?: 0))
         }
         return liveData
     }

+ 1 - 1
module/operation/src/main/java/com/adealink/weparty/operation/giftwish/manager/GiftWishManager.kt

@@ -103,7 +103,7 @@ class GiftWishManager : BaseFrame<IGiftWishListener>(), IGiftWishManager {
 
     override fun refreshUserGiftWishInfo(uid: Long) {
         launch {
-            getUserGiftWishInfo(uid, false)
+//            getUserGiftWishInfo(uid, false)
         }
     }
 

+ 1 - 1
module/operation/src/main/java/com/adealink/weparty/operation/giftwish/viewmodel/GiftWishViewModel.kt

@@ -31,7 +31,7 @@ class GiftWishViewModel : BaseViewModel(), IGiftWishViewModel, IGiftWishListener
     override fun getUserGiftWishInfo(uid: Long, cache: Boolean): LiveData<Rlt<UserGiftWishInfo>> {
         val liveData: LiveData<Rlt<UserGiftWishInfo>> = OnceMutableLiveData()
         viewModelScope.launch {
-            liveData.send(giftWishManager.getUserGiftWishInfo(uid, cache))
+//            liveData.send(giftWishManager.getUserGiftWishInfo(uid, cache))
         }
         return liveData
     }

+ 1 - 1
module/profile/src/main/java/com/adealink/weparty/profile/ProfileServiceImpl.kt

@@ -152,7 +152,7 @@ class ProfileServiceImpl : IProfileService {
 
     override fun reportPhoneModel(scene: Int) {
         CoroutineScope(Dispatcher.UI).launch {
-            profileManager.reportPhoneModel(scene)
+//            profileManager.reportPhoneModel(scene)
         }
     }