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

feat: 1.Gson库下沉,并gson解析全部自动使用ExtReflectiveTypeAdapterFactory,不必手动声明; (#60)

Co-authored-by: duxuefu <duxuefu@zhenxinmail.com>
dxf 9 місяців тому
батько
коміт
1784dca9d6
100 змінених файлів з 19 додано та 729 видалено
  1. 5 5
      app/dependencies/releaseRuntimeClasspath.txt
  2. 0 4
      app/src/main/java/com/adealink/weparty/cocosgame/data/CocosDialogData.kt
  3. 0 13
      app/src/main/java/com/adealink/weparty/cocosgame/data/CocosGameData.kt
  4. 0 6
      app/src/main/java/com/adealink/weparty/cocosgame/data/CocosNativeData.kt
  5. 0 7
      app/src/main/java/com/adealink/weparty/cocosgame/data/CocosPlayerData.kt
  6. 0 4
      app/src/main/java/com/adealink/weparty/cocosgame/data/CocosWindowViewData.kt
  7. 0 10
      app/src/main/java/com/adealink/weparty/cocosgame/data/GameData.kt
  8. 0 9
      app/src/main/java/com/adealink/weparty/cocosgame/data/GameToNativeOpData.kt
  9. 0 3
      app/src/main/java/com/adealink/weparty/cocosgame/method/OnDeeplink.kt
  10. 10 4
      app/src/main/java/com/adealink/weparty/commonui/text/span/DataBindingSpan.kt
  11. 0 4
      app/src/main/java/com/adealink/weparty/config/Data.kt
  12. 0 4
      app/src/main/java/com/adealink/weparty/location/data/LocationData.kt
  13. 0 3
      app/src/main/java/com/adealink/weparty/module/account/data/LoginData.kt
  14. 0 10
      app/src/main/java/com/adealink/weparty/module/anchor/data/AnchorData.kt
  15. 0 8
      app/src/main/java/com/adealink/weparty/module/backpack/BackpackData.kt
  16. 0 12
      app/src/main/java/com/adealink/weparty/module/call/match/data/CallMatchData.kt
  17. 0 8
      app/src/main/java/com/adealink/weparty/module/certification/CertificationConfig.kt
  18. 1 33
      app/src/main/java/com/adealink/weparty/module/couple/data/CoupleData.kt
  19. 0 6
      app/src/main/java/com/adealink/weparty/module/couple/data/IntimacyData.kt
  20. 0 6
      app/src/main/java/com/adealink/weparty/module/emotion/data/EmotionData.kt
  21. 0 6
      app/src/main/java/com/adealink/weparty/module/entereffect/data/EnterEffectData.kt
  22. 0 3
      app/src/main/java/com/adealink/weparty/module/excel/ExcelData.kt
  23. 0 32
      app/src/main/java/com/adealink/weparty/module/family/data/FamilyData.kt
  24. 0 5
      app/src/main/java/com/adealink/weparty/module/family/data/FamilyLevelConfig.kt
  25. 0 3
      app/src/main/java/com/adealink/weparty/module/family/data/JoinFamilyRewardInfo.kt
  26. 0 2
      app/src/main/java/com/adealink/weparty/module/family/data/StarRelationShipData.kt
  27. 0 7
      app/src/main/java/com/adealink/weparty/module/follow/data/FollowData.kt
  28. 0 8
      app/src/main/java/com/adealink/weparty/module/game/data/GameData.kt
  29. 0 5
      app/src/main/java/com/adealink/weparty/module/game/data/GameHubData.kt
  30. 0 4
      app/src/main/java/com/adealink/weparty/module/game/data/MicCharmPKData.kt
  31. 0 5
      app/src/main/java/com/adealink/weparty/module/game/data/RedPacketData.kt
  32. 0 11
      app/src/main/java/com/adealink/weparty/module/game/data/RouletteData.kt
  33. 0 11
      app/src/main/java/com/adealink/weparty/module/game/rocket/Data.kt
  34. 0 3
      app/src/main/java/com/adealink/weparty/module/gamehub/carrom/data/CarromDialogData.kt
  35. 0 3
      app/src/main/java/com/adealink/weparty/module/gamehub/domino/data/DominoDialogData.kt
  36. 0 3
      app/src/main/java/com/adealink/weparty/module/gamehub/ludo/data/LudoData.kt
  37. 0 3
      app/src/main/java/com/adealink/weparty/module/gamehub/ludo/data/LudoDialogData.kt
  38. 0 4
      app/src/main/java/com/adealink/weparty/module/gamehub/uno/data/UnoData.kt
  39. 0 3
      app/src/main/java/com/adealink/weparty/module/gamehub/uno/data/UnoDialogData.kt
  40. 1 15
      app/src/main/java/com/adealink/weparty/module/gift/data/GiftData.kt
  41. 0 8
      app/src/main/java/com/adealink/weparty/module/gift/data/GiftTreasureData.kt
  42. 0 25
      app/src/main/java/com/adealink/weparty/module/level/data/LevelData.kt
  43. 0 9
      app/src/main/java/com/adealink/weparty/module/medal/data/MedalData.kt
  44. 0 13
      app/src/main/java/com/adealink/weparty/module/message/data/MessageData.kt
  45. 1 18
      app/src/main/java/com/adealink/weparty/module/micgrab/data/MicGrabData.kt
  46. 0 3
      app/src/main/java/com/adealink/weparty/module/music/data/MusicData.kt
  47. 0 4
      app/src/main/java/com/adealink/weparty/module/operation/banner/data/BannerData.kt
  48. 0 6
      app/src/main/java/com/adealink/weparty/module/operation/data/ActivityTaskData.kt
  49. 0 5
      app/src/main/java/com/adealink/weparty/module/operation/data/RewardData.kt
  50. 0 4
      app/src/main/java/com/adealink/weparty/module/operation/giftwish/data/GiftWishData.kt
  51. 0 3
      app/src/main/java/com/adealink/weparty/module/operation/newuser/Data.kt
  52. 0 5
      app/src/main/java/com/adealink/weparty/module/operation/rechargepackage/data/RechargePackageData.kt
  53. 0 5
      app/src/main/java/com/adealink/weparty/module/operation/roomactivity/data/RoomActivityData.kt
  54. 0 4
      app/src/main/java/com/adealink/weparty/module/operation/signinreward/data/SignInRewardData.kt
  55. 0 4
      app/src/main/java/com/adealink/weparty/module/operation/signinreward/data/TodaySignInRewardData.kt
  56. 0 3
      app/src/main/java/com/adealink/weparty/module/operation/supersupporter/data/HighPaymentUserRewardNotify.kt
  57. 0 3
      app/src/main/java/com/adealink/weparty/module/operation/worldcup/data/WorldCupData.kt
  58. 0 11
      app/src/main/java/com/adealink/weparty/module/party/data/PartyData.kt
  59. 0 9
      app/src/main/java/com/adealink/weparty/module/pk/data/PKData.kt
  60. 0 28
      app/src/main/java/com/adealink/weparty/module/profile/data/ProfileData2.kt
  61. 0 26
      app/src/main/java/com/adealink/weparty/module/profile/data/UserConfigType.kt
  62. 0 6
      app/src/main/java/com/adealink/weparty/module/profile/decorate/data/ExtraConfigData.kt
  63. 0 11
      app/src/main/java/com/adealink/weparty/module/profile/decorate/data/UserDecorateData.kt
  64. 0 4
      app/src/main/java/com/adealink/weparty/module/profile/tags/data/UserTagsData.kt
  65. 0 5
      app/src/main/java/com/adealink/weparty/module/rank/data/RankListData.kt
  66. 0 4
      app/src/main/java/com/adealink/weparty/module/rank/data/RankRewardData.kt
  67. 0 4
      app/src/main/java/com/adealink/weparty/module/room/chat/data/ChatData.kt
  68. 0 6
      app/src/main/java/com/adealink/weparty/module/room/data/MicSeatData.kt
  69. 0 5
      app/src/main/java/com/adealink/weparty/module/room/data/RoomAttrData.kt
  70. 0 3
      app/src/main/java/com/adealink/weparty/module/room/data/RoomFlowData.kt
  71. 0 2
      app/src/main/java/com/adealink/weparty/module/room/data/RoomMemberData.kt
  72. 0 13
      app/src/main/java/com/adealink/weparty/module/room/data/RoomMicSeatData.kt
  73. 0 2
      app/src/main/java/com/adealink/weparty/module/room/data/RoomNewUserRewardData.kt
  74. 0 27
      app/src/main/java/com/adealink/weparty/module/room/data/RoomNotifyData.kt
  75. 0 8
      app/src/main/java/com/adealink/weparty/module/room/data/WeddingRedPacketData.kt
  76. 0 3
      app/src/main/java/com/adealink/weparty/module/setting/data/SensitiveWord.kt
  77. 0 3
      app/src/main/java/com/adealink/weparty/module/share/data/Data.kt
  78. 0 3
      app/src/main/java/com/adealink/weparty/module/skin/data/SkinData.kt
  79. 0 13
      app/src/main/java/com/adealink/weparty/module/store/data/StoreData.kt
  80. 0 7
      app/src/main/java/com/adealink/weparty/module/task/Data.kt
  81. 0 4
      app/src/main/java/com/adealink/weparty/module/task/invite/InviteData.kt
  82. 0 5
      app/src/main/java/com/adealink/weparty/module/theme/data/ThemeData.kt
  83. 0 3
      app/src/main/java/com/adealink/weparty/module/userlist/datasource/remote/HomeListHttpService.kt
  84. 0 11
      app/src/main/java/com/adealink/weparty/module/userprotect/data/ReportData.kt
  85. 0 23
      app/src/main/java/com/adealink/weparty/module/wallet/data/WalletData.kt
  86. 0 2
      app/src/main/java/com/adealink/weparty/module/webview/data/WebData.kt
  87. 0 2
      app/src/main/java/com/adealink/weparty/module/youtube/data/VideoRoomData.kt
  88. 0 10
      app/src/main/java/com/adealink/weparty/module/youtube/data/YoutubeData.kt
  89. 0 3
      app/src/main/java/com/adealink/weparty/network/PingSocketService.kt
  90. 0 3
      app/src/main/java/com/adealink/weparty/oss/FederationToken.kt
  91. 0 3
      app/src/main/java/com/adealink/weparty/setting/data/Data.kt
  92. 0 4
      app/src/main/java/com/adealink/weparty/token/Data.kt
  93. 0 3
      app/src/main/java/com/adealink/weparty/url/H5PageConfig.kt
  94. 0 3
      app/src/main/java/com/adealink/weparty/webview/jsbridge/method/LogJSNativeMethod.kt
  95. 0 2
      app/src/main/java/com/adealink/weparty/webview/jsbridge/method/StatJSNativeMethod.kt
  96. 0 4
      frame/room/src/main/java/com/adealink/frame/room/data/RoomFlowData.kt
  97. 1 1
      gradle/libs.versions.toml
  98. 0 15
      module/account/src/main/java/com/adealink/weparty/account/login/data/LoginData.kt
  99. 0 4
      module/anchor/src/main/java/com/adealink/weparty/anchor/data/getAnchorMessagesReq.kt
  100. 0 4
      module/attribution/src/main/java/com/adealink/weparty/attribution/utm/FacebookUtm.kt

+ 5 - 5
app/dependencies/releaseRuntimeClasspath.txt

@@ -232,24 +232,24 @@ com.wenext.android:frame-aab:5.1.8-yoki-beta
 com.wenext.android:frame-apm:5.1.4
 com.wenext.android:frame-audio:5.1.4
 com.wenext.android:frame-base:5.1.4
-com.wenext.android:frame-bom:5.1.22-yoki-9
+com.wenext.android:frame-bom:5.1.22-yoki-10
 com.wenext.android:frame-coroutine:5.1.4
 com.wenext.android:frame-crash:5.1.4
-com.wenext.android:frame-data:5.1.4
+com.wenext.android:frame-data:5.1.5-yoki
 com.wenext.android:frame-debug:5.1.4
 com.wenext.android:frame-deviceid:5.1.4
 com.wenext.android:frame-dot:5.1.10-yoki-beta
 com.wenext.android:frame-download:5.1.7-yoki-beta
 com.wenext.android:frame-effect:5.1.6
-com.wenext.android:frame-game:5.1.4
+com.wenext.android:frame-game:5.1.5-yoki
 com.wenext.android:frame-googleservice:5.1.4
 com.wenext.android:frame-guide:5.1.18-yoki
 com.wenext.android:frame-image:5.1.6-yoki-beta2
-com.wenext.android:frame-locale:5.1.7
+com.wenext.android:frame-locale:5.1.8-yoki
 com.wenext.android:frame-log:5.1.5-yoki
 com.wenext.android:frame-media:5.1.9-yoki-beta
 com.wenext.android:frame-mvvm:5.1.4
-com.wenext.android:frame-network:5.1.4-yoki-beta
+com.wenext.android:frame-network:5.1.5-yoki
 com.wenext.android:frame-oss:5.1.7-yoki-1
 com.wenext.android:frame-push:5.1.4
 com.wenext.android:frame-router-annotation:5.1.4

+ 0 - 4
app/src/main/java/com/adealink/weparty/cocosgame/data/CocosDialogData.kt

@@ -1,8 +1,6 @@
 package com.adealink.weparty.cocosgame.data
 
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
 /*
  * Cocos游戏弹窗
@@ -31,7 +29,6 @@ class UnknownDialogData : DialogData() {
 /**
  * 退出游戏确认弹窗
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ExitGameDialogData(@SerializedName("game_record") val gameRecord: String) :
     DialogData() {
     override fun toString(): String {
@@ -39,5 +36,4 @@ data class ExitGameDialogData(@SerializedName("game_record") val gameRecord: Str
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CurrencyInsufficientDialogData(@SerializedName("type") val type: Int) : DialogData()

+ 0 - 13
app/src/main/java/com/adealink/weparty/cocosgame/data/CocosGameData.kt

@@ -12,13 +12,10 @@ import com.adealink.weparty.module.account.AccountModule
 import com.adealink.weparty.module.profile.data.UserInfo
 import com.adealink.weparty.module.rank.data.RankListItemData
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameStartNotify(
     @SerializedName("seqid") val seqId: Long,
     @Must
@@ -83,7 +80,6 @@ data class ExitGameReq(
     @SerializedName("seqid") val seqId: Long = System.currentTimeMillis()
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CreateGameRes(
     @SerializedName("gameConfigInfo") val gameConfigInfo: GameConfigInfo,
     @SerializedName("gameExpireTime") val gameExpireTime: Long,
@@ -120,7 +116,6 @@ data class GamePlayersInfo(
 data class GameConfigReq(@SerializedName("gameConfigInfo") val gameConfigInfo: GameConfigInfo)
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameInviteNotify(
     @SerializedName("teamCode") val teamCode: String,
     @Must
@@ -133,7 +128,6 @@ data class GameInviteNotify(
 ) : Parcelable
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class PlayerChangedNotify(
     @Must
     @SerializedName("seqid") val seqId: Long,
@@ -156,7 +150,6 @@ data class PlayerChangedNotify(
 }
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class PlayerGameInfo(
     val seqId: Long,
     @Must
@@ -190,7 +183,6 @@ data class GameDashboardReq(
     @SerializedName("gameType") val gameType: Int
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameDashboardRes(
     @SerializedName("uid") val uid: Long,
     @SerializedName("weekRank") val weekRank: Long,//周排名
@@ -207,7 +199,6 @@ data class GameDashboardRes(
 )
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class QuickText(
     @SerializedName("id") val id: Long,
 
@@ -327,7 +318,6 @@ data class GuessGameConfigInfo(
 )
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameRecoverFailData(
     @SerializedName("reason") val reason: Int, //失败原因, 1:网络重连
     @SerializedName("msg") val msg: String, //失败原因描述
@@ -337,7 +327,6 @@ data class GameRecoverFailData(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class OnNodeVisibleChangedData(
     @SerializedName("type") val type: String, //按钮类型, emotion_btn, message_btn
     @Must
@@ -385,7 +374,6 @@ data class GetPlayerMicStatusReq(
 /**
  * 查询房间的用户麦位状态返回
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GetPlayerMicStatusRes(
     @SerializedName("gameId") val gameId: String,
     @SerializedName("micInfos") val micInfos: List<GameMicInfo>?, // 麦位开关状态
@@ -405,7 +393,6 @@ data class OpPlayerMicStatusReq(
     @SerializedName("status") val status: Int
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameMicNotify(
     @SerializedName("roomId") val roomId: Long,//房间id
     @SerializedName("gameId") val gameId: String,//游戏id

+ 0 - 6
app/src/main/java/com/adealink/weparty/cocosgame/data/CocosNativeData.kt

@@ -2,13 +2,10 @@ package com.adealink.weparty.cocosgame.data
 
 import android.os.Parcelable
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class DialogIdData(@SerializedName("id") val id: Long)
 
 data class InitGameData(
@@ -42,7 +39,6 @@ data class StartGameData(
     var gamePlayerMap: Map<Long, GamePlayerInfo>? = null
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class GameConfigInfo(
     @SerializedName("gameType") val game: Int, //参考 Game
@@ -75,7 +71,6 @@ data class GameOtherConfig(
 )
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameRewardData(
     @SerializedName("rank") val rank: Int,
     @SerializedName("reward") val reward: Int,
@@ -129,7 +124,6 @@ data class PlayerData(
 
 class EmptyData
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameRecordData(@SerializedName("game_record") val gameRecord: String)
 
 

+ 0 - 7
app/src/main/java/com/adealink/weparty/cocosgame/data/CocosPlayerData.kt

@@ -2,9 +2,7 @@ package com.adealink.weparty.cocosgame.data
 
 import android.os.Parcelable
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 enum class PlayerStatus(val status: Int) {
@@ -19,11 +17,9 @@ enum class PlayerStatus(val status: Int) {
 
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class PlayerStatusData(@SerializedName("status") val status: Int)
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GamePlayerInfo(
     @SerializedName("feeOrder") val feeOrder: String = "",//如果是付费场,则该字段记录用户的付费订单ID
     @SerializedName("playerId") var playerId: Long = 0,//参与游戏的玩家ID
@@ -95,7 +91,6 @@ data class GamePlayerInfo(
 }
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class PlayerCommonConfigData(
     @SerializedName("type") val type: Int, //配置类型
     @SerializedName("intDataValue1") val intDataValue1: Long, //整型配置值1
@@ -118,7 +113,6 @@ data class PlayerCommonConfigData(
 
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class PlayerExtraInfoData(
     @SerializedName("undoItemList") val ludoItemList: List<UndoItemData>, //重摇道具
     @SerializedName("undoItemCountLimit") val undoItemCountLimit: Int, //每回合使用重摇道具次数
@@ -127,7 +121,6 @@ data class PlayerExtraInfoData(
 
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UndoItemData(
     @SerializedName("diamond") val diamond: Int, //配置类型
 ) : Parcelable

+ 0 - 4
app/src/main/java/com/adealink/weparty/cocosgame/data/CocosWindowViewData.kt

@@ -15,7 +15,6 @@ import com.google.gson.JsonSerializer
 import com.google.gson.annotations.GsonNullable
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 import java.lang.reflect.Type
 
@@ -89,7 +88,6 @@ object InitNodeViewDataParser : JsonDeserializer<InitNodeViewData>,
 }
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CocosPosition(
     @SerializedName("x") val x: Float,
     @SerializedName("y") val y: Float,
@@ -119,7 +117,6 @@ data class CocosPosition(
 
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CocosViewSize(
     @SerializedName("width") val width: Float,
     @SerializedName("height") val height: Float,
@@ -152,7 +149,6 @@ enum class CocosViewLocation(val location: Int) {
 /**
  * Cocos视图控件位置大小
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CocosViewData(
     @SerializedName("position") val position: CocosPosition,
     @SerializedName("size") val size: CocosViewSize,

+ 0 - 10
app/src/main/java/com/adealink/weparty/cocosgame/data/GameData.kt

@@ -7,9 +7,7 @@ import com.adealink.frame.base.AppBaseInfo
 import com.adealink.frame.util.PackageUtil
 import com.adealink.weparty.R
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 import org.json.JSONObject
 
@@ -97,7 +95,6 @@ data class GameShowConfigReq(
     @SerializedName("packageName") val packageName: String = PackageUtil.getPackageName(),
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameShowConfig(
     @SerializedName("show") val show: Boolean,
     @GsonNullable
@@ -126,7 +123,6 @@ data class GameBetCoinsReq(
     val gameRoomType: Int? = null,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameBetCoinsRes(
     /**
      * key: eg: [CarromGameType]
@@ -135,7 +131,6 @@ data class GameBetCoinsRes(
     val gameTypeConfig: Map<Int, GameModeBetConfigData>
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameModeBetConfigData(
     /**
      * key: eg: [CarromGameMode]
@@ -176,7 +171,6 @@ interface RoomCommonOperatorData {
 }
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameActivityRewardInfo(
     @GsonNullable
     @SerializedName("rewardTypeName") val rewardTypeName: String? = null,
@@ -260,7 +254,6 @@ data class RewardDetailData(
 ) : Parcelable
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RewardDetailSource(
     @SerializedName("date") val date: Long,
     @GsonNullable
@@ -270,7 +263,6 @@ data class RewardDetailSource(
 ) : Parcelable
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RewardItem(
     @SerializedName("carveUpNum") val carveUpNum: Int,
     @SerializedName("dynamicResourceUrl") val dynamicResourceUrl: String,
@@ -317,14 +309,12 @@ data class RewardItemData(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserGameLevelInfoResult(
     @SerializedName("seqid") val seqid: Long,
     @GsonNullable
     @SerializedName("userGameLevelInfoMap") val userGameLevelInfoMap: MutableMap<String, UserGameLevelInfo>? = null,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserGameLevelInfo(
     @SerializedName("uid") val uid: Long,
     @SerializedName("gameLevel") val gameLevel: Int,

+ 0 - 9
app/src/main/java/com/adealink/weparty/cocosgame/data/GameToNativeOpData.kt

@@ -11,7 +11,6 @@ import com.google.gson.JsonSerializationContext
 import com.google.gson.JsonSerializer
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 import java.lang.reflect.Type
 
@@ -98,7 +97,6 @@ class UnknownOpData : GameToNativeOpData()
 /**
  * 点击头像
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ClickAvatarOpData(@SerializedName("uid") val uid: Long) : GameToNativeOpData()
 
 /**
@@ -136,21 +134,18 @@ enum class VibrateType(val duration: Long) {
 /**
  * 震动
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class VibrateOpData(@SerializedName("duration") val duration: Long /*单位:ms*/) :
     GameToNativeOpData()
 
 /**
  * 播放音效
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class PlaySoundOpData(@SerializedName("sound_name") val soundName: String) :
     GameToNativeOpData()
 
 /**
  * 停止播放音效
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class StopSoundOpData(@SerializedName("sound_name") val soundName: String) :
     GameToNativeOpData()
 
@@ -167,13 +162,11 @@ class SwitchVibrateOpData : GameToNativeOpData()
 /**
  * 点击麦克风
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ClickMicOpData(@SerializedName("uid") val uid: Long) : GameToNativeOpData()
 
 /**
  * 点击表情按钮
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ClickEmotionOpData(
     @SerializedName("position") val position: CocosPosition,
     @SerializedName("size") val size: CocosViewSize
@@ -182,7 +175,6 @@ data class ClickEmotionOpData(
 /**
  * 点击消息按钮
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ClickMessageOpData(
     @SerializedName("position") val position: CocosPosition,
     @SerializedName("size") val size: CocosViewSize
@@ -204,7 +196,6 @@ class ShowGameRuleOpData : GameToNativeOpData()
 /**
  * 展示奖杯信息
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 class ShowTrophyOpData(
     @SerializedName("position") val position: CocosPosition,
     @SerializedName("size") val size: CocosViewSize

+ 0 - 3
app/src/main/java/com/adealink/weparty/cocosgame/method/OnDeeplink.kt

@@ -6,13 +6,10 @@ import com.adealink.weparty.cocosgame.data.TAG_COCOS_GAME_WEB
 import com.adealink.weparty.util.goLocalLinkPage
 import com.adealink.weparty.webview.jsbridge.callback.JSBridgeCallback
 import com.adealink.weparty.webview.jsbridge.method.JSNativeMethod
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
 private const val METHOD_NAME = "onDeeplink"
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class DeeplinkData(@SerializedName("deeplink") val deeplink: String)
 
 class OnDeeplinkJsMethod : JSNativeMethod<DeeplinkData, Any> {

+ 10 - 4
app/src/main/java/com/adealink/weparty/commonui/text/span/DataBindingSpan.kt

@@ -1,7 +1,10 @@
 package com.adealink.weparty.commonui.text.span
 
 import android.graphics.Color
-import android.text.*
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.Spanned
+import android.text.TextPaint
 import android.text.style.ClickableSpan
 import android.text.style.ForegroundColorSpan
 import android.view.View
@@ -10,10 +13,14 @@ import com.adealink.frame.data.json.toJsonErrorNull
 import com.adealink.frame.ext.safeSetSpan
 import com.adealink.frame.util.fitLocateDirectionForNickname
 import com.adealink.frame.util.getJSONObject
-import com.google.gson.*
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonPrimitive
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import java.lang.reflect.Type
 
 private const val SPAN_TYPE = "spanType"
@@ -165,7 +172,6 @@ data class ImageDataBindingSpan(
 /**
  * 带跳转链接的文字, 需要配合 LinkMovementMethod 使用
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class LinkDataBindingSpan(
     @SerializedName("link") val link: String?
 ) : DataBindingSpan(DataBindingSpanType.LINK) {

+ 0 - 4
app/src/main/java/com/adealink/weparty/config/Data.kt

@@ -6,9 +6,7 @@ import com.adealink.frame.util.PackageUtil
 import com.adealink.weparty.channel.getChannel
 import com.adealink.weparty.constant.ProductFlavor
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
 data class GetGlobalConfigReq(
     @SerializedName("configs") val configs: List<Int>,
@@ -95,7 +93,6 @@ enum class GlobalConfigType(val value: Int) {
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameVersionConfig(
     @SerializedName("version") val version: String,
     @GsonNullable
@@ -112,7 +109,6 @@ data class GameVersionConfig(
     var needDownload: Boolean = true //包体需要下载
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ApprovingVersionConfig(
     @SerializedName("android")
     val android: String,

+ 0 - 4
app/src/main/java/com/adealink/weparty/location/data/LocationData.kt

@@ -1,8 +1,6 @@
 package com.adealink.weparty.location.data
 
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
 /**
  * Created by sunxiaodong on 2021/6/24.
@@ -38,13 +36,11 @@ data class ReportLocationReq(@SerializedName("locationInfo") val locationInfo: S
 /**
  * 获取用户国家地区信息
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GetCountryInfoRes(
     @SerializedName("seqId") val seqId: Long,
     @SerializedName("userCountry") val userCountryMap: Map<Long, UserCountryInfo>,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserCountryInfo(
     @SerializedName("country")
     val country: String,

+ 0 - 3
app/src/main/java/com/adealink/weparty/module/account/data/LoginData.kt

@@ -1,9 +1,7 @@
 package com.adealink.weparty.module.account.data
 
 import android.os.Parcelable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 import java.util.Locale
 
@@ -25,7 +23,6 @@ data class BannerInfoRes(
 
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class SmsCountryInfo(
     @SerializedName("areaCode") val areaCode: String,
     @SerializedName("countryCode") val countryCode: String,

+ 0 - 10
app/src/main/java/com/adealink/weparty/module/anchor/data/AnchorData.kt

@@ -3,11 +3,8 @@ package com.adealink.weparty.module.anchor.data
 import android.os.Parcelable
 import com.adealink.frame.data.json.froJsonErrorNull
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
-import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
 enum class FromScene(val scene: Int) {
@@ -72,14 +69,12 @@ enum class FromScene(val scene: Int) {
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class HighPotentialConversionRewardNotify(
     @SerializedName("nickName") val nickName: String,
     @SerializedName("rewardContent") val rewardContent: String,
 )
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class AnchorMessage(
     @Must
     @SerializedName("messageId") val messageId: Long,
@@ -160,7 +155,6 @@ enum class AnchorMessageTemplateType(val type: Int) {
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class AnchorMessageButton(
     @SerializedName("buttonType")
     val buttonType: Int,//按钮类型
@@ -208,7 +202,6 @@ enum class AnchorMsgBtnAction(val action: Int) {
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class AnchorMessageTemplateBody(
     @GsonNullable
     @SerializedName("title")
@@ -231,7 +224,6 @@ data class CannotHandleMsg(
     val occurredVersion: Int,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ButtonGradientColor(
     @GsonNullable
     @SerializedName("startColor")
@@ -241,7 +233,6 @@ data class ButtonGradientColor(
     val endColor: String? = null
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class AnchorDiamondRewardMessage(
     @SerializedName("content") val content: String = "", //消息内容
@@ -249,7 +240,6 @@ data class AnchorDiamondRewardMessage(
     @SerializedName("deeplink") val deeplink: String = "" //跳转链接
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class DailyGreetingMessage(
     /** 额度 */

+ 0 - 8
app/src/main/java/com/adealink/weparty/module/backpack/BackpackData.kt

@@ -11,9 +11,7 @@ import com.adealink.weparty.R
 import com.adealink.weparty.module.profile.decorate.data.GoodsExtraConfig
 import com.adealink.weparty.module.store.data.UserGoodInfo
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 
@@ -65,7 +63,6 @@ fun getGoodsTabName(pos: Int): String {
 
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserPackageInfo(
     @SerializedName("id")
     val id: Long, //背包物品id
@@ -253,7 +250,6 @@ data class SelectUserPackageInfo(
     val packageInfo: UserPackageInfo
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GetUserBackpackGoodsListRes(
     @SerializedName("carList") val carList: List<UserGoodInfo>,
     @SerializedName("photoFrameList") val photoFrameList: List<UserGoodInfo>,
@@ -271,14 +267,12 @@ data class GetUserBackpackGoodsListRes(
     @SerializedName("experienceCardList") val experienceCardList: List<UserGoodInfo>, //道具体验卡
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GetExperienceCardRes(
     @SerializedName("seqId") val seqId: Long,
     @SerializedName("uid") val uid: Long,
     @SerializedName("experienceCardInfos") val experienceCardInfoList: List<UserExperienceCardInfo>
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserExperienceCardInfo(
     @SerializedName("cardType") val cardType: Int,
     @SerializedName("times") val times: Int,
@@ -286,14 +280,12 @@ data class UserExperienceCardInfo(
     @SerializedName("status") val status: Int
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ConsumeCardReq(
     @SerializedName("uid") val uid: Long,
     @SerializedName("type") val type: Int,
     @SerializedName("consumeDuration") val consumeDuration: Int,    //消费数量,次数或者时长
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ConsumeCardRes(
     @SerializedName("cardType") val cardType: Int,
     @SerializedName("times") val times: Int,

+ 0 - 12
app/src/main/java/com/adealink/weparty/module/call/match/data/CallMatchData.kt

@@ -3,16 +3,13 @@ package com.adealink.weparty.module.call.match.data
 import com.adealink.frame.base.AppBaseInfo
 import com.adealink.frame.util.PackageUtil
 import com.adealink.weparty.module.profile.tags.data.UserLabel
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
 /**
  * Created by sunxiaodong on 2021/10/30.
  */
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CallMatchConfig(
     @Must
     @SerializedName("matchTimeutSeconds") val timeoutS: Long,
@@ -31,7 +28,6 @@ enum class MatchType(val type: Int) {
     VOICE_CHAT(1); //语音聊天匹配
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CallMatchReq(
     @SerializedName("matchId") val matchId: Long,
     @SerializedName("matchFemaleOrMale") val female: Boolean = true,
@@ -43,7 +39,6 @@ data class CallMatchReq(
     @SerializedName("clientVersion") val clientVersion: Int = PackageUtil.getVersionCode(),
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CallMatchResult(
     @Must
     @SerializedName("matchId") val matchId: Long,
@@ -56,7 +51,6 @@ data class CallMatchResult(
     @SerializedName("matchedUidType") val matchedUserType: Int,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class PublicMatchUserNotify(
     @Must
     @SerializedName("roomId") val roomId: Long,
@@ -64,7 +58,6 @@ data class PublicMatchUserNotify(
     @SerializedName("showUserInfo") val userInfo: com.adealink.weparty.module.profile.data.UserInfo,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class MatchOrderInfo(
     @Must
     @SerializedName("orderId") val orderId: String,
@@ -87,7 +80,6 @@ enum class TakeOrderUserType(val type: Int) {
     RECENT_ONLINE(3) //匹配到的用户来自于最近在线用户
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class MatchOrderNotify(
     @Must
     @SerializedName("matchOrderInfo") val orderInfo: MatchOrderInfo,
@@ -101,7 +93,6 @@ data class MatchOrderNotify(
 
 data class CallTopicsReq(@SerializedName("peerMatchedUid") val uid: Long)
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CallTopicsRes(
     @SerializedName("commonLabels") val commonLabels: List<UserLabel>,
     @SerializedName("peerLabels") val peerLabels: List<UserLabel>,
@@ -115,7 +106,6 @@ data class TakeMatchOrderReq(
     @SerializedName("clientVersion") val clientVersion: Int = PackageUtil.getVersionCode(),
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class TakeMatchOrderRes(
     @Must
     @SerializedName("matchOrderInfo") val orderInfo: MatchOrderInfo,
@@ -127,7 +117,6 @@ data class TakeMatchOrderRes(
     @SerializedName("rewardValue") val rewardValue: Long, //奖励金额
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CallEndNotify(
     @Must
     @SerializedName("notifyId") val notifyId: Long,
@@ -135,7 +124,6 @@ data class CallEndNotify(
     @SerializedName("roomId") val roomId: Long,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CallMatchRewardGiveNotify(
     @Must
     @SerializedName("matchChannel") val roomId: Long,

+ 0 - 8
app/src/main/java/com/adealink/weparty/module/certification/CertificationConfig.kt

@@ -2,16 +2,13 @@ package com.adealink.weparty.module.certification
 
 import android.os.Parcelable
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 /**
  * Created by XiaoDongLin.
  * Date: 2025/5/21
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class CertificationConfig(
     @SerializedName("detectorMode")
@@ -34,7 +31,6 @@ data class CertificationConfig(
 ) : Parcelable
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class QualityConfig(
     @SerializedName("allowBrowOcclusion")
@@ -62,7 +58,6 @@ data class QualityConfig(
 ) : Parcelable
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class SilentConfig(
     @SerializedName("timeoutMillis")
@@ -71,7 +66,6 @@ data class SilentConfig(
     val minDurationMillis: Long
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class MotionConfig(
     @SerializedName("motions")
@@ -88,14 +82,12 @@ data class MotionConfig(
     val isRandomSequence: Boolean,
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class LivenessConfig(
     @SerializedName("livenessThreshold")
     val livenessThreshold: Float
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class ColorConfig(
     @SerializedName("motions")

+ 1 - 33
app/src/main/java/com/adealink/weparty/module/couple/data/CoupleData.kt

@@ -7,14 +7,12 @@ import com.adealink.frame.base.fastLazy
 import com.adealink.frame.locale.language.languageManager
 import com.adealink.frame.oss.ossService
 import com.adealink.frame.util.getRemainDay
-import com.adealink.weparty.module.account.AccountModule
 import com.adealink.weparty.commonui.recycleview.diffutil.BaseListItemData
+import com.adealink.weparty.module.account.AccountModule
 import com.adealink.weparty.module.gift.data.GiftDynamicEntity
 import com.adealink.weparty.module.store.data.StoreGoodsInfo
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 import org.json.JSONObject
 import java.text.SimpleDateFormat
@@ -30,7 +28,6 @@ data class CPUserInfo(
     var avatarUrl: String
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GetCPProtectRankBoardRes(//1
     @GsonNullable
     @SerializedName("hasCp")
@@ -47,7 +44,6 @@ data class GetCPProtectRankBoardRes(//1
 )
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CpProtectRes(
     @GsonNullable
     @SerializedName("protectVal") val protectVal: Long?,
@@ -65,7 +61,6 @@ data class UpdateLoveHouseProfileReq(
 )
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class InviteCpListRes(
     @SerializedName("uid")
     val uid: Long,
@@ -105,7 +100,6 @@ data class InviteCpListRes(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class CpBlessGiftListRes(
     @SerializedName("createTime")
@@ -183,7 +177,6 @@ data class UpdateLoveHouseThemeReq(
 )
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GuardListUserInfo(
     @SerializedName("uid")
     val uid: Long = 0L,
@@ -274,7 +267,6 @@ data class CoupleAndFriendInfo(
 )
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CoupleUserInfo(
     @SerializedName("type")
     val type: Int,//类型:1-cp,2-朋友:CoupleType
@@ -395,7 +387,6 @@ data class CoupleUserInfo(
 
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class CommonConfigInfo(
     @SerializedName("configType") val configType: Int,//配置类型
@@ -436,7 +427,6 @@ infix fun CoupleUserInfo.contentsTheSame(other: CoupleUserInfo): Boolean =
         && level == other.level
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GetIntimacyInfoRes(
     @GsonNullable
     @SerializedName("couples")
@@ -450,7 +440,6 @@ data class GetIntimacyInfoRes(
     var getCPProtectRankBoardRes: GetCPProtectRankBoardRes? = null,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CoupleBaseUserInfo(
     @SerializedName("intimacyId")
     val intimacyId: String,
@@ -482,7 +471,6 @@ data class CoupleBaseUserInfo(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CoupleConfigInfo(
     @SerializedName("level")
     val level: Int = 0,//亲密度等级
@@ -517,7 +505,6 @@ data class CoupleColor(
     val angle: Int,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CoupleInviteNotify(
     @SerializedName("userInfo")
     val inviterUserInfo: CoupleUserInfo,
@@ -526,7 +513,6 @@ data class CoupleInviteNotify(
 )
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CoupleWeeklyCompleteNotify(
     @SerializedName("content")
     val content: String,
@@ -535,7 +521,6 @@ data class CoupleWeeklyCompleteNotify(
     val rewardItems: List<CpRankingReward?>? = null
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CoupleReleasedNotify(
     @SerializedName("userInfo")
     val coupleUserInfo: CoupleUserInfo,
@@ -546,7 +531,6 @@ data class CoupleReleasedNotify(
     val friendType: Int?,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class IntimacyOnMicNotify(
     @SerializedName("otherUid")
     val coupleUid: Long,
@@ -562,7 +546,6 @@ data class IntimacyOnMicNotify(
     val otherGender: Int = 0,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class CoupleLevelUpNotify(
     @SerializedName("level")
@@ -582,7 +565,6 @@ data class CoupleLevelUpNotify(
 ) : Parcelable
 
 //摩天轮
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CpFerrisWheel(
     @GsonNullable
     @SerializedName("couples")
@@ -600,7 +582,6 @@ data class CpFerrisWheel(
 
 
 //CP周榜信息
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CpWeeklyRankBoard(
     @GsonNullable
     @SerializedName("rankBoardList")
@@ -630,7 +611,6 @@ data class SelfRankInfo(
 )
 
 //周榜查看奖励
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CommonActivityRewardInfo(
     @GsonNullable
     @SerializedName("detailList")
@@ -638,7 +618,6 @@ data class CommonActivityRewardInfo(
 )
 
 //周榜等级奖励
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CpUserLevelReward(
     @SerializedName("channel")
     val channel: String,
@@ -662,7 +641,6 @@ data class CpUserLevelReward(
 
 
 //周榜查看奖励
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CommonActivityRewardInfoData(
     @SerializedName("date")
     val date: Long,
@@ -677,7 +655,6 @@ data class CommonActivityRewardInfoData(
 
 
 //CP周榜排名奖励
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CpRankingRewards(
 
     @SerializedName("minRank")
@@ -706,7 +683,6 @@ data class CpRankingRewards(
 
 //奖励实体类
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CpRankingReward(
 
     @SerializedName("rewardResourceType")
@@ -781,7 +757,6 @@ data class CpRankingReward(
 /**
  * 小窝背景主题实体
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class ThemeInfo(
     @SerializedName("themeId")
@@ -878,12 +853,10 @@ data class CPInfo(
     var weddingTime: Long
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CoupleMarryConfig(
     @SerializedName("expireTime") val expireTime: Long
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CoupleMarryBlessingConfig(
     @SerializedName("bless_time") val blessTime: Float
 ) {
@@ -892,20 +865,17 @@ data class CoupleMarryBlessingConfig(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class WeddingBlessNotifyData(
     @SerializedName("roomId") val roomId: Long,
     @SerializedName("value") val value: Int,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CpWeddingMessageContent(
     @SerializedName("cpUserInfo") val cpUserInfo: List<com.adealink.weparty.module.profile.data.UserInfo>? = null,
     @SerializedName("weddingTime") val weddingTime: Long,
     @SerializedName("roomId") val roomId: Long,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CpWeddingNoRoomContent(
     @SerializedName("content") val content: String? = null,
 )
@@ -915,7 +885,6 @@ data class ProtectRankBoardReq(
     @SerializedName("uid") val uid: Long,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CpProtectExpRes(
     @GsonNullable
     @SerializedName("exp") val protectVal: Long? = 0,
@@ -949,7 +918,6 @@ val DEFAULT_FRIEND_BG_CARD_AR by fastLazy { ossService.getUrlByPath("/big_img/cp
 val DEFAULT_CP_PERSONAL_AF by fastLazy { ossService.getUrlByPath("/big_img/cp/cp_personal_af_1.png") }
 val DEFAULT_CP_PAIR_AF by fastLazy { ossService.getUrlByPath("/big_img/cp/cp_pair_af_1.png") }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class IntimacyValInfo(
     @SerializedName("lastTs")

+ 0 - 6
app/src/main/java/com/adealink/weparty/module/couple/data/IntimacyData.kt

@@ -3,19 +3,15 @@ package com.adealink.weparty.module.couple.data
 import com.adealink.frame.data.json.froJsonErrorNull
 import com.adealink.weparty.module.gift.data.GiftInfo
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import java.util.Locale
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class IntimacyConfigInfo(
     @SerializedName("level2IntimacyConfigInfoMap") val level2IntimacyLevelConfigMap: Map<Int, IntimacyLevelConfig>,
     @SerializedName("intimacyInviteConfigs") val intimacyInviteConfigs: List<IntimacyInviteConfig>,
     @SerializedName("resourcePath") val resourcePath: String,// 资源路径 ossPath/${resourcePath}/${IntimacyPrivilegeType}.png
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class IntimacyLevelConfig(
     @SerializedName("level") val level: Int,
     @SerializedName("exp") val exp: Long,
@@ -48,12 +44,10 @@ data class IntimacyLevelConfig(
     var curLevel: Int = 0
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class IntimacyPrivilegeConfigJson(
     @SerializedName("privileges") val privileges: List<String>,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class IntimacyInviteConfig(
     @SerializedName("type") val type: Int,
     @GsonNullable

+ 0 - 6
app/src/main/java/com/adealink/weparty/module/emotion/data/EmotionData.kt

@@ -5,10 +5,8 @@ import androidx.annotation.Nullable
 import com.adealink.weparty.commonui.recycleview.diffutil.BaseListItemData
 import com.adealink.weparty.module.profile.data.UserInfo
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 /**
@@ -47,7 +45,6 @@ data class EmotionDownloadInfo(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class EmotionInfo(
     @Must
@@ -105,7 +102,6 @@ infix fun EmotionInfo.contentsTheSame(other: EmotionInfo): Boolean =
             && status == other.status && type == other.type && packageUrl == other.packageUrl
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class EmotionPackage(
     @SerializedName("emotionList")
@@ -140,7 +136,6 @@ data class EmotionPackage(
 /**
  * 发送表情通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ServerSendEmotionNotify(
     @Must
     @SerializedName("roomId") val roomId: Long,
@@ -175,7 +170,6 @@ data class SendEmotionNotify(
     var isPlus: Boolean = false
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class EmotionLuckyNumber(
     @SerializedName("updateConfigDetais")

+ 0 - 6
app/src/main/java/com/adealink/weparty/module/entereffect/data/EnterEffectData.kt

@@ -4,14 +4,11 @@ import com.adealink.frame.tceffect.TCEffectManager
 import com.adealink.weparty.module.profile.decorate.data.GoodsExtraConfig
 import com.adealink.weparty.module.room.data.RoomUserInfo
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
 /**
  * 进房通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ServerRoomUserEnterNotify(
     @SerializedName("roomId") val roomId: Long,
     @SerializedName("seqid") val seqId: Long = System.currentTimeMillis(),
@@ -25,14 +22,12 @@ data class ServerRoomUserEnterNotify(
 /**
  * 退房通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ServerRoomUserExitNotify(
     @SerializedName("roomId") val roomId: Long,
     @SerializedName("seqid") val seqId: Long = System.currentTimeMillis(),
     @SerializedName("exitUser") val exitUser: Map<Long, RoomUserEnterAttr>? = null,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RoomUserEnterAttr(
     @SerializedName("userCarDynamicResourceUrl") val userCarUrl: String,
     @GsonNullable
@@ -95,7 +90,6 @@ data class RoomUserEnterAttr(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FamilyEnterConfig(
     @SerializedName("enterTs")
     val enterTs: Long = 500L, //单位毫秒。出现时机:可调整,默认整段视频的第0.5秒

+ 0 - 3
app/src/main/java/com/adealink/weparty/module/excel/ExcelData.kt

@@ -1,8 +1,6 @@
 package com.adealink.weparty.module.excel
 
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
 /**
  * Created by sunxiaodong on 2022/2/18.
@@ -13,7 +11,6 @@ enum class ExcelRowType(val type: Int) {
     TITLE(1)
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ExcelRow(
     @SerializedName("type") val type: Int,
     @SerializedName("data") val data: List<String>

+ 0 - 32
app/src/main/java/com/adealink/weparty/module/family/data/FamilyData.kt

@@ -15,10 +15,8 @@ import com.adealink.weparty.module.profile.data.UserFamilyInfo
 import com.adealink.weparty.module.profile.data.UserInfo
 import com.adealink.weparty.module.profile.decorate.data.AvatarFrame
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
@@ -26,7 +24,6 @@ import kotlinx.parcelize.Parcelize
  * Created by sunxiaodong on 2022/8/3.
  */
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FamilyConfig(
     @SerializedName("createFamilyCoins") val createFamilyCoins: Int,
     @SerializedName("freeVipLevel") val freeVipLevel: Int
@@ -51,7 +48,6 @@ data class FamilyEmptyListItem(
 
 interface FamilySquareItem
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FamilySeasonConfigRes(
     @SerializedName("seasonId") val seasonId: Int,
     @SerializedName("startTime") val startTime: Long,
@@ -64,7 +60,6 @@ data class FamilyCreateItem(var show: Boolean) : FamilySquareItem
 
 object FamilyHeaderItem : FamilySquareItem
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FamilySeasonRewardLevelConfig(
     @SerializedName("minRanking") val minRanking: Int,
     @SerializedName("maxRanking") val maxRanking: Int,
@@ -81,7 +76,6 @@ data class FamilySeasonRewardLevelConfig(
     @SerializedName("top10RewardInfo") val top10RewardInfo: List<FamilySeasonReward>? = null
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FamilySeasonReward(
     @SerializedName("rewardType") val rewardType: Int,
     @SerializedName("img") val img: String,
@@ -142,14 +136,12 @@ data class FamilyRankReq(
     @SerializedName("needTopMemberInfo") val needTopMemberInfo: Boolean? = false //拉取家族成员信息
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FamilyRankRes(
     @SerializedName("rankInfoList") val rankList: List<FamilyRankInfo>, //榜单信息
     @GsonNullable
     @SerializedName("familyRankInfo") val myFamilyRank: FamilyRankInfo?,  //我的家族信息或指定家族排名信息
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class FamilyRankInfo(
     @Must
@@ -169,7 +161,6 @@ interface BaseFamilyRankInfo
 
 data class FamilyRankInfoList(val rankList: List<FamilyRankInfo>) : BaseFamilyRankInfo
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FriendFamilyInfo(
     @Must
     @SerializedName("id") val id: Long,
@@ -180,7 +171,6 @@ data class FriendFamilyInfo(
     @SerializedName("userInfoList") val userInfoList: List<FriendInfo>,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FamilySeasonScore(
     @SerializedName("date") val date: String,
     @SerializedName("type2Points") val type2Score: Map<Int, Int>
@@ -202,7 +192,6 @@ enum class FamilySeasonScoreType(val type: Int) {
 }
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class FamilyInfo(
     @Must
@@ -269,7 +258,6 @@ enum class FamilyAttr(val attr: Int) {
     LEVEL(6) //家族等级
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class AnnouncementInfo(
     @SerializedName("text") val text: String,
@@ -277,7 +265,6 @@ data class AnnouncementInfo(
 ) : Parcelable
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class FamilyMedal(
     @SerializedName("url") val url: String,
@@ -296,14 +283,12 @@ data class FamilyMedal(
 
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class FriendInfo(
     @SerializedName("uid") val uid: Long,
     @SerializedName("url") val url: String
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FamilyStarInfo(
     @SerializedName("uid") val uid: Long,
     @SerializedName("name") val name: String,
@@ -322,7 +307,6 @@ data class FamilyStarInfo(
 }
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FamilyContributionInfo(
     @Must
     @SerializedName("uid") val uid: Long,
@@ -332,10 +316,8 @@ data class FamilyContributionInfo(
     @SerializedName("rankScore") val score: Int,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FamilyApplyRecordRes(@SerializedName("records") val records: List<FamilyApplyRecord>)
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FamilyApplyRecord(
     @Must
     @SerializedName("id") val id: Int,
@@ -349,7 +331,6 @@ data class FamilyApplyRecord(
     var userInfo: UserInfo? = null
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class FamilyStarInfoData(
     @SerializedName("familyId")
@@ -362,7 +343,6 @@ data class FamilyStarInfoData(
     val memberInfo: List<MemberInfo>
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class MemberInfo(
     @SerializedName("coverUrl")
@@ -391,7 +371,6 @@ data class MemberInfo(
     val memberInfos: List<RankFamilyInfo>?,
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class RankFamilyInfo(
     @SerializedName("coverUrl")
@@ -431,13 +410,11 @@ enum class FamilyApplyStatus(val status: Int) {
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FamilyReviewReq(
     @SerializedName("id") val id: Int,
     @SerializedName("status") val status: Int
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FamilyWeeklyReq(
     @SerializedName("boardDate") val boardDate: String,
     @GsonNullable
@@ -458,7 +435,6 @@ enum class FamilyReviewOp(val op: Int) {
     REJECT(2)
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FamilyWeeklyRankListData(
     @SerializedName("coverUrl") val coverUrl: String,
     @SerializedName("familyId") val familyId: Long,
@@ -473,7 +449,6 @@ data class FamilyWeeklyRankListData(
 
 const val CONTRIBUTE_EXP_THRESHOLD = 50 //贡献奖励阈值
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FamilyReward(
     @SerializedName("familyRewardInfo")
     val familyRewardInfo: List<FamilyRewardInfo>, //家族奖励信息
@@ -491,7 +466,6 @@ data class FamilyReward(
     val contributeExpThreshold: Int = CONTRIBUTE_EXP_THRESHOLD
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FamilyRewardDetail(
     @SerializedName("date") val date: Long,
     @SerializedName("rewardItemList") val rewardItemList: List<RewardDetailData>,
@@ -499,7 +473,6 @@ data class FamilyRewardDetail(
 
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FamilyRewardInfo(
     @SerializedName("avatar") val avatar: String,
     @SerializedName("coins") val coins: Int,
@@ -525,13 +498,11 @@ data class RelationShipRoomAdminReq(
 )
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FamilyMemberInfo(
     val name: String
 ) : Parcelable
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class InviteFriendJoinFamilyReq(
     @SerializedName("familyId") val familyId: Long,
     @SerializedName("invitee") val invitee: Long,
@@ -539,7 +510,6 @@ data class InviteFriendJoinFamilyReq(
 )
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FamilyLevelInfo(
     @SerializedName("score") val score: Int,
     @SerializedName("currLevel") val currLevel: Int,
@@ -548,7 +518,6 @@ data class FamilyLevelInfo(
     @SerializedName("nextScore") val nextScore: Int,
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FamilyInfoDetail(
     @GsonNullable
     @SerializedName("familyInfo")
@@ -583,7 +552,6 @@ enum class ContributeType(val type: Int) {
 
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FamilyMemberListRes(
     @SerializedName("familyMemberList") val familyMemberList: List<UserInfo>,
     @SerializedName("maxAdminCount") val maxAdminCount: Int,

+ 0 - 5
app/src/main/java/com/adealink/weparty/module/family/data/FamilyLevelConfig.kt

@@ -1,16 +1,13 @@
 package com.adealink.weparty.module.family.data
 
 import com.adealink.weparty.module.profile.decorate.data.AvatarFrame
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
 /**
  * Created by XiaoDongLin.
  * Date: 2024/8/13
  */
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GetFamilyLevelConfigReq(
     @SerializedName("levelType")
     val levelType: Int,
@@ -18,13 +15,11 @@ data class GetFamilyLevelConfigReq(
     val seqId: Int = 0
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GetFamilyLevelConfigRes(
     @SerializedName("commonLevelConfigMap")
     val commonLevelConfigMap: MutableMap<Int, FamilyLevelConfig>
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FamilyLevelConfig(
     @SerializedName("level")
     var level: Int = 0,

+ 0 - 3
app/src/main/java/com/adealink/weparty/module/family/data/JoinFamilyRewardInfo.kt

@@ -1,8 +1,6 @@
 package com.adealink.weparty.module.family.data
 
 import android.os.Parcelable
-import com.google.gson.annotations.JsonAdapter
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 /**
@@ -10,7 +8,6 @@ import kotlinx.parcelize.Parcelize
  * Date: 2024/7/25
  */
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class JoinFamilyRewardInfo(
     val durationReward: Int,//是否时长类型奖励 ,

+ 0 - 2
app/src/main/java/com/adealink/weparty/module/family/data/StarRelationShipData.kt

@@ -9,7 +9,6 @@ import com.google.gson.annotations.GsonNullable
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 
@@ -111,7 +110,6 @@ data class FamilyRoomInfo(
 
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CPStarInfo(
     @SerializedName("couples")
     val couples: List<CoupleUserInfo>

+ 0 - 7
app/src/main/java/com/adealink/weparty/module/follow/data/FollowData.kt

@@ -5,9 +5,7 @@ import com.adealink.weparty.commonui.widget.floatview.data.FloatWindowType
 import com.adealink.weparty.commonui.widget.floatview.data.IWindowFloatData
 import com.adealink.weparty.module.profile.data.UserInfo
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
 /**
  * Created by sunxiaodong on 2021/5/5.
@@ -42,7 +40,6 @@ data class BrokeRelationshipReq(
     @SerializedName("relationshipType") val relationshipType: Int,//关系类型
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RelationshipUserInfo(
     @SerializedName("userInfo")
     var userInfo: UserInfo,
@@ -61,13 +58,11 @@ data class RelationshipUserInfo(
     var roomId: Long? = null, //在房id
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FollowInfoRes(
     @SerializedName("followerNum") val follows: Int,
     @SerializedName("followedNum") val fans: Int,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RelationShipInfoRes(
     @SerializedName("followed") val followed: Boolean,
     @SerializedName("toBeFollowed") val toBeFollowed: Boolean,
@@ -101,7 +96,6 @@ enum class RelationEmptyErrorType {
     NetError
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RecommendUserInfo(
     @SerializedName("uid") val uid: Long,
     @SerializedName("userInfo") val userInfo: UserInfo,
@@ -124,7 +118,6 @@ enum class FollowOpFrom(val from: String) {
     GAME_RESULT("game_result"), //Game Result
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class SpecialFollowOnlineNotify(
     @SerializedName("userInfo")
     val userInfo: UserInfo,

+ 0 - 8
app/src/main/java/com/adealink/weparty/module/game/data/GameData.kt

@@ -10,9 +10,7 @@ import com.adealink.weparty.module.room.data.RewardItemData
 import com.adealink.weparty.module.room.data.RoomCommonOperatorData
 import com.adealink.weparty.module.room.data.RoomPlayCenterOperatorType
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 /**
@@ -35,7 +33,6 @@ data class GameShowConfigReq(
     @SerializedName("packageName") val packageName: String = PackageUtil.getPackageName(),
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameShowConfig(
     @SerializedName("show") val show: Boolean,
     @GsonNullable
@@ -68,7 +65,6 @@ enum class ActivityType(val type: Int) {
 }
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameActivityRewardInfo(
     @GsonNullable
     @SerializedName("rewardTypeName") val rewardTypeName: String? = null,
@@ -140,7 +136,6 @@ data class GameActivityRewardInfo(
 }
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RewardDetailSource(
     @SerializedName("date") val date: Long,
     @GsonNullable
@@ -150,7 +145,6 @@ data class RewardDetailSource(
 ) : Parcelable
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RewardItem(
     @SerializedName("carveUpNum") val carveUpNum: Int,
     @SerializedName("dynamicResourceUrl") val dynamicResourceUrl: String,
@@ -177,14 +171,12 @@ data class RewardItem(
     @SerializedName("status") val status: Int,
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserGameLevelInfoResult(
     @SerializedName("seqid") val seqid: Long,
     @GsonNullable
     @SerializedName("userGameLevelInfoMap") val userGameLevelInfoMap: MutableMap<String, com.adealink.weparty.module.game.data.UserGameLevelInfo>? = null,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserGameLevelInfo(
     @SerializedName("uid") val uid: Long,
     @SerializedName("gameLevel") val gameLevel: Int,

+ 0 - 5
app/src/main/java/com/adealink/weparty/module/game/data/GameHubData.kt

@@ -4,9 +4,7 @@ import com.adealink.frame.aab.util.getCompatString
 import com.adealink.frame.base.IError
 import com.adealink.weparty.R
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
 const val DOWNLOAD_ERROR = -1
 const val DOWNLOAD_FINISH = 100
@@ -41,7 +39,6 @@ data class GameVersion(
 )
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameHubItemVersionData(
     @SerializedName("version") val version: String, //游戏资源版本名称
     @SerializedName("versionCode") val versionCode: Int, //游戏资源版本号, 每次更新资源递增
@@ -59,12 +56,10 @@ data class GameHubTabConfigReq(
     @SerializedName("homeTab") val homeTab: Int? = null
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameHubTabConfigRes(
     @SerializedName("tabs") val tabsList: List<GameHubTabItemData> //游戏排列顺序
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameHubTabItemData(
     @SerializedName("type") val type: Int, //游戏
     @SerializedName("sort") val sort: Int, //排序(数值越小越靠前)

+ 0 - 4
app/src/main/java/com/adealink/weparty/module/game/data/MicCharmPKData.kt

@@ -1,17 +1,14 @@
 package com.adealink.weparty.module.game.data
 
 import android.os.Parcelable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 /**
  * Created by sunxiaodong on 2022/3/21.
  */
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class MicCharmPkInfo(
     @Must
     @SerializedName("pkGameId") val pkGameId: String,
@@ -20,7 +17,6 @@ data class MicCharmPkInfo(
     @SerializedName("pkInfoPush") val notify: MicCharmPkInfoNotify?
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class MicCharmPkInfoNotify(
     @Must
     @SerializedName("pkId") val pkId: String,

+ 0 - 5
app/src/main/java/com/adealink/weparty/module/game/data/RedPacketData.kt

@@ -3,12 +3,9 @@ package com.adealink.weparty.module.game.data
 import android.os.Parcelable
 import com.adealink.weparty.module.room.data.RoomUserInfo
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class RedPacketGrabRecord(
     @SerializedName("redPacketId")
@@ -34,7 +31,6 @@ data class RedPacketGrabRecord(
 /**
  * 红包领取通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RedPacketGrabNotify(
     @SerializedName("seqId")
     val seqId: Long,
@@ -55,7 +51,6 @@ enum class GrabDialogDismissResult(val result: Int) {
     NoOpened(0),//未打开
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class RedPacketHistoryRecord(
     @SerializedName("redPacketId")

+ 0 - 11
app/src/main/java/com/adealink/weparty/module/game/data/RouletteData.kt

@@ -3,7 +3,6 @@ package com.adealink.weparty.module.game.data
 import android.os.Parcelable
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 enum class RouletteGameStatus {
@@ -19,7 +18,6 @@ enum class RouletteRoundStage {
     Betting,//加注阶段
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RouletteBetReq(
     @SerializedName("betAmount")
     val betAmount: Int,
@@ -27,7 +25,6 @@ data class RouletteBetReq(
     val roomId: Long,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RouletteGameInfo(
     @SerializedName("allowedBet")
     var allowedBet: Boolean,//是否可下注
@@ -54,7 +51,6 @@ data class RouletteGameInfo(
     var finalWinnerResultNotify: com.adealink.weparty.module.game.data.RouletteWinnerResultNotify? = null
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class RouletteConfigInfo(
     @SerializedName("limitNum")
@@ -65,7 +61,6 @@ data class RouletteConfigInfo(
     val ownerRebate: Float,//房主回扣比例
 ): Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RoulettePlayerInfo(
     @SerializedName("avatar")
     val avatar: String,//用户头像
@@ -88,7 +83,6 @@ data class RoulettePlayerInfo(
 /**
  * 退款通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RouletteRefundNotify(
     @SerializedName("seqId")
     val seqId: Long,
@@ -103,7 +97,6 @@ data class RouletteRefundNotify(
 /**
  * 开奖通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class RouletteWinnerResultNotify(
     @SerializedName("seqId")
@@ -123,7 +116,6 @@ data class RouletteWinnerResultNotify(
 /**
  * 淘汰通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RouletteWeedOutResultNotify(
     @SerializedName("seqId")
     val seqId: Long,
@@ -142,7 +134,6 @@ data class RouletteWeedOutResultNotify(
 /**
  * 玩家下注通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RouletteBetNotify(
     @SerializedName("seqId")
     val seqId: Long,
@@ -163,7 +154,6 @@ data class RouletteBetNotify(
 /**
  * 房主回扣到账
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class RouletteRoomOwnerRebateNotify(
     @SerializedName("seqId")
@@ -177,7 +167,6 @@ data class RouletteRoomOwnerRebateNotify(
 /**
  * 游戏取消通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class RouletteCancelNotify(
     @SerializedName("seqId")

+ 0 - 11
app/src/main/java/com/adealink/weparty/module/game/rocket/Data.kt

@@ -3,9 +3,7 @@ package com.adealink.weparty.module.game.rocket
 import android.os.Parcelable
 import com.adealink.weparty.module.room.data.RoomLimitTimeGiftData
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
@@ -43,7 +41,6 @@ enum class RocketLevel(val level: Int) {
 /**
  *
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RocketUserRewardInfo(
     @SerializedName("roomid")
     val roomid: Long,
@@ -53,7 +50,6 @@ data class RocketUserRewardInfo(
     val rankInfoList: List<RocketUserRewardItem>
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class RocketUserRewardItem(
     @SerializedName("uid")
@@ -74,7 +70,6 @@ data class RocketUserRewardItem(
     var userInfo: com.adealink.weparty.module.profile.data.UserInfo? = null
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RocketRankUserInfo(
     @SerializedName("rank")
     val rank: Int,
@@ -88,7 +83,6 @@ data class RocketRankUserInfo(
     val avatar: String
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RocketRewardRecord(
     @SerializedName("createTime")
     val createTime: Long,
@@ -100,7 +94,6 @@ data class RocketRewardRecord(
     val rewards: List<com.adealink.weparty.module.operation.data.RewardDetailData>
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class AddRoomRocketCoinsNotify(
     @SerializedName("roomid")
     val roomId: Long,
@@ -113,7 +106,6 @@ data class AddRoomRocketCoinsNotify(
 /**
  * 火箭升级全服通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RocketUpgradeNotify(
     @SerializedName("roomid")
     val roomId: Long,
@@ -133,7 +125,6 @@ data class RocketUpgradeNotify(
     var effectPath: String? = null
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RocketRewardIssueNotify(
     @SerializedName("roomid")
     val roomId: Long,
@@ -152,7 +143,6 @@ data class RocketKingReqData(
     @SerializedName("type") val type: Int = 7,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RocketKingRes(
     @SerializedName("seqId")
     val seqId: Long,
@@ -164,7 +154,6 @@ data class RocketKingRes(
     val userRankInfo: RocketKingUserInfo,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RocketKingUserInfo(
     @SerializedName("uid") val uid: Long,
     @SerializedName("rankScore") val rankScore: Long,

+ 0 - 3
app/src/main/java/com/adealink/weparty/module/gamehub/carrom/data/CarromDialogData.kt

@@ -15,7 +15,6 @@ import com.google.gson.JsonSerializationContext
 import com.google.gson.JsonSerializer
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 import java.lang.reflect.Type
 
@@ -83,7 +82,6 @@ class Dialog(@SerializedName("type") val type: CarromDialogType) {
  * 游戏结果弹窗
  */
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameResultDialogData(
     @SerializedName("is_over") val isOver: Int,
     @SerializedName("plays") val plays: List<GamePlayerResult>
@@ -100,7 +98,6 @@ data class GameResultDialogData(
 }
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GamePlayerResult(
     @SerializedName("id") val id: Long,
     @SerializedName("coin") val coin: Int,

+ 0 - 3
app/src/main/java/com/adealink/weparty/module/gamehub/domino/data/DominoDialogData.kt

@@ -15,7 +15,6 @@ import com.google.gson.JsonSerializationContext
 import com.google.gson.JsonSerializer
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 import java.lang.reflect.Type
 
@@ -83,7 +82,6 @@ class Dialog(@SerializedName("type") val type: DominoDialogType) {
  * 游戏结果弹窗
  */
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameResultDialogData(
     @SerializedName("is_over") val isOver: Int,
     @SerializedName("plays") val plays: List<GamePlayerResult>
@@ -100,7 +98,6 @@ data class GameResultDialogData(
 }
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GamePlayerResult(
     @SerializedName("id") val id: Long,
     @SerializedName("coin") val coin: Int,

+ 0 - 3
app/src/main/java/com/adealink/weparty/module/gamehub/ludo/data/LudoData.kt

@@ -1,11 +1,8 @@
 package com.adealink.weparty.module.gamehub.ludo.data
 
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class LudoVersionData(
     @GsonNullable
     @SerializedName("version")

+ 0 - 3
app/src/main/java/com/adealink/weparty/module/gamehub/ludo/data/LudoDialogData.kt

@@ -14,7 +14,6 @@ import com.google.gson.JsonSerializationContext
 import com.google.gson.JsonSerializer
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 import java.lang.reflect.Type
 
@@ -81,7 +80,6 @@ class Dialog(@SerializedName("type") val type: LudoDialogType) {
  * 游戏结果弹窗
  */
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameResultDialogData(
     @SerializedName("is_over") val isOver: Int,
     @SerializedName("plays") val plays: List<GamePlayerResult>
@@ -98,7 +96,6 @@ data class GameResultDialogData(
 }
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GamePlayerResult(
     @SerializedName("id") val id: Long,
     @SerializedName("coin") val coin: Int,

+ 0 - 4
app/src/main/java/com/adealink/weparty/module/gamehub/uno/data/UnoData.kt

@@ -2,14 +2,12 @@ package com.adealink.weparty.module.gamehub.uno.data
 
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
 
 /**
  * @param gameType eg: [Game]
  * @param gameRoomType
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameBetCoinsReq(
     @SerializedName("gameType")
     val gameType: Int,
@@ -18,7 +16,6 @@ data class GameBetCoinsReq(
     val gameRoomType: Int,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameBetCoinsRes(
     /**
      * key: eg: [CarromGameType]
@@ -27,7 +24,6 @@ data class GameBetCoinsRes(
     val gameRoomTypeMap: Map<Int, GameBetCoinsData>
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameBetCoinsData(
     /**
      * key: eg: [CarromGameMode]

+ 0 - 3
app/src/main/java/com/adealink/weparty/module/gamehub/uno/data/UnoDialogData.kt

@@ -15,7 +15,6 @@ import com.google.gson.JsonSerializationContext
 import com.google.gson.JsonSerializer
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 import java.lang.reflect.Type
 
@@ -83,7 +82,6 @@ class Dialog(@SerializedName("type") val type: UnoDialogType) {
  * 游戏结果弹窗
  */
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameResultDialogData(
     @SerializedName("is_over") val isOver: Int,
     @SerializedName("plays") val plays: List<GamePlayerResult>
@@ -100,7 +98,6 @@ data class GameResultDialogData(
 }
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GamePlayerResult(
     @SerializedName("id") val id: Long,
     @SerializedName("coin") val coin: Int,

+ 1 - 15
app/src/main/java/com/adealink/weparty/module/gift/data/GiftData.kt

@@ -19,10 +19,8 @@ import com.adealink.weparty.module.couple.data.CpProtectRes
 import com.adealink.weparty.module.gift.datasource.local.GiftExportLocalService
 import com.adealink.weparty.module.profile.data.UserInfo
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import com.opensource.svgaplayer.SVGADynamicEntity
 import com.tencent.qgame.animplayer.inter.IFetchResource
 import com.tencent.qgame.animplayer.mix.Resource
@@ -32,7 +30,7 @@ import com.tencent.tcmediax.tceffectplayer.api.mix.IFetchResourceTxtResult
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import com.tencent.tcmediax.tceffectplayer.api.mix.IFetchResource as TCFetchResource
-import  com.tencent.tcmediax.tceffectplayer.api.mix.Resource  as TCResource
+import com.tencent.tcmediax.tceffectplayer.api.mix.Resource as TCResource
 
 /**
  * Created by sunxiaodong on 2021/5/10.
@@ -40,7 +38,6 @@ import  com.tencent.tcmediax.tceffectplayer.api.mix.Resource  as TCResource
 
 const val PRE_DOWNLOAD_GIFTS_COUNT = 12
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class GiftInfo(
     @Must
@@ -452,7 +449,6 @@ enum class DynamicEntityType(val type: Int) {
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class GiftInstruction(
     @Must
@@ -534,7 +530,6 @@ infix fun GiftInfo.contentsTheSame(other: GiftInfo): Boolean =
 /**
  * 送礼通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ServerSendGiftNotify(
     @Must
     @SerializedName("roomId") val roomId: Long,
@@ -639,7 +634,6 @@ data class UserGiftInfo(
 /**
  * 新客送礼通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class NewerSendFirstGiftNotify(
     @SerializedName("seqId")
     val seqId: Long,
@@ -683,7 +677,6 @@ enum class CustomizeGiftOpType(val type: Int) {
 }
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CustomGiftConfig(
     @SerializedName("userLevel")
     val userLevel: Int,
@@ -724,7 +717,6 @@ enum class FreeGiftStatus {
 }
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ActivityGiftItem(
     @SerializedName("id") //活动ID
     val activityId: Long,
@@ -760,7 +752,6 @@ data class ActivityGiftItem(
 }
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ActivityRelatedBannerConfig(
     @SerializedName("id")
     val id: Long,
@@ -774,7 +765,6 @@ data class ActivityRelatedBannerConfig(
  * 幸运礼物中奖通知
  */
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class LuckyGiftLotteryNotify(
     @SerializedName("userInfo")
     val userInfo: UserInfo, //送礼的用户信息
@@ -791,7 +781,6 @@ data class LuckyGiftLotteryNotify(
 /**
  * 送背包物品通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class SendBackpackItemNotify(
     @SerializedName("roomId") val roomId: Long,
     @SerializedName("sender") val fromUid: Long,
@@ -813,7 +802,6 @@ fun SendBackpackItemNotify.toSendGiftItems(): List<SendGiftItem> {
 }
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ExtraConfigInfo(
     @SerializedName("giftName") val giftName: String,
     @SerializedName("previewUrl") val previewUrl: String,
@@ -823,7 +811,6 @@ data class ExtraConfigInfo(
 /**
  * 私聊送礼Cp和守护值
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class SendGiftCPGuardItemNotify(
     @SerializedName("newExp") val newExp: Long,
     @SerializedName("addExp") val addExp: Long,
@@ -890,7 +877,6 @@ enum class ChatCPGuardType(val type: Int) {
 /**
  * MOMENT送礼值
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class MomentSendGiftNotify(
     @SerializedName("giftCoins") val giftCoins: Long,
     @SerializedName("topicId") val topicId: Long,

+ 0 - 8
app/src/main/java/com/adealink/weparty/module/gift/data/GiftTreasureData.kt

@@ -3,12 +3,9 @@ package com.adealink.weparty.module.gift.data
 import android.os.Parcelable
 import com.adealink.weparty.module.room.data.RoomUserInfo
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class PackageGrabRecord(
     @SerializedName("packetId")
@@ -33,7 +30,6 @@ data class PackageGrabRecord(
     val packetTime: Long,
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class TreasurePackageInfo(
     @SerializedName("redPacketId")
@@ -64,7 +60,6 @@ data class TreasurePackageInfo(
     val rewardDynamicUrl: String,
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class PacketGrabNotify(
     @SerializedName("seqId")
     val seqId: Long,
@@ -80,7 +75,6 @@ data class PacketGrabNotify(
     val senderUserInfo: RoomUserInfo? = null,//发者的资料消息,头像框相关信息不返回
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class PacketQueueNotify(
     @SerializedName("seqId")
     val seqId: Long,
@@ -90,7 +84,6 @@ data class PacketQueueNotify(
     val packets: List<TreasurePackageInfo>,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class TreasureGiftGlobalNotify(
     @SerializedName("avatar")
     val avatar: String,
@@ -125,7 +118,6 @@ enum class TreasureGiftRewardType(val type: Int) {
 }
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GrabGiftTreasureRes(
     @SerializedName("seqId") val seqId: Long,
     @GsonNullable

+ 0 - 25
app/src/main/java/com/adealink/weparty/module/level/data/LevelData.kt

@@ -11,14 +11,11 @@ import com.adealink.weparty.module.operation.data.RewardDetailData
 import com.adealink.weparty.module.operation.data.StrGoodIdLengthType
 import com.adealink.weparty.module.profile.data.UserInfo
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 import org.json.JSONObject
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserLevelInfo(
     @SerializedName("exp")
     val exp: Long,
@@ -64,7 +61,6 @@ infix fun UserLevelPrivilege.contentsTheSame(other: UserLevelPrivilege): Boolean
             && goodIdPrivilegeIconUrl == other.goodIdPrivilegeIconUrl
             && goodIdDurationDays == other.goodIdDurationDays
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ServerLevelUpgradeNotify(
     @SerializedName("seqid")
     val seqId: Long = System.currentTimeMillis(),
@@ -80,7 +76,6 @@ data class ServerLevelUpgradeNotify(
     val rewardItems: List<RewardDetailData>? //奖励列表
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CongratulateUserLevelUpNotify(
     @SerializedName("seqid")
     val seqId: Long = System.currentTimeMillis(),
@@ -94,7 +89,6 @@ data class CongratulateUserLevelUpNotify(
     val crrLevel: Int,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ServerLevelRewardNotify(
     @SerializedName("seqid")
     val seqId: Long = System.currentTimeMillis(),
@@ -115,7 +109,6 @@ data class LevelUpgradeNotify(
     val userInfo: UserInfo?,
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class VipConfig(
     @SerializedName("vipAvatarFrame")
     val vipAvatarFrame: Int = 0,//vip头像框资源ID, 存在表示vip等级下支持该特权
@@ -173,13 +166,11 @@ data class VipConfig(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class VipMedal(
     @SerializedName("icon") val icon: String,
     @SerializedName("effect") val effect: String,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class VipUserInfoDynamicCard(
     @SerializedName("border") val border: String,
     @SerializedName("backgroud") val background: String,
@@ -190,7 +181,6 @@ enum class VipBlockType(val type: Int) {
     OpenSuperMic(2)
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class UserLevelConfigData(
     @SerializedName("type") val type: Int,
@@ -221,14 +211,12 @@ data class UserLevelConfigData(
 
 
 // ============= start 用户物料配置新接口(结构跟其他项目不一样)=========
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class UserLevelConfigRes(
     @SerializedName("dailyTaskItems") val dailyTaskItems: List<TaskItemReward>,
 ): Parcelable
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class TaskItemReward (
     @SerializedName("completedPerDay") val completedPerDay: Int, // 当天完成的次数 ,
@@ -253,7 +241,6 @@ data class TaskItemReward (
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class RewardItem(
     @SerializedName("carveUpNum") val carveUpNum: Int, //房间火箭抽奖,瓜分人数 ,
@@ -446,7 +433,6 @@ enum class UsableRewardStatus(val status: Int) {
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class BirthdayBagData(
     @Must
@@ -464,7 +450,6 @@ data class BirthdayBagData(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class BirthdayBagRewardsData(
     @SerializedName("rewards") val rewards: List<RewardDetailData>
@@ -476,7 +461,6 @@ data class ReceiveBirthdayBagReq(
     @SerializedName("replyCode") val replyCode: Int = 1,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class LevelUpOtherRecordsRes(
     @SerializedName("records") val records: List<LevelUpOtherRecord>,
     @SerializedName("total") val total: Int,
@@ -484,7 +468,6 @@ data class LevelUpOtherRecordsRes(
     @SerializedName("current") val current: Int,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class LevelUpOtherRecord(
     @SerializedName("name") val name: String,
     @SerializedName("avatar") val avatar: String,
@@ -505,7 +488,6 @@ enum class RewardItemSource(val source: Int) {
     LevelReward(45),//等级奖励
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class SVipConfig(
 
     @SerializedName("level")
@@ -619,7 +601,6 @@ data class SVipConfig(
 )
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class SVIPLevelChangeNotify(
     @SerializedName("uid") val uid: Long,
     /**
@@ -653,7 +634,6 @@ data class SVIPLevelChangeNotify(
 ) : Parcelable
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameAwCompensateNotify(
     @SerializedName("uid") val uid: Long,
     /**
@@ -663,7 +643,6 @@ data class GameAwCompensateNotify(
 ) : Parcelable
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GameLevelChangeNotify(
     @SerializedName("uid") val uid: Long,
     /**
@@ -689,7 +668,6 @@ data class GameLevelChangeNotify(
 ) : Parcelable
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FamilyLevelChangeNotify(
     @SerializedName("uid") val uid: Long,
     /**
@@ -714,7 +692,6 @@ data class FamilyLevelChangeNotify(
     @SerializedName("currentLevel") val currentLevel: Int,
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CommonLevelConfigInfo(
     @SerializedName("configJson")
     val configJson: String?,
@@ -747,7 +724,6 @@ data class CommonLevelConfigInfo(
     var rewards: List<RewardItem>? = null
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class VipRechargeLevelConfig(
     /** 等级 */
@@ -895,7 +871,6 @@ data class VipRechargeLevelConfig(
     val visitorsRecord: Boolean = false,
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class CommonLevelChangeNotify(
     @SerializedName("changeType")

+ 0 - 9
app/src/main/java/com/adealink/weparty/module/medal/data/MedalData.kt

@@ -3,10 +3,8 @@ package com.adealink.weparty.module.medal.data
 import android.os.Parcelable
 import com.adealink.frame.aab.util.getCompatString
 import com.adealink.weparty.R
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 import com.adealink.weparty.R as APP_R
 
@@ -17,7 +15,6 @@ import com.adealink.weparty.R as APP_R
  *
  * status:未获得是0, 1:已获得,已装备是2
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class MedalData(
     @Must
@@ -192,7 +189,6 @@ enum class MedalType(val type: Int) {
 /**
  * 勋章发放通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class MedalAchieveNotify(
     @SerializedName("seqid")
     val seqId: Long,
@@ -236,7 +232,6 @@ data class MedalAchieveNotify(
 }
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class HistoryMedalRes(
     @SerializedName("records")
     val records: List<HistoryMedalData>,
@@ -248,7 +243,6 @@ data class HistoryMedalRes(
     val current: Int,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class HistoryMedalData(
     @SerializedName("id")
     val id: Long,
@@ -258,7 +252,6 @@ data class HistoryMedalData(
     val createTime: Long,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class HistoryMedalRecord(
     @SerializedName("medalId")
     val medalId: Long,
@@ -266,13 +259,11 @@ data class HistoryMedalRecord(
     val subLevel: Int,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UpdateMyEquippedPosition(
     @SerializedName("medalIds")
     val medalIds: List<Long>,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ChatAchieveActivityInfo(
     /**
      * @see [com.adealink.weparty.module.profile.data.UserChatAchievementIdentityType]

+ 0 - 13
app/src/main/java/com/adealink/weparty/module/message/data/MessageData.kt

@@ -4,14 +4,11 @@ import android.os.Parcelable
 import com.adealink.weparty.module.couple.data.CoupleUserInfo
 import com.adealink.weparty.module.profile.data.UserInfo
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import io.rong.imlib.model.Conversation
 import io.rong.imlib.model.Conversation.ConversationType
 import kotlinx.parcelize.Parcelize
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ChatPageDetailRes(
     @GsonNullable @SerializedName("callPermissionInfo") val callPermissionInfo: CallPermissionInfo?,
     @GsonNullable
@@ -50,7 +47,6 @@ enum class ChatButtonStatus(val status: Int) {
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class CallPermissionInfo(
     @SerializedName("initiativeVideoCallPermissionEnable") val initiativeVideoCallPermissionEnable: Boolean? = false,
@@ -83,20 +79,17 @@ data class BatchGetFirstChatTsReq(
     val uids: List<Long>
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class BatchGetFirstChatTsRes(
     @SerializedName("uid2SendQuickMessageTs")
     val uid2FirstChatTs: Map<Long, Long>
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GetCustomQuickMessageRes(
     @SerializedName("number2QuickMessageInfos")
     val number2QuickMessageInfos: Map<Int, QuickMessageInfo>
 )
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class QuickMessageInfo(
     @GsonNullable
     @SerializedName("message1")
@@ -120,13 +113,11 @@ data class GetSessionListReq(
     val listType: Int = 0,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GetSessionListRes(
     @SerializedName("sessionInfos")
     val sessionInfos: List<SessionInfo>,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class SessionInfo(
     @SerializedName("lastMessageSendTs")
     val lastMessageSendTs: Long,//最后一条消息发送时间
@@ -168,7 +159,6 @@ enum class UpdateSessionListOperate(val value: Int) {
     DELETE(1),//删除
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class Im1v1ContinuousSendMessageDeductNotifyInfo(
     @SerializedName("message")
     val message: String,
@@ -212,20 +202,17 @@ data class SendRCMessageReq(
     val isIncludeSender: Int,//是否需要将消息同步给发送方,0否,1是
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CustomerInfo(
     @SerializedName("customerUid") val customerUid: Long,
     @SerializedName("isOnline") val isOnline: Boolean,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class BatchGetCustomerListRes(
     @SerializedName("customerInfoList")
     val customerInfoList: List<CustomerInfo>,
 )
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class MerchantAgentInfo(
     @SerializedName("merchantUid")
     val merchantUid: Long,

+ 1 - 18
app/src/main/java/com/adealink/weparty/module/micgrab/data/MicGrabData.kt

@@ -3,33 +3,27 @@ package com.adealink.weparty.module.micgrab.data
 import android.os.Parcelable
 import android.os.SystemClock
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CommonListReq(
     @SerializedName("pageNum") val pageNum: Long,
     @SerializedName("pageSize") val pageSize: Long,
 )
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class MicGrabEntranceRes(
     @SerializedName("show")
     val show: Boolean
 ) : Parcelable
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class MicGrabMatchRes(
     @SerializedName("roomid")
     val roomId: Long? = null
 ) : Parcelable
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class MicGrabSongData(
     @SerializedName("id") val id: Long, //歌曲ID
     @SerializedName("songName") val songName: Long, //歌名
@@ -43,7 +37,6 @@ data class MicGrabSongData(
 ) : Parcelable
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class MicGrabReadyReq(
     @SerializedName("gameId") val gameId: String,
     @SerializedName("roomId") val roomId: Long,
@@ -52,7 +45,6 @@ data class MicGrabReadyReq(
 ) : Parcelable
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class MicGrabStartReq(
     @SerializedName("gameId") val gameId: String,
     @SerializedName("roomId") val roomId: Long,
@@ -60,7 +52,6 @@ data class MicGrabStartReq(
 ) : Parcelable
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class MicGrabReq(
     @SerializedName("gameId") val gameId: String,
     @SerializedName("roomId") val roomId: Long,
@@ -69,7 +60,6 @@ data class MicGrabReq(
 ) : Parcelable
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class SingFinishReq(
     @SerializedName("gameId") val gameId: String,
     @SerializedName("roomId") val roomId: Long,
@@ -79,19 +69,16 @@ data class SingFinishReq(
 
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class SingFinishRes(
     @SerializedName("id") val id: Long, //歌曲ID
 ) : Parcelable
 
 //@Parcelize
-//@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
-//data class MicGrabResultNotify(
+////data class MicGrabResultNotify(
 //    @SerializedName("id") val id: List<>, //歌曲ID
 //) : Parcelable
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class MicGrabResultNotify(
     @SerializedName("roomId") val roomId: Long, //房间ID
     @SerializedName("gameId") val gameId: String, //游戏ID
@@ -99,7 +86,6 @@ data class MicGrabResultNotify(
 ) : Parcelable
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class MicGrabResultData(
     @SerializedName("rank") val rank: Int, //名次
     @SerializedName("playerId") val playerId: Long, //玩家ID
@@ -130,7 +116,6 @@ data class MicGrabResultData(
 /**
  * https://www.kdocs.cn/l/cdbN5VjWPDWG
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class MicGrabGameInfo(
     @SerializedName("roomId") val roomId: Long, //房间ID
     @SerializedName("gameId") val gameId: String, //游戏ID
@@ -266,7 +251,6 @@ enum class MicGrabEvaluateResult(val result: Int) {
 }
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 class GameRoomSongInfo(
     @SerializedName("id") val id: Long, //歌曲id
     @SerializedName("uid") val uid: Long, //创建人id
@@ -287,7 +271,6 @@ class GameRoomSongInfo(
 }
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 class GameRoomSongLyric(
     @SerializedName("lyric") val lyric: List<String>, //游戏歌词
     @SerializedName("duration") val duration: Long, //歌词时长(单位:秒)

+ 0 - 3
app/src/main/java/com/adealink/weparty/module/music/data/MusicData.kt

@@ -4,15 +4,12 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Ignore
 import androidx.room.PrimaryKey
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
 /**
  * Created by sunxiaodong on 2021/7/14.
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Entity(tableName = "music")
 data class MusicItem(
     @Must

+ 0 - 4
app/src/main/java/com/adealink/weparty/module/operation/banner/data/BannerData.kt

@@ -5,16 +5,13 @@ import com.adealink.weparty.commonui.ext.isMP4
 import com.adealink.weparty.commonui.ext.isSVGAImage
 import com.adealink.weparty.commonui.ext.isTCMP4
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 /**
  * Created by sunxiaodong on 2021/9/14.
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class BannerInfo(
     @SerializedName("id") val id: Long,
@@ -32,7 +29,6 @@ data class BannerInfo(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class BannerShowConfigParamInfo(
     @SerializedName("showType") val showType: Int,

+ 0 - 6
app/src/main/java/com/adealink/weparty/module/operation/data/ActivityTaskData.kt

@@ -4,14 +4,11 @@ import android.os.Parcelable
 import com.adealink.frame.locale.language.data.MultiLanguageString
 import com.adealink.weparty.commonui.recycleview.diffutil.BaseListItemData
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ProgressTaskInfo(
     @SerializedName("currentTaskId") var currentTaskId: Long,//当前处在的任务id
     @SerializedName("dailyTaskItems") val dailyTaskItems: List<ActivityTaskItem>,//递进任务节点
@@ -28,7 +25,6 @@ const val TASK_TAG_MIC_TIME = "mictime"
 
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class InviteNewUserRewardInfo(
     @Must
     @SerializedName("backgroundUrl") val backgroundUrl: String,
@@ -36,7 +32,6 @@ data class InviteNewUserRewardInfo(
     @SerializedName("itemList") val itemList: List<RewardDetailData>,
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class ActivityTaskRes(
     @SerializedName("activityCode") val activityCode: Int, //活动代码
@@ -78,7 +73,6 @@ data class ActivityTaskRes(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class ActivityTaskItem(
     @SerializedName("taskId") val taskId: Long, //任务序号

+ 0 - 5
app/src/main/java/com/adealink/weparty/module/operation/data/RewardData.kt

@@ -9,15 +9,12 @@ import com.adealink.weparty.R
 import com.adealink.weparty.commonui.recycleview.diffutil.BaseListItemData
 import com.adealink.weparty.module.level.data.UsableRewardStatus
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 import org.json.JSONObject
 import java.lang.Long.max
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RewardArgsJsonDto(
     @SerializedName("adminActivityChannel") val adminActivityChannel: String,
     @SerializedName("coinValue") val coinValue: Int,
@@ -31,7 +28,6 @@ data class RewardArgsJsonDto(
 ) : Parcelable
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class StockConfig(
     @SerializedName("dailyStock") val dailyStock: Int,
     @SerializedName("totalStock") val totalStock: Int,
@@ -39,7 +35,6 @@ data class StockConfig(
 ) : Parcelable
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RewardDetailData(
     @SerializedName("rewardResourceType") val rewardResourceType: Int = 0, //奖励资源类型,见ProductTypeConstant定义
     @SerializedName("rewardResourceId") val rewardResourceId: Long = 0, //奖励资源ID

+ 0 - 4
app/src/main/java/com/adealink/weparty/module/operation/giftwish/data/GiftWishData.kt

@@ -1,13 +1,10 @@
 package com.adealink.weparty.module.operation.giftwish.data
 
 import android.os.Parcelable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GiftWish(
     @SerializedName("giftId")
     val giftId: Long,
@@ -33,7 +30,6 @@ enum class GiftWishStatus(val status: Int) {
 }
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserGiftWishInfo(
     @SerializedName("status")
     var status: Int,

+ 0 - 3
app/src/main/java/com/adealink/weparty/module/operation/newuser/Data.kt

@@ -1,8 +1,6 @@
 package com.adealink.weparty.module.operation.newuser
 
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
 /**
  * Created by XiaoDongLin.
@@ -13,7 +11,6 @@ import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 /**
  * 新客奖励弹窗
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class BuyNewUserRewardNotify(
     @SerializedName("coins") val coins: Int,
     @SerializedName("chatTimes") val chatTimes: Int,

+ 0 - 5
app/src/main/java/com/adealink/weparty/module/operation/rechargepackage/data/RechargePackageData.kt

@@ -4,10 +4,8 @@ import android.os.Parcelable
 import com.adealink.frame.locale.language.data.Language
 import com.adealink.weparty.module.wallet.data.ProductInfo
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 /**
@@ -48,7 +46,6 @@ enum class ConfigType(val value: Int) {
 }
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RechargePackageResponse(
     @SerializedName("leftTime") val leftTime: Long,//剩余时间
     @SerializedName("packageCount") val packageCount: Int,//礼包数量rewardList.size
@@ -56,7 +53,6 @@ data class RechargePackageResponse(
 ) : Parcelable
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RechargePackageLevelInfo(
     @SerializedName("activity") val activity: String,//活动名称
     @SerializedName("price") val price: Double,//充值金额(档位金额)
@@ -77,7 +73,6 @@ data class RechargePackageLevelInfo(
  * 配置数据
  */
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RechargePackageConfig(
     @Must @SerializedName("type") val type: Int,
     @SerializedName("entrance") val entrance: Int,

+ 0 - 5
app/src/main/java/com/adealink/weparty/module/operation/roomactivity/data/RoomActivityData.kt

@@ -3,10 +3,8 @@ package com.adealink.weparty.module.operation.roomactivity.data
 import com.adealink.frame.util.safeToInt
 import com.adealink.weparty.module.operation.worldcup.data.WorldCupGameInfo
 import com.adealink.weparty.module.operation.worldcup.data.WorldCupRoomRankInfo
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import java.util.Calendar
 import java.util.Calendar.HOUR_OF_DAY
 import java.util.Calendar.MINUTE
@@ -20,7 +18,6 @@ interface IActivityInfo
 
 interface RoomBannerInfo : IActivityInfo
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RoomBannerActivityInfo(
     @Must
     @SerializedName("imgUrl") val icon: String,
@@ -106,7 +103,6 @@ enum class ActivityStartRule(val rule: Int) {
     ACTIVITY_START_PK_BY_HOST_CONTROL(1);//活动分成很多轮次PK,每轮由主持人控制活动开始、结束;且活动开始时,必须麦上存上存在2对CP
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class TopFamilyRoomActivityInfo(
     @SerializedName("content")
     val content: String,
@@ -164,7 +160,6 @@ enum class WorldCupSupportStatus(val status: Int) {
     SUPPORTED_TEAM(2), //已助威
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class WorldCupActivityInfo(
     @Must
     @SerializedName("id") val id: Int = 0,

+ 0 - 4
app/src/main/java/com/adealink/weparty/module/operation/signinreward/data/SignInRewardData.kt

@@ -5,11 +5,9 @@ import com.adealink.weparty.commonui.recycleview.diffutil.BaseListItemData
 import com.adealink.weparty.module.operation.data.RewardDetailData
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class DailySignInRewardsRes(
     @SerializedName("activityId") val activityId: Int,   //活动id
     @SerializedName("todaySignInCnt") val todaySignInCnt: Int,  //今天是连续第几次签到,同时根据signInRewards中第几天的数据判断今天是否已完成签到
@@ -37,7 +35,6 @@ enum class SignInStatus(val status: Int) {
 }
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class DailySignInRewardsInfo(
     @SerializedName("cnts") val cnts: Int, //第几天
     @SerializedName("alreadySignIn") val alreadySignIn: Int,
@@ -56,7 +53,6 @@ data class DailySignInRewardsInfo(
 }
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class NewUserSecondRewardInfo(
     @SerializedName("secondDay") val secondDay: Boolean,
     @SerializedName("itemList") val itemList: List<RewardDetailData>,

+ 0 - 4
app/src/main/java/com/adealink/weparty/module/operation/signinreward/data/TodaySignInRewardData.kt

@@ -5,10 +5,8 @@ import com.adealink.weparty.module.operation.data.RewardDetailData
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class TodaySignInRewardsRes(
     @Must
     @SerializedName("todaySignInCnt") val todaySignInCnt: Int,
@@ -17,7 +15,6 @@ data class TodaySignInRewardsRes(
 )
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class TodaySignInRewardInfo(
     @Must
     @SerializedName("signRewards") val signRewards: List<RewardDetailData>,
@@ -26,7 +23,6 @@ data class TodaySignInRewardInfo(
 
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class NewUserLotteryRes(
     @SerializedName("todaySignInCnt") val todaySignInCnt: Int,
     @Must

+ 0 - 3
app/src/main/java/com/adealink/weparty/module/operation/supersupporter/data/HighPaymentUserRewardNotify.kt

@@ -1,10 +1,7 @@
 package com.adealink.weparty.module.operation.supersupporter.data
 
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class HighPaymentUserRewardNotify(
     @SerializedName("rewardItems") val rewardDetailData: List<com.adealink.weparty.module.operation.data.RewardDetailData>,//奖励列表
 )

+ 0 - 3
app/src/main/java/com/adealink/weparty/module/operation/worldcup/data/WorldCupData.kt

@@ -3,13 +3,11 @@ package com.adealink.weparty.module.operation.worldcup.data
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
 /**
  * Created by sunxiaodong on 2022/11/11.
  */
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class WorldCupGameInfo(
     @Must
     @SerializedName("team1Flag") val team1Flag: String,
@@ -17,7 +15,6 @@ data class WorldCupGameInfo(
     @SerializedName("team2Flag") val team2Flag: String,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class WorldCupRoomRankInfo(
     @SerializedName("roomRank") val roomRank: Int, //房间排名
     @SerializedName("rankScoreGap") val rankScoreGap: Long, //距离前一名的分数差距

+ 0 - 11
app/src/main/java/com/adealink/weparty/module/party/data/PartyData.kt

@@ -1,14 +1,10 @@
 package com.adealink.weparty.module.party.data
 
 import android.os.Parcelable
-import com.adealink.weparty.module.profile.data.UserInfo
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class PartyActivityStatusInfo(
     @SerializedName("activityId") var activityId: Long,//活动ID
     @SerializedName("configInfo") var configInfo: PartyActivityConfigInfo,//活动配置信息
@@ -33,7 +29,6 @@ infix fun PartyActivityStatusInfo.contentsTheSame(other: PartyActivityStatusInfo
             && creatorUid == other.creatorUid && activityCanUpdate == other.activityCanUpdate
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class PartyActivityConfigInfo(
     @SerializedName("activityType") var activityType: Int,//活动类型
     @SerializedName("activityStartupTime") var activityStartupTime: Long,//活动开始时间
@@ -73,13 +68,11 @@ data class SubscribePartyActivityReq(
     @SerializedName("subscribe") val subscribe: Boolean,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class PartyActivitySubscribeInfo(
     @SerializedName("basicInfo") var basicInfo: PartyActivityStatusInfo,//活动状态信息
     @SerializedName("listSubscribers") var listSubscribers: List<com.adealink.weparty.module.profile.data.UserInfo>,//活动订阅者信息
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class PartyActivityListRes(
     @SerializedName("auditingActivities") var auditingActivities: List<PartyActivityStatusInfo>,//自己正在审核的活动
     @SerializedName("runningActivities") var runningActivities: List<PartyActivityStatusInfo>,//正在进行的活动
@@ -89,7 +82,6 @@ data class PartyActivityListRes(
 )
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class PartyActivityOfficialConfigRes(
     @SerializedName("officialActivityCovers") var officialActivityCovers: List<String>,//官方设置的默认活动封面
     @SerializedName("defaultActivityType") var defaultActivityType: PartyActivityTypeInfo,//默认创建的活动类型
@@ -97,7 +89,6 @@ data class PartyActivityOfficialConfigRes(
     @SerializedName("hasNewActivityChance") var hasNewActivityChance: Boolean,//拥有创建活动的机会
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class PartyActivityTypeInfo(
     @SerializedName("typeId") var typeId: Int,//活动类型ID
     @SerializedName("typeName") var typeName: String,//活动类型名称
@@ -125,7 +116,6 @@ enum class PartyEditType(val type: Int) {
 /**
  * 活动奖励通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ActivityRewardNotify(
     @SerializedName("rewardUid") val rewardUid: Long,
     @SerializedName("rewardText") val rewardText: String,
@@ -134,7 +124,6 @@ data class ActivityRewardNotify(
 /**
  * 活动开启通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ActivityStartupNotify(
     @SerializedName("activityId") val activityId: Long,
     @SerializedName("cover") val cover: String,

+ 0 - 9
app/src/main/java/com/adealink/weparty/module/pk/data/PKData.kt

@@ -2,9 +2,7 @@ package com.adealink.weparty.module.pk.data
 
 import android.os.Parcelable
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 enum class PKTeam(val team: Int) {
@@ -35,7 +33,6 @@ enum class PKStatus(val status: Int) {
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RoomPkConfig(
     @SerializedName("show")
     val show: Boolean,//是否显示入口
@@ -44,7 +41,6 @@ data class RoomPkConfig(
 )
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RoomPkInfo(
     @SerializedName("gameId")
     val gameId: String,
@@ -128,7 +124,6 @@ data class RoomPkInfo(
 /**
  * 开启pk模式通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RoomPKSetupNotify(
     @SerializedName("gameId")
     val gameId: String,
@@ -153,7 +148,6 @@ data class RoomPKSetupNotify(
 /**
  * 取消pk模式通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RoomPKCancelNotify(
     @SerializedName("roomid")
     val roomId: Long,
@@ -162,7 +156,6 @@ data class RoomPKCancelNotify(
 /**
  * PK开始通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RoomPKStartNotify(
     @SerializedName("gameId")
     val gameId: String,
@@ -187,7 +180,6 @@ data class RoomPKStartNotify(
 /**
  * 加分通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RoomPKAddScoreNotify(
     @SerializedName("blueScore")
     val blueScore: Int,
@@ -207,7 +199,6 @@ data class RoomPKAddScoreNotify(
  * PK开奖通知
  */
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RoomPKResultNotify(
     @SerializedName("gameId")
     val gameId: String,

+ 0 - 28
app/src/main/java/com/adealink/weparty/module/profile/data/ProfileData2.kt

@@ -12,10 +12,8 @@ import com.adealink.weparty.module.profile.decorate.data.AvatarFrame
 import com.adealink.weparty.module.room.data.RoomData
 import com.adealink.weparty.room.data.WPRoomInfo
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
@@ -81,7 +79,6 @@ data class GetUserInRoomInfoRes(
     @SerializedName("roomInfos") val roomInfos: List<WPRoomInfo>,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class UserInfo(
     @SerializedName("uid") val uid: Long,
@@ -539,7 +536,6 @@ infix fun UserInfo.contentsTheSame(other: UserInfo?): Boolean {
 }
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class UserFamilyInfo(
     @Must
@@ -561,7 +557,6 @@ data class UserFamilyInfo(
 
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class GoodIdInfo(
     @SerializedName("goodId") val goodId: Int,
@@ -570,7 +565,6 @@ data class GoodIdInfo(
 ) : Parcelable
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class UserMedal(
     @SerializedName("type") val type: Long,
@@ -601,7 +595,6 @@ data class GetCountryConfigReq(
 /**
  * 获取国家配置列表响应
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GetCountryConfigRes(@Must @SerializedName("updateConfigDetais") val countryList: List<CountryResource>)
 
 /**
@@ -635,7 +628,6 @@ enum class CountryStatus(val status: Int) {
 }
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class LikePhotoInfoRes(
     @SerializedName("liked")
     val liked: Boolean, //是否已点赞
@@ -645,7 +637,6 @@ data class LikePhotoInfoRes(
     val likeNum: Long
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class LikePhotoReq(
     @SerializedName("uid")
     val uid: Long,
@@ -655,7 +646,6 @@ data class LikePhotoReq(
     val coverUrl: String
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class LikePhotoRecordRes(
     @SerializedName("uid")
     val uid: Long,
@@ -663,7 +653,6 @@ data class LikePhotoRecordRes(
     val records: List<LikePhotoRecordItem>,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class LikePhotoRecordItem(
     @SerializedName("sid")
     val sid: Long,
@@ -679,7 +668,6 @@ data class LikePhotoRecordItem(
     val createTime: Long
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class SearchResultItem(
     @SerializedName("uid") val uid: Long = 0,
@@ -705,7 +693,6 @@ infix fun SearchResultItem.contentsTheSame(other: SearchResultItem?): Boolean {
 }
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class SearchRoomInfo(
     @SerializedName("roomId") val roomId: Long,
@@ -724,7 +711,6 @@ infix fun SearchRoomInfo.contentsTheSame(other: SearchRoomInfo?): Boolean {
             && picUrl == other.picUrl
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class RegionUserRes(
     @SerializedName("changedNum") val changedNum: Int,
@@ -748,7 +734,6 @@ infix fun RegionUserRes.contentsTheSame(other: RegionUserRes?): Boolean {
             && totalNum == other.totalNum
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class RegionInfo(
     @SerializedName("hot") val hot: Int, //1:拥挤,0:顺畅
@@ -836,7 +821,6 @@ enum class VIPLevel(val level: Int) {
 }
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class UserSvipConfigInfo(
     @GsonNullable
@@ -894,14 +878,12 @@ data class UserSvipConfigInfo(
 }
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserPrivilegeInfo(
     @GsonNullable
     @SerializedName("canChangeRoomCover") val canChangeRoomCover: Boolean, //是否有权限修改动态房间封面
     @SerializedName("coverExpireTime") val coverExpireTime: Long //权限过期时间
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class StrGoodIdInfo(
     @SerializedName("strGoodId") val strGoodId: String,
@@ -913,24 +895,20 @@ enum class RelationshipExtraType(val type: Int) {
     SPECIAL_FOLLOW(3) //特别关注
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class BatchGetUserRelationShipReq(
     @SerializedName("relationshipType") val relationshipType: Int,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserRelationShipInfo(
     @SerializedName("uid") val uid: Long,
     @SerializedName("peerUid") val peerUid: Long,
     @SerializedName("extraConfig") val extraConfig: UserRelationshipExtraConfig,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserRelationshipExtraConfig(
     @SerializedName("note") val note: String,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserRelationShipReq(
     @SerializedName("type") val type: Int, //RelationshipType
     @SerializedName("otherUid") val otherUid: Long,
@@ -939,31 +917,26 @@ data class UserRelationShipReq(
 )
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class InspectingMapData(
     @SerializedName("photoWall") val photoWall: String,
     @SerializedName("voiceIntroduction") val voiceIntroduction: String,
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class BatchGetRemarkReq(
     @SerializedName("pageNum") val pageNum: Int,
     @SerializedName("pageSize") val pageSize: Int,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class BatchGetRemarkRes(
     @SerializedName("uid2RemarkMap") val uid2RemarkMap: Map<Long, String>,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class AddRemarkAndDescReq(
     @SerializedName("desc") val desc: String? = null,
     @SerializedName("remark") val remark: String? = null,
     @SerializedName("uid") val peerUid: Long
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RemarkAndDescRes(
     @SerializedName("desc") val desc: String,
     @SerializedName("remark") val remark: String
@@ -979,7 +952,6 @@ infix fun OnlineInRoomStatus.contentsTheSame(other: OnlineInRoomStatus?): Boolea
     return this.isOnline == other.isOnline && this.inRoomId == other.inRoomId
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class CommonLevelInfo(
     @SerializedName("currLevel") val currLevel: Int,

+ 0 - 26
app/src/main/java/com/adealink/weparty/module/profile/data/UserConfigType.kt

@@ -5,7 +5,6 @@ import com.adealink.frame.data.json.froJsonErrorNull
 import com.google.gson.annotations.GsonNullable
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 
@@ -106,7 +105,6 @@ enum class UserConfigType(val type: Int, val clazz: Class<*>? = null) : Parcelab
 }
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class UserCommonConfig(
     /**
@@ -247,7 +245,6 @@ data class UserCommonConfig(
 }
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserCommonConfigInfo(
     @SerializedName("type") val type: Int, //配置类型
     @SerializedName("intDataValue1") var intDataValue1: Long, //整型配置值1
@@ -422,7 +419,6 @@ class UserUpdateBirthdayTimesConfigContent(val times: Int) : UserConfigContent()
 /**
  * 基本信息
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 open class UserBaseInfoConfigContent(
     open val nickName: String,
     open val svipLevel: Int
@@ -434,7 +430,6 @@ open class UserBaseInfoConfigContent(
 }
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class IsNewBieUser(
     @GsonNullable
     @SerializedName("intDataValue1") val isNewBieUser: Long? = null,
@@ -450,7 +445,6 @@ data class IsNewBieUser(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 class UserSVipConfigContent(
     @SerializedName("intDataValue1") val isChatBubblesOpen: Long, //聊天气泡开关
     @SerializedName("intDataValue2") val isSpeakingRippleOpen: Long, //麦位动效开关
@@ -520,7 +514,6 @@ class UserSVipConfigContent(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RoomMemberEnterEffectConfigContent(
     @SerializedName("strDataValue1") val json: String,
 ) : UserConfigContent() {
@@ -535,7 +528,6 @@ data class RoomMemberEnterEffectConfigContent(
 }
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 class UserGoodIdConfigContent(
     @SerializedName("strDataValue1") val goodId: String, //靓号
     @SerializedName("intDataValue1") val expiredTs: Long, //过期时间
@@ -548,7 +540,6 @@ class UserGoodIdConfigContent(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RoomMemberEnterEffectInfo(
     @GsonNullable
     @SerializedName("url") val url: String?,
@@ -565,7 +556,6 @@ data class RoomMemberEnterEffectInfo(
     val newDynamicResourceUrl: String,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserRoomMessageTextColorContent(
     @SerializedName("strDataValue1") val json: String,
 ) : UserConfigContent() {
@@ -579,12 +569,10 @@ data class UserRoomMessageTextColorContent(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserRoomMessageTextColorInfo(
     @SerializedName("colour") val colour: String
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserRoomSendGiftGlobalHeadlineEffectContent(
     @SerializedName("strDataValue1") val json: String,
 ) : UserConfigContent() {
@@ -598,13 +586,11 @@ data class UserRoomSendGiftGlobalHeadlineEffectContent(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserRoomSendGiftGlobalHeadlineEffectInfo(
     @SerializedName("url") val url: String
 )
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserRoomSendGiftNoticeEffectContent(
     @SerializedName("strDataValue1") val json: String,
 ) : UserConfigContent() {
@@ -618,13 +604,11 @@ data class UserRoomSendGiftNoticeEffectContent(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserRoomSendGiftNoticeEffectInfo(
     @SerializedName("url") val url: String
 )
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserLevelConfigContent(
     @SerializedName("intDataValue1") val level: Int,
 ) : UserConfigContent() {
@@ -634,7 +618,6 @@ data class UserLevelConfigContent(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserCustomChatPriceConfigContent(
     @SerializedName("intDataValue1") val price: Int,
 ) : UserConfigContent() {
@@ -644,7 +627,6 @@ data class UserCustomChatPriceConfigContent(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class UserChatAchievementContent(
     /**
@@ -676,7 +658,6 @@ enum class UserChatAchievementIdentityType(val type: Int) {
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class AvatarQualityResultInfo(
     @SerializedName("isLowQualityAvatar") val isLowQualityAvatar: Boolean, //是否低质量头像
     @SerializedName("imageResolutionLow") val imageResolutionLow: Boolean, //头像分辨率低
@@ -685,7 +666,6 @@ data class AvatarQualityResultInfo(
 )
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ChatCallPermissionCollection(
     @SerializedName("intDataValue1") var voiceInvitePermission: Long,
     @SerializedName("intDataValue2") var voiceCallPermission: Long,
@@ -698,7 +678,6 @@ data class ChatCallPermissionCollection(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class AvatarQualityResultContent(
     @SerializedName("strDataValue1") val json: String,
 ) : UserConfigContent() {
@@ -713,7 +692,6 @@ data class AvatarQualityResultContent(
 }
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserCertificationInfo(
     @GsonNullable
     @SerializedName("intDataValue1") val avatarCertification: Long? = null,
@@ -746,7 +724,6 @@ data class UserCertificationInfo(
 }
 
 // 用户私密相册
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserPrivacyAlbumContent(
     @SerializedName("strDataValue1") val json: String,
 ) : UserConfigContent() {
@@ -760,7 +737,6 @@ data class UserPrivacyAlbumContent(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserSystemPushConfigContent(
     @SerializedName("intDataValue1") val open: Int,
 ) : UserConfigContent() {
@@ -770,7 +746,6 @@ data class UserSystemPushConfigContent(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class InviteActivityDiamondThresholdContent(
     @SerializedName("intDataValue1") val diamondThreshold: Long,
@@ -782,7 +757,6 @@ data class InviteActivityDiamondThresholdContent(
 }
 
 //新客承接对象
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class NewUserCustomerAcceptanceContent(
     @SerializedName("intDataValue1") val flag: Long
 ) : UserConfigContent() {

+ 0 - 6
app/src/main/java/com/adealink/weparty/module/profile/decorate/data/ExtraConfigData.kt

@@ -7,10 +7,8 @@ import android.text.TextPaint
 import com.adealink.frame.ext.safeParseColor
 import com.adealink.frame.image.imageService
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import com.opensource.svgaplayer.SVGADynamicEntity
 import com.opensource.svgaplayer.utils.Supplier
 import com.tencent.qgame.animplayer.inter.IFetchResource
@@ -21,7 +19,6 @@ import com.tencent.tcmediax.tceffectplayer.api.mix.IFetchResourceTxtResult
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GoodsExtraConfig(
     @SerializedName("showUrlFirst") val showUrlFirst: Boolean = false,
     @GsonNullable
@@ -174,7 +171,6 @@ data class GoodsExtraConfig(
 }
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class EffectExtraConfig(
     @Must
     @SerializedName("type") val type: Int,
@@ -203,7 +199,6 @@ enum class EffectExtraType(val type: Int) {
 
 //座驾的自定义配置,客户端实现昵称和头像覆盖在特效上
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CarCustomizedConfig(
     @SerializedName("nickColor") val nickColor: String, //昵称颜色
     @SerializedName("nickBg") val nickBg: String, //昵称背景
@@ -229,7 +224,6 @@ data class CarCustomizedConfig(
 }
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CommonLevelConfig(
     @SerializedName("levelType") val levelType: Int,
     @SerializedName("level") val level: Int

+ 0 - 11
app/src/main/java/com/adealink/weparty/module/profile/decorate/data/UserDecorateData.kt

@@ -8,7 +8,6 @@ import com.google.gson.annotations.GsonNullable
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
@@ -84,7 +83,6 @@ sealed class DecorInfo(val type: DecorType) {
 object EmptyDecor : DecorInfo(DecorType.EMPTY)
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class AvatarFrame(
     @Must
     @SerializedName("url") val url: String,
@@ -214,7 +212,6 @@ data class QuickLudoUserDecor(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FishingGameConfig(
     @Must
     @SerializedName("configValue") val configValue: String,
@@ -222,7 +219,6 @@ data class FishingGameConfig(
     @SerializedName("url") val url: String,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ChatBubbleConfig(
     @GsonNullable
     @SerializedName("url") val url: String?,
@@ -238,7 +234,6 @@ data class ChatBubbleDecor(val url: String?, val scaleRatio: Float?) :
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class HomeDynamicConfig(
     @SerializedName("subResourceUrl") val subResourceUrl: String?,
     @SerializedName("url") val url: String?,
@@ -253,7 +248,6 @@ data class HomeDynamicDecor(val subResourceUrl: String?, val url: String?, val s
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RoomMemberInfoCardConfig(
     @SerializedName("subResourceUrl") val subResourceUrl: String?,
     @SerializedName("url") val url: String?,
@@ -268,7 +262,6 @@ data class RoomMemberInfoCardDecor(val subResourceUrl: String?, val url: String?
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserRippleConfig(
     @SerializedName("url") val url: String?,
     @SerializedName("scaleRatio") val scaleRatio: Float?,
@@ -291,7 +284,6 @@ data class TeenPattiDecor(val open: Boolean) :
 }
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class MomentBgConfig(
     @SerializedName("url") val url: String,
 )
@@ -311,7 +303,6 @@ data class UploadCoverDecor(val list: List<String>) : DecorInfo(DecorType.USER_U
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ProfileMusicConfig(
     @SerializedName("musicResourceUrl") val musicResourceUrl: String,
     @SerializedName("musicName") val musicName: String,
@@ -332,7 +323,6 @@ data class ProfileMusicDecor(val config: ProfileMusicConfig) : DecorInfo(DecorTy
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class MessageTextColorConfig(
     @SerializedName("colour") val colour: String
 )
@@ -352,7 +342,6 @@ data class VisitorRecordEnableDecor(val enable: Boolean) : DecorInfo(DecorType.V
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class InviteActivityDiamondThresholdConfig(
     @SerializedName("intDataValue1") val diamondThreshold: Int
 )

+ 0 - 4
app/src/main/java/com/adealink/weparty/module/profile/tags/data/UserTagsData.kt

@@ -3,12 +3,10 @@ package com.adealink.weparty.module.profile.tags.data
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
 /**
  * Created by sunxiaodong on 2021/10/17.
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserLabel(
     @Must
     @SerializedName("lableId") val labelId: Long,
@@ -20,7 +18,6 @@ data class UserLabel(
 infix fun UserLabel.contentsTheSame(other: UserLabel): Boolean =
     labelId == other.labelId && icon == other.icon && labelName == other.labelName
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserLabelClass(
     @Must
     @SerializedName("labelTypeId") val classId: Long,
@@ -32,7 +29,6 @@ data class UserLabelClass(
     @SerializedName("labelSelected") val selectLabels: List<Long>,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserLabelsRes(@SerializedName("labels") val labelClasses: List<UserLabelClass>)
 
 data class SetUserLabelReq(@SerializedName("labelSet") val labels: Map<Long, List<Long>>)

+ 0 - 5
app/src/main/java/com/adealink/weparty/module/rank/data/RankListData.kt

@@ -3,9 +3,7 @@ package com.adealink.weparty.module.rank.data
 import com.adealink.weparty.commonui.recycleview.diffutil.BaseListItemData
 import com.adealink.weparty.module.store.data.StoreGoodsInfo
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
 /**
  * 排行榜列表相关数据类;
@@ -27,7 +25,6 @@ enum class RankListErrorEmptyType {
 /**
  * 排行榜列表项;
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RankListItemData(
     @SerializedName("uid")
     val uid: Long,
@@ -66,7 +63,6 @@ data class RankListItemData(
 /**
  * 排行榜列表请求结果;
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RankListRes(
     @SerializedName("boardInfo")
     val boardInfo: BoardInfo,
@@ -141,7 +137,6 @@ fun RankListRes.toRankListResult(): RankListResult {
 }
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CpRankInfo(
     /** 榜单用户信息 **/
     @GsonNullable

+ 0 - 4
app/src/main/java/com/adealink/weparty/module/rank/data/RankRewardData.kt

@@ -1,12 +1,9 @@
 package com.adealink.weparty.module.rank.data
 
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RankRewardRes(
     @SerializedName("remainingTime")
     val remainingTime: Long, //剩余发奖时间(单位:秒)
@@ -22,7 +19,6 @@ data class RankRewardRes(
     val topStarRewards: List<RankRewardItem>?, //明星榜奖励
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RankRewardItem(
     @SerializedName("minRank")
     val minRank: Int,

+ 0 - 4
app/src/main/java/com/adealink/weparty/module/room/chat/data/ChatData.kt

@@ -1,9 +1,7 @@
 package com.adealink.weparty.module.room.chat.data
 
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
 /**
  * Created by sunxiaodong on 2021/6/23.
@@ -40,7 +38,6 @@ data class ChatOperateReq(
 /**
  * 公屏操作响应
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ChatOperateRes(
     @Must
     @SerializedName("roomId") val roomId: Long,
@@ -53,7 +50,6 @@ data class ChatOperateRes(
 /**
  * 公屏状态变更通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ChatStatusNotify(
     @Must
     @SerializedName("roomId") val roomId: Long,

+ 0 - 6
app/src/main/java/com/adealink/weparty/module/room/data/MicSeatData.kt

@@ -3,9 +3,7 @@ package com.adealink.weparty.module.room.data
 import android.os.Parcelable
 import com.adealink.weparty.cocosgame.data.MicStatus
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 enum class RoomMicMode(val modeId: Int, val modeType: String) {
@@ -65,7 +63,6 @@ data class RoomMicLayoutItemData(
 )
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RoomMicModeInfo(
     @SerializedName("roomId")
     val roomId: Long, //房间ID
@@ -100,7 +97,6 @@ data class RoomMicModeInfo(
 }
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RoomUserMicStatusReq(
     @SerializedName("roomId")
     val roomId: Long,
@@ -132,7 +128,6 @@ data class RoomUsedCoin(
 )
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class VideoInfo(
     @GsonNullable
     @SerializedName("videoInfo")
@@ -167,7 +162,6 @@ data class VideoInfo(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class VideoData(
     @SerializedName("duration")

+ 0 - 5
app/src/main/java/com/adealink/weparty/module/room/data/RoomAttrData.kt

@@ -5,10 +5,8 @@ import com.adealink.frame.base.AppBaseInfo
 import com.adealink.frame.util.PackageUtil
 import com.adealink.weparty.commonui.recycleview.diffutil.BaseListItemData
 import com.adealink.weparty.module.room.RoomModule
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 
@@ -21,7 +19,6 @@ enum class GlobalRoomConfig(val value: Int) {
     GLOBAL_ROOM_LIMIT_TIME_GIFT(46) //限时礼物
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GlobalRoomConfigRes(@Must @SerializedName("configs") val configs: Map<Int, List<String>>)
 
 data class GlobalRoomConfigReqNew(
@@ -34,7 +31,6 @@ data class GlobalRoomConfigReqNew(
 )
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RoomLimitTimeGiftData(
     @SerializedName("duration")
     val duration: Long,
@@ -60,7 +56,6 @@ data class RoomLimitTimeGiftData(
 /*
     房间管理员在房间中的权限设置
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class AdminPermissionSettingMap(
     @SerializedName("configMap") var configMap: Map<Int, Boolean>,
 )

+ 0 - 3
app/src/main/java/com/adealink/weparty/module/room/data/RoomFlowData.kt

@@ -17,14 +17,12 @@ import com.google.gson.annotations.GsonNullable
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 /**
  * Created by sunxiaodong on 2021/5/22.
  */
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class WPRoomInfo(
     @Must
     @SerializedName("roomId") val roomId: Long = 0,
@@ -139,7 +137,6 @@ data class JoinRoomReq(
 /**
  * 进房响应
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class JoinRoomRes(
     @Must
     @SerializedName("roomId") val roomId: Long,

+ 0 - 2
app/src/main/java/com/adealink/weparty/module/room/data/RoomMemberData.kt

@@ -7,12 +7,10 @@ import com.adealink.weparty.module.profile.decorate.data.DecorType
 import com.google.gson.annotations.GsonNullable
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RoomUserInfo(
     @GsonNullable
     @SerializedName("userInfo")

+ 0 - 13
app/src/main/java/com/adealink/weparty/module/room/data/RoomMicSeatData.kt

@@ -10,7 +10,6 @@ import com.google.gson.annotations.GsonNullable
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 
@@ -46,7 +45,6 @@ enum class MicModeKey(val key: String) {
     MODE("mode")
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class MicSeatInfo(
     @SerializedName("micUid") val micUid: Long,
@@ -134,7 +132,6 @@ data class MicSeatInfo(
 
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class UserMicGameInfo(
     @SerializedName("gameMicMode") val gameMicMode: Int? = null, //用户游戏状态归属于哪个麦位模式,如果房间不处于该模式,则不允许更新设置
@@ -178,7 +175,6 @@ data class UserMicGameInfo(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class UserMicGameInfoExtra(
     @GsonNullable
@@ -206,18 +202,15 @@ infix fun MicSeatInfo.contentsTheSame(other: MicSeatInfo): Boolean =
 /**
  * 房间麦位样式配置
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RoomMicSeatSVipEffectConfig(
     @SerializedName("show") val show: Boolean,  //是否展示
 )
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class MicSeatsInfoRes(
     @Must @SerializedName("micInfo") val micSeatsInfo: MicSeatsInfo,
     @GsonNullable
     @SerializedName("micUserInfo") val micUserInfo: Map<Long, RoomUserInfo>? = null, //麦上用户的个人资料信息
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class MicSeatsInfo(
     @Must
@@ -232,7 +225,6 @@ data class MicSeatsInfo(
     @SerializedName("roomGameInfo") val roomGameInfo: RoomGameInfo? = null, //房间游戏信息
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class RoomGameInfo(
     @SerializedName("gameId") val gameId: String,
@@ -285,7 +277,6 @@ enum class RoomChatMessagePanelStatus {
 /**
  * 麦位变化通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class MicSeatsNotify(
     @Must
     @SerializedName("roomId") val roomId: Long,
@@ -298,7 +289,6 @@ data class MicSeatsNotify(
 /**
  * 麦位被踢(设置为旁听)通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class MicSeatListenNotify(
     @Must
     @SerializedName("roomId") val roomId: Long,
@@ -336,7 +326,6 @@ enum class SeatInviteNotifyType(val type: Int) {
 /**
  * 麦位邀请通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class MicSeatInviteNotify(
     @Must
     @SerializedName("roomId") val roomId: Long,
@@ -400,7 +389,6 @@ data class RejectOnMicRequest(
     @SerializedName("seqid") val seqId: Long = System.currentTimeMillis(),
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class OnMicUserData(
     @SerializedName("uid") val uid: Long,
     @SerializedName("userInfo") val userInfo: com.adealink.weparty.module.profile.data.UserInfo,
@@ -420,7 +408,6 @@ data class OpApplyOnMicUser(
 /**
  * 用户上麦申请队列变化通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UpMicRequestQueueChangedNotify(
     @Must
     @SerializedName("roomId") val roomId: Long,

+ 0 - 2
app/src/main/java/com/adealink/weparty/module/room/data/RoomNewUserRewardData.kt

@@ -2,9 +2,7 @@ package com.adealink.weparty.module.room.data
 
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RoomNewUserRewardNotify(
     @SerializedName("gameCoinNum") val gameCoinNum: Long,
 )

+ 0 - 27
app/src/main/java/com/adealink/weparty/module/room/data/RoomNotifyData.kt

@@ -10,7 +10,6 @@ import com.google.gson.annotations.GsonNullable
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 /**
@@ -23,7 +22,6 @@ import kotlinx.parcelize.Parcelize
 
 interface IRoomBroadcastNotify
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FlagUserInfo(
     @Must
     @SerializedName("uid") val uid: Long,
@@ -33,7 +31,6 @@ data class FlagUserInfo(
     @SerializedName("num") val num: Int,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FlagRaisingNotify(
     @SerializedName("dynamicUrl") val dynamicUrl: String,
     @SerializedName("flagUserInfoList") val flagUserInfoList: List<FlagUserInfo>,
@@ -98,7 +95,6 @@ enum class RoomNotifyType(val uri: String) {
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GlobalRoomBroadcastNotify(
     @SerializedName("seqid")
     val seqId: Long,
@@ -156,7 +152,6 @@ data class GlobalRoomBroadcastNotify(
     var inviteTaskRewardNotify: InviteTaskRewardBroadcastNotify? = null
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GoodsSendNotify(
     @SerializedName("roomId")
     val roomId: Long,
@@ -175,7 +170,6 @@ data class GoodsSendNotify(
 ) : IRoomBroadcastNotify
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GiftSendNotify(
     @SerializedName("roomId")
     val roomId: Long,
@@ -198,7 +192,6 @@ data class GiftSendNotify(
     var giftIconUrl: String,
 ) : IRoomBroadcastNotify
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class LotteryRewardNotify(
     @SerializedName("seqId")
     val seqId: Long,
@@ -216,7 +209,6 @@ data class LotteryRewardNotify(
 /**
  * 房间红包队列通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RoomRedPacketQueueNotify(
     @SerializedName("seqId")
     val seqId: Long,
@@ -226,7 +218,6 @@ data class RoomRedPacketQueueNotify(
     val redPackets: List<RedPacketInfo>,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class RedPacketInfo(
     @SerializedName("redPacketId")
@@ -267,7 +258,6 @@ data class RedPacketInfo(
 }
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RedPacketCoverEffectConfig(
     @SerializedName("goodsId")
     val goodsId: Long, //商品ID
@@ -284,7 +274,6 @@ data class RedPacketCoverEffectConfig(
 ) : Parcelable
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class InviteRewardNotify(
     @SerializedName("seqId")
     val seqId: Long,
@@ -310,7 +299,6 @@ enum class InviteNotifyType(val type: Int) {
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GiftWishNotify(
     @SerializedName("seqId")
     val seqId: Long,
@@ -324,7 +312,6 @@ data class GiftWishNotify(
     val helpNum: Int,
 ) : IRoomBroadcastNotify
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class SuperGiftRewardNotify(
     @SerializedName("seqId")
     val seqId: Long,
@@ -340,7 +327,6 @@ data class SuperGiftRewardNotify(
     val goodsIconUrl: String,
 ) : IRoomBroadcastNotify
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RtcChangedNotify(
     @SerializedName("seqId")
     val seqId: Long,
@@ -348,7 +334,6 @@ data class RtcChangedNotify(
     val rtcType: Int,
 ) : IRoomBroadcastNotify
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class TopFamilyRoomNotify(
     @SerializedName("familyId") val familyId: Long,
     @SerializedName("name") val name: String,
@@ -361,7 +346,6 @@ data class TopFamilyRoomNotify(
     @SerializedName("bestReceiverAvatar") val bestReceiverAvatar: String,
 ) : IRoomBroadcastNotify
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class WordCupPointsReachThresholdNotify(
     @Must
     @SerializedName("userInfo") val userInfo: UserInfo,
@@ -370,7 +354,6 @@ data class WordCupPointsReachThresholdNotify(
     @SerializedName("countryFlag") val countryFlag: String,
 ) : IRoomBroadcastNotify
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserBeReportNotify(
     //被举报官方消息,
     // eg:yoki是一个有爱的社区,请珍惜账号,友好交友,多次举报将会被官方封禁
@@ -382,7 +365,6 @@ data class UserBeReportNotify(
 /**
  * svip升级全服通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class SvipChangeGlobalNotify(
     @SerializedName("uid")
     val uid: Long,
@@ -397,7 +379,6 @@ data class SvipChangeGlobalNotify(
 /**
  * 通用全服房间广播
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CommonGlobalRoomBroadcastNotify(
     @SerializedName("triggerBroadcastUser") val userInfo: UserInfo,//触发全服广播的用户资料信息
     @SerializedName("title") val title: BroadcastDataStyle,//全服广播标题数据
@@ -415,7 +396,6 @@ data class CommonGlobalRoomBroadcastNotify(
 /**
  * 广播数据样式
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class BroadcastDataStyle(
     @SerializedName("dataType") val dataType: Int,//数据类型, 0:文本 1:图片
     @SerializedName("dataValue") val dataValue: String,//数据值-英文版
@@ -430,7 +410,6 @@ data class BroadcastDataStyle(
 /**
  * 宝箱守护成功全服通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GuardTreasureSuccessBroadcastNotify(
     @SerializedName("ownerUid") val uid: Long, //宝箱Owner
     @SerializedName("ownerName") val ownerName: String,
@@ -446,7 +425,6 @@ data class GuardTreasureSuccessBroadcastNotify(
 /**
  * 抽中每日充值大奖
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class DailyRechargeRewardBroadcastNotify(
     @SerializedName("uid") val uid: Long, //抽中每日充值大奖uid
     @SerializedName("nickName") var nickName: String,
@@ -456,7 +434,6 @@ data class DailyRechargeRewardBroadcastNotify(
 /**
  * 抽奖活动广播
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class LotteryActivityBroadcastNotify(
     @SerializedName("uid") val uid: Long, //uid
     @SerializedName("nickName") var nickName: String,
@@ -473,7 +450,6 @@ enum class BroadcastDataType(val type: Int) {
 /**
  * 晋升等级
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class LevelUpOtherNotify(
     @SerializedName("avatar") val avatar: String,
     @SerializedName("level") val level: Int,
@@ -488,7 +464,6 @@ data class LevelUpOtherNotify(
 /**
  * TeenPatti头条
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class TeenPattiRewardNotify(
     @SerializedName("seqId")
     val seqId: Long,
@@ -505,7 +480,6 @@ data class TeenPattiRewardNotify(
 /**
  * 拉新活动相关奖励
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class InviteTaskRewardBroadcastNotify(
     @SerializedName("uid") val uid: Long,
     @SerializedName("nickName") var nickName: String,
@@ -515,7 +489,6 @@ data class InviteTaskRewardBroadcastNotify(
 /**
  * 龙虎斗
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class DragonTigerFightRewardNotify(
     @SerializedName("rewardCoin")
     val rewardCoin: Int,

+ 0 - 8
app/src/main/java/com/adealink/weparty/module/room/data/WeddingRedPacketData.kt

@@ -7,7 +7,6 @@ import com.adealink.weparty.module.room.data.RoomLimitTimeGiftData
 import com.google.gson.annotations.GsonNullable
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 /**
@@ -20,7 +19,6 @@ import kotlinx.parcelize.Parcelize
 
 const val WEDDING_RED_PACKET_HEAD_LINE_KEEP_TIME = 10_000L //头条停留10秒
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class WeddingRedPacketInfo(
     @SerializedName("showRedPackageTime")
     val showRedPackageTime: Int,
@@ -38,7 +36,6 @@ data class WeddingRedPacketInfo(
     val rewardInfo: List<RedPacketRewardInfo>?,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RedPacketLevelInfo(
     @SerializedName("level")
     val level: Int,
@@ -46,7 +43,6 @@ data class RedPacketLevelInfo(
     val coins: Long
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RedPacketRewardInfo(
     @SerializedName("level")
     val level: Int,
@@ -58,7 +54,6 @@ data class RedPacketRewardInfo(
 )
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class
 RedPacketRankRewardInfo(
     @SerializedName("uid")
@@ -86,7 +81,6 @@ RedPacketRankRewardInfo(
 /**
  * cp婚礼房金币增加通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class WeddingRedPacketAddCoinsNotify(
     @SerializedName("roomid")
     val roomId: Long,
@@ -101,7 +95,6 @@ data class WeddingRedPacketAddCoinsNotify(
 /**
  * cp婚礼房升级通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class WeddingRedPacketUpgradeNotify(
     @SerializedName("roomid")
     val roomId: Long,
@@ -125,7 +118,6 @@ data class WeddingRedPacketUpgradeNotify(
  * cp婚礼房奖励通知
  */
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class WeddingRedPacketRewardNotify(
     @SerializedName("roomid")
     val roomId: Long,

+ 0 - 3
app/src/main/java/com/adealink/weparty/module/setting/data/SensitiveWord.kt

@@ -4,11 +4,9 @@ import android.os.Parcelable
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class SensitiveWordData(
     @Must
     @SerializedName("id")
@@ -39,7 +37,6 @@ data class SensitiveWordData(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UpdateSensitiveWordDataReq(
     @SerializedName("addCensorwords")
     val word: List<String>,

+ 0 - 3
app/src/main/java/com/adealink/weparty/module/share/data/Data.kt

@@ -1,11 +1,8 @@
 package com.adealink.weparty.module.share.data
 
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ShowInviteRebateRes(
     @SerializedName("show") val show: Boolean, //版本过审后为true
 )

+ 0 - 3
app/src/main/java/com/adealink/weparty/module/skin/data/SkinData.kt

@@ -4,7 +4,6 @@ import android.os.Parcelable
 import com.google.gson.annotations.GsonNullable
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 /**
@@ -167,7 +166,6 @@ enum class SkinColorStyle(val style: Int) {
     LIGHT(0),//浅色
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class SkinInfo(
     @SerializedName("id")
     val skinId: Long,
@@ -233,7 +231,6 @@ data class SkinExtraConfig(
 }
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class SkinGoodInfo(
     @SerializedName("goodsId")
     val goodsId: Long, //即皮肤ID

+ 0 - 13
app/src/main/java/com/adealink/weparty/module/store/data/StoreData.kt

@@ -15,7 +15,6 @@ import com.google.gson.annotations.GsonNullable
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
@@ -69,7 +68,6 @@ enum class UserGoodOpType(val type: Int) {
     NO_USE(2),//不使用
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RingDesc(
     @GsonNullable
     @SerializedName("title") //戒指标题
@@ -80,7 +78,6 @@ data class RingDesc(
 )
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class StoreGoodsInfo(
     @SerializedName("payType")
     val payType: Int = 0,
@@ -278,7 +275,6 @@ enum class GameSkinUseStatus(val status: Int) {
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserGoodInfo(
     @SerializedName("goodsName")
     val goodsName: String,
@@ -356,7 +352,6 @@ infix fun UserGoodInfo.contentsTheSame(other: UserGoodInfo): Boolean =
             && newAnimType == other.newAnimType && scaleRatio == other.scaleRatio && activityLevel == other.activityLevel
             && activityType == other.activityType && ringDesc == other.ringDesc
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GetUserGoodsListRes(
     @SerializedName("carList") val carList: List<UserGoodInfo>,
     @SerializedName("photoFrameList") val photoFrameList: List<UserGoodInfo>,
@@ -371,7 +366,6 @@ infix fun StoreGoodsInfo.contentsTheSame(other: StoreGoodsInfo): Boolean =
 
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GoodIdInfo(
     @Must
     @SerializedName("goodId") val goodId: Long,
@@ -380,7 +374,6 @@ data class GoodIdInfo(
 ) : Parcelable
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GoodIdPrice(
     @Must
     @SerializedName("discountId") val discountId: Long, //折扣id
@@ -408,14 +401,12 @@ data class BuyGoodReq(
     val useRing: Boolean = false,//是否直接使用戒指,不使用则放背包
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserGoodIdInfoRes(
     @SerializedName("seqid") val seqId: Long,
     @GsonNullable
     @SerializedName("goodIdInfo") val goodIdInfo: UserGoodIdInfo,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class UserGoodIdInfo(
     @SerializedName("goodId") val goodId: Long,
@@ -450,14 +441,12 @@ enum class GoodIntimacyType(val type: Int) {
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class IntimacyLevelMinInfo(
     @SerializedName("intimacyLevelMin")
     val intimacyLevelMin: Int,
 )
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GiftGoodsInfo(
     @SerializedName("goodsId")
     val goodsId: Int,//商品id
@@ -499,13 +488,11 @@ data class GiftGoodReq(
     @SerializedName("targetId") val targetId: Long,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class QueryUserGoodsListReq(
     @SerializedName("goodsTypes")
     val goodsTypes: Set<Int>,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class QueryUserGoodsListRes(
     @GsonNullable
     @SerializedName("goodsType2GoodsInfosMap")

+ 0 - 7
app/src/main/java/com/adealink/weparty/module/task/Data.kt

@@ -6,9 +6,7 @@ import com.adealink.weparty.commonui.recycleview.diffutil.BaseListItemData
 import com.adealink.weparty.module.operation.data.ProductTypeConstant
 import com.adealink.weparty.module.operation.data.RewardDetailData
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 /**
@@ -44,7 +42,6 @@ enum class TaskType(val userDimension: String) {
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class TaskConfig(
     @SerializedName("advancedTaskActivityCode") val advancedTaskActivityCode: Int,//进阶任务活动码
     @SerializedName("dailyOtherTasksActivityCode") val dailyOtherTasksActivityCode: Int,//每日其他任务活动码
@@ -66,12 +63,10 @@ data class TaskConfig(
 )
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class BatchDailyTaskInfoRes(
     @SerializedName("dailyTaskInfoList") val dailyTaskInfoList: List<DailyTaskInfo>
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class DailyTaskInfo(
     @SerializedName("activityCode") val activityCode: Int, //活动代码
     @SerializedName("activityId") val activityId: Int, //活动ID
@@ -95,7 +90,6 @@ data class DailyTaskInfo(
 
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class TaskItemReward(
     @SerializedName("userDimension") val userDimension: String, //任务关联的用户数据维度 (通过这个匹配任务)
     @SerializedName("taskId") val taskId: Long,
@@ -152,7 +146,6 @@ data class TaskItemReward(
 
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CommonTaskCompleteRewardNotify(
     @SerializedName("activityId") val activityId: Long,//活动ID
     @SerializedName("taskId") val taskId: Long,//任务ID

+ 0 - 4
app/src/main/java/com/adealink/weparty/module/task/invite/InviteData.kt

@@ -3,9 +3,7 @@ package com.adealink.weparty.module.task.invite
 import android.os.Parcelable
 import com.adealink.weparty.App
 import com.adealink.weparty.module.operation.data.RewardDetailData
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 /**
@@ -18,12 +16,10 @@ val INVITE_SHARE_IMAGE_URL = App.instance.ossService.getUrlByPath("/share/")
     .plus("common_share.png")
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class InviteNewRewardNotify(
     @SerializedName("rewardItems") val rewardItems: List<RewardDetailData> //奖励信息
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class InviteNewActivityShowInfo(
     @SerializedName("enable") val enable: Boolean = false, // Invite入口是否可见
     @SerializedName("show") val show: Boolean = false // 拉新活动是否可见

+ 0 - 5
app/src/main/java/com/adealink/weparty/module/theme/data/ThemeData.kt

@@ -8,14 +8,12 @@ import com.google.gson.annotations.GsonNullable
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 interface ThemeData : BaseListItemData {
 
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class ThemeInfo(
     @SerializedName("themeId")
@@ -111,7 +109,6 @@ class AddThemeInfo : ThemeData {
 /**
  * 房间主题过期通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ThemeExpireNotify(
     @Must
     @SerializedName("roomId") val roomId: Long,
@@ -251,7 +248,6 @@ infix fun ThemeResource.contentsTheSame(other: ThemeResource): Boolean =
     staticResourceUrl == other.dynamicResourceUrl && dynamicResourceUrl == other.dynamicResourceUrl
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CustomThemeConfig(
     @GsonNullable
     @SerializedName("levelUpdateInfos") val levelConfigs: List<CustomThemeLevelConfig>?,
@@ -259,7 +255,6 @@ data class CustomThemeConfig(
     @SerializedName("updateCostCoins") val updateCostCoins: Long?,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CustomThemeLevelConfig(
     @SerializedName("level") val level: Int,
     @SerializedName("updateNum") val updateNum: Int,

+ 0 - 3
app/src/main/java/com/adealink/weparty/module/userlist/datasource/remote/HomeListHttpService.kt

@@ -4,9 +4,7 @@ import com.adealink.frame.base.Rlt
 import com.adealink.frame.network.data.Res
 import com.adealink.weparty.module.profile.data.UserInfo
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import retrofit2.http.Body
 import retrofit2.http.Core
 import retrofit2.http.POST
@@ -27,7 +25,6 @@ interface HomeListHttpService {
 }
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserListReq(
     @SerializedName("pageIndex") val pageIndex: Int = 0,
     @SerializedName("userListType") val userListType: Int, //用户列表类型:0-online, 1-new

+ 0 - 11
app/src/main/java/com/adealink/weparty/module/userprotect/data/ReportData.kt

@@ -5,9 +5,7 @@ import com.adealink.frame.aab.util.getCompatString
 import com.adealink.frame.locale.language.data.Language
 import com.adealink.weparty.R
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 const val IM_LIMIT_USER_LEVEL = 30 //30级开放IM限制功能
@@ -183,7 +181,6 @@ data class UserReportInfo(
     val extraParams: String? = ""
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class ExtraParams(
     @SerializedName("groupId") val groupId: Long,
@@ -191,7 +188,6 @@ data class ExtraParams(
     @SerializedName("reportContent") val reportContent: Map<Long, String>? = null,
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class ReportConfigData(
     @GsonNullable
@@ -203,7 +199,6 @@ data class ReportConfigData(
     @SerializedName("myHelpNum") val myHelpNum: Int,
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class ReportReasonItemData(
     @SerializedName("type") val type: Int,
@@ -229,7 +224,6 @@ data class ReportReasonItemData(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class ReportSceneItemData(
     @SerializedName("type") val type: Int,
@@ -255,14 +249,12 @@ data class ReportSceneItemData(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class UserForHelpListRes(
     @SerializedName("records") val records: List<UserForHelpInfo>, //记录id
 ) : Parcelable
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class UserForHelpInfo(
     @SerializedName("id") val id: Long, //记录id
@@ -306,7 +298,6 @@ data class UserForHelpInfo(
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class UserReqHelpNotify(
     //用户求助消息通知,
@@ -326,7 +317,6 @@ data class UserReqHelpNotify(
     @SerializedName("reportedRoomName") val reportedRoomName: String
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class PenalizeUserReq(
     @SerializedName("reportId") val id: Long, //举报记录id,无传0
@@ -337,7 +327,6 @@ data class PenalizeUserReq(
     @SerializedName("operations") val operations: Array<String> //处罚操作
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class ReportUserReq(
     @SerializedName("reportType") val reportType: Int, //举报场景:定义UserReportScene

+ 0 - 23
app/src/main/java/com/adealink/weparty/module/wallet/data/WalletData.kt

@@ -6,7 +6,6 @@ import com.adealink.weparty.module.operation.data.ProductTypeConstant
 import com.google.gson.annotations.GsonNullable
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 enum class Currency(val value: Byte) {
@@ -43,7 +42,6 @@ enum class PayChannel(val value: String) {
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GetUserCurrencyRes(
     @SerializedName("uid")
     val uid: Long,
@@ -51,7 +49,6 @@ data class GetUserCurrencyRes(
     val currencyInfo: List<UserVirtualCurrencyInfo>,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class DiamondAmountInfo(
     @SerializedName("todayAmount")
     val todayAmount: Long,
@@ -61,7 +58,6 @@ data class DiamondAmountInfo(
     val categoryInfo: Map<String, Int>
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserVirtualCurrencyInfo(
     @SerializedName("currencyType")
     val currencyType: Byte,
@@ -124,7 +120,6 @@ data class CreateOrderReq(
     val price: Float? = null,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GetRechargeListRes(
     @SerializedName("seqId")
     val seqId: Long,
@@ -132,7 +127,6 @@ data class GetRechargeListRes(
     val channelRechargeMap: Map<String, ChannelRechargeInfo>,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ChannelRechargeInfo(
     @SerializedName("channelId")
     val channelId: String,
@@ -140,7 +134,6 @@ data class ChannelRechargeInfo(
     val productInfos: List<ProductInfo>,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CreateOrderRes(
     @SerializedName("seqId")
     val seqId: Long,
@@ -159,7 +152,6 @@ data class VerifyOrderReq(
     val skuId: String,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class VerifyOrderRes(
     @SerializedName("seqId")
     val seqId: Long,
@@ -167,7 +159,6 @@ data class VerifyOrderRes(
 
 const val KEY_CHARGE_REWARD = "charge_reward"
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class ProductInfo(
     @SerializedName("innerProductId")
@@ -239,7 +230,6 @@ enum class ProductType(val type: String, val value: Int) {
     }
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class PayerMaxTypeInfo(
     @SerializedName("name")
     val name: String,
@@ -247,7 +237,6 @@ data class PayerMaxTypeInfo(
     val type: Int = 0,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class PayerMaxOrderStatus(
     @SerializedName("status")
     val status: Int,
@@ -271,7 +260,6 @@ data class PayerMaxOrderStatus(
     val orderId: String?,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GoldDiamondConfigInfo(
     @SerializedName("diamondNum")
     val diamondNum: Int,//钻石数
@@ -283,7 +271,6 @@ data class GoldDiamondConfigInfo(
     val id: Int,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GoldGameCoinsConfigInfo(
     @SerializedName("diamondNum")
     val diamondNum: Int,//钻石数
@@ -299,7 +286,6 @@ data class GoldGameCoinsConfigInfo(
     val id: Int,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GoldDiamondConfigRes(
     @SerializedName("showWithdraw")
     val showWithdrawal: Boolean,//提现入口
@@ -314,7 +300,6 @@ data class DiamondEntrance(
     val showExchange: Boolean
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CoinTransactionInfo(
     @SerializedName("orderId")
     val orderId: String,//订单id,
@@ -336,7 +321,6 @@ data class CoinTransactionInfo(
     val categoryDesc: String = "", //分类名称
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class DiamondTypeProportion(
     val category: Int,
     val income: Int,
@@ -344,7 +328,6 @@ data class DiamondTypeProportion(
     var incomePercentage: Float = 0f
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserRechargeRecordInfo(
     @SerializedName("amount")
     val amount: Int, //充值金额
@@ -379,7 +362,6 @@ data class UserRechargeRecordInfo(
     val reason: String?,//后台发放原因
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserDiamondRecordInfo(
     @SerializedName("amount")
     val amount: Int, //钻石个数
@@ -411,7 +393,6 @@ data class UserDiamondRecordInfo(
     val reason: String?,//后台发放原因
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserCurrencyRecordInfo(
     @SerializedName("orderId")
     val orderId: String,//订单id
@@ -507,7 +488,6 @@ data class UserCoinConsumeRecordInfo(
     val productNum: Int = 0,//产品数量,默认为1,礼物数量可能>=1
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserPurchaseCoinNotify(
     @SerializedName("uid")
     val uid: Long,
@@ -515,7 +495,6 @@ data class UserPurchaseCoinNotify(
     val seqId: Long,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CurrencyChangeNotify(
     @SerializedName("eventTs")
     val eventTs: Long, //事件发生时时间戳
@@ -528,7 +507,6 @@ data class CurrencyChangeNotify(
 )
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ReportOrderInfo(
     @SerializedName("amount")
     val amount: String,
@@ -554,7 +532,6 @@ data class ReportOrderInfo(
     val productType: String,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class MerchantDiamondAgencyConfig(
     @GsonNullable
     @SerializedName("currencyExchangeRates")

+ 0 - 2
app/src/main/java/com/adealink/weparty/module/webview/data/WebData.kt

@@ -4,14 +4,12 @@ import android.os.Parcelable
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 /**
  * Created by sunxiaodong on 2022/7/20.
  */
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class WebConfig(
     @Must @SerializedName("clear_cache_version") val clearCacheVersion: String,
     @SerializedName("loader_type") val loaderType: Int

+ 0 - 2
app/src/main/java/com/adealink/weparty/module/youtube/data/VideoRoomData.kt

@@ -3,11 +3,9 @@ package com.adealink.weparty.module.youtube.data
 import android.os.Parcelable
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class VideoRoomInfo(
     @SerializedName("roomId")
     val roomId: String

+ 0 - 10
app/src/main/java/com/adealink/weparty/module/youtube/data/YoutubeData.kt

@@ -5,7 +5,6 @@ import com.google.gson.annotations.GsonNullable
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 import kotlin.math.max
 
@@ -13,7 +12,6 @@ import kotlin.math.max
  * Created by sunxiaodong on 2022/12/14.
  */
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RoomYoutubeInfoRes(
     @GsonNullable
     @SerializedName("micInfo")
@@ -23,7 +21,6 @@ data class RoomYoutubeInfoRes(
 /**
  * 视频变化通知
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class MicSeatsNotify(
     @Must
     @SerializedName("roomId") val roomId: Long,
@@ -31,7 +28,6 @@ data class MicSeatsNotify(
     @SerializedName("micInfo") val micSeatsInfo: MicSeatsInfo,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class MicSeatsInfo(
     @SerializedName("micModeInfo") val micModeInfo: Map<String, RoomMicModeInfo>,//房间麦位模式
 )
@@ -50,7 +46,6 @@ data class MicSeatsInfo(
 "videoStatus": 0
  */
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RoomMicModeInfo(
     @SerializedName("roomId")
     val roomId: Long,//房间ID
@@ -61,7 +56,6 @@ data class RoomMicModeInfo(
     val videoInfo: YoutubeVideoInfo? //视频房信息
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class YoutubeVideoInfo(
     @GsonNullable
     @SerializedName("videoInfo")
@@ -143,7 +137,6 @@ enum class YoutubeOfficialWebsite(val url: String) {
 }
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class YoutubeVideoListReq(
     @GsonNullable
@@ -157,7 +150,6 @@ data class YoutubeVideoListReq(
 ) : Parcelable
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class YoutubeVideoListRes(
     @SerializedName("nextPageToken")
@@ -167,7 +159,6 @@ data class YoutubeVideoListRes(
 ) : Parcelable
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class YoutubeVideoData(
     @SerializedName("duration")
@@ -207,7 +198,6 @@ data class YoutubeVideoData(
 }
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class SyncVideoRoomStatusReq(
     @SerializedName("roomId")
     val roomId: Long,//房间ID

+ 0 - 3
app/src/main/java/com/adealink/weparty/network/PingSocketService.kt

@@ -3,9 +3,7 @@ package com.adealink.weparty.network
 import com.adealink.frame.base.Rlt
 import com.adealink.frame.network.data.Res
 import com.adealink.frame.network.socket.annotation.Uri
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import retrofit2.http.Body
 
 /**
@@ -23,7 +21,6 @@ data class PingReq(
     @SerializedName("supportRtc") val supportRtc: Byte
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class PingRes(
     @SerializedName("interval") val interval: Long,
     @SerializedName("inRoomId") val inRoomId: Long,

+ 0 - 3
app/src/main/java/com/adealink/weparty/oss/FederationToken.kt

@@ -1,14 +1,11 @@
 package com.adealink.weparty.oss
 
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
 /**
  * Created by sunxiaodong on 2021/5/17.
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FederationToken(
     @Must
     @SerializedName("accessKeyId") val accessKeyId: String,

+ 0 - 3
app/src/main/java/com/adealink/weparty/setting/data/Data.kt

@@ -2,13 +2,10 @@ package com.adealink.weparty.setting.data
 
 import android.os.Parcelable
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class EmailState(
     @SerializedName("status") val status: Boolean,
     @GsonNullable

+ 0 - 4
app/src/main/java/com/adealink/weparty/token/Data.kt

@@ -1,6 +1,2 @@
 package com.adealink.weparty.token
 
-import com.google.gson.annotations.JsonAdapter
-import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
-

+ 0 - 3
app/src/main/java/com/adealink/weparty/url/H5PageConfig.kt

@@ -1,8 +1,6 @@
 package com.adealink.weparty.url
 
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
 /**
  * Created by XiaoDongLin.
@@ -10,7 +8,6 @@ import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
  */
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class H5PageConfig(
     @SerializedName("key")
     val key: String,

+ 0 - 3
app/src/main/java/com/adealink/weparty/webview/jsbridge/method/LogJSNativeMethod.kt

@@ -2,16 +2,13 @@ package com.adealink.weparty.webview.jsbridge.method
 
 import com.adealink.frame.log.Log
 import com.adealink.weparty.webview.jsbridge.callback.JSBridgeCallback
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
 /**
  * Created by sunxiaodong on 2021/7/2.
  */
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class LogRes(
     @Must
     @SerializedName("tag") val tag: String,

+ 0 - 2
app/src/main/java/com/adealink/weparty/webview/jsbridge/method/StatJSNativeMethod.kt

@@ -7,13 +7,11 @@ import com.adealink.weparty.webview.jsbridge.callback.JSBridgeCallback
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
 /**
  * Created by sunxiaodong on 2021/6/12.
  */
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class StatReqData(
     @Must
     @SerializedName("event_id") val eventId: String,

+ 0 - 4
frame/room/src/main/java/com/adealink/frame/room/data/RoomFlowData.kt

@@ -4,14 +4,12 @@ import android.os.Parcelable
 import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 /**
  * Created by sunxiaodong on 2021/3/2.
  */
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RoomMemberOnlineInfo(
     @SerializedName("onlinePersons") val onlineMemberCount: Long, //非必需,join room时不会返回,notify会
     @Must
@@ -21,7 +19,6 @@ data class RoomMemberOnlineInfo(
 )
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class CpRoomInfo(
     @SerializedName("roomId") val roomId: Long = 0,
     @SerializedName("owner") val owner: Long = 0,
@@ -34,7 +31,6 @@ data class CpRoomInfo(
 ): Parcelable
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class TagInfo(
     @SerializedName("expireTime")
     val expireTime: Long,

+ 1 - 1
gradle/libs.versions.toml

@@ -154,7 +154,7 @@ appleAppauth = "0.11.1"
 tiktok = "2.3.0"
 
 # frame
-frameBom = "5.1.22-yoki-9"
+frameBom = "5.1.22-yoki-10"
 frameRouterCompiler = "5.1.6"
 frameTrace = "1.0.0"
 frameBundleTool = "1.0.0"

+ 0 - 15
module/account/src/main/java/com/adealink/weparty/account/login/data/LoginData.kt

@@ -7,12 +7,9 @@ import com.adealink.weparty.channel.getChannel
 import com.adealink.weparty.commonui.recycleview.diffutil.BaseListItemData
 import com.adealink.weparty.module.account.AccountLocalService
 import com.adealink.weparty.module.profile.data.UserInfo
-import com.adealink.weparty.module.profile.data.contentsTheSame
 import com.google.gson.annotations.GsonNullable
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.Must
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import kotlinx.parcelize.Parcelize
 
 /**
@@ -58,7 +55,6 @@ data class LoginReq(
 )
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class LoginResult(
     @SerializedName("seqid") val seqId: Long = 0,
     @SerializedName("token") val token: String,
@@ -68,7 +64,6 @@ data class LoginResult(
     @SerializedName("expire") val expire: Long,
 ) : Parcelable
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class UserKickOutNotify(
     @SerializedName("roomId") val roomId: Long,
     @Must
@@ -77,7 +72,6 @@ data class UserKickOutNotify(
     @SerializedName("kickReason") val kickReason: Long,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class BlockFunctionNotify(
     @SerializedName("seqid") val seqId: Long = 0,
     @Must
@@ -86,7 +80,6 @@ data class BlockFunctionNotify(
     @SerializedName("content") val content: String? = null,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class BlockAccountNotify(
     @SerializedName("seqid") val seqId: Long = 0,
     @Must
@@ -95,7 +88,6 @@ data class BlockAccountNotify(
     @SerializedName("content") val content: String? = null,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ReplaceUserInfoNotify(
     @SerializedName("seqid") val seqId: Long = 0,
     @Must
@@ -149,13 +141,11 @@ data class RefreshTokenReq(
     @SerializedName("refreshToken") val refreshToken: String,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class RefreshTokenNotify(
     @SerializedName("seqId") val seqId: Long,
 )
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 @Parcelize
 data class EmailCodeResult(
     @SerializedName("seqId") val seqId: Long,
@@ -250,7 +240,6 @@ data class EmailGoogleAccountReq(
     @SerializedName("newDeviceId") val newDeviceId: String,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ThirdAccountListResult(
     @SerializedName("thirdAccountList") val thirdAccountList: ArrayList<ThirdAccountListData>,
     @SerializedName("name") val name: String,
@@ -258,7 +247,6 @@ data class ThirdAccountListResult(
 )
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class ThirdAccountListData(
     @SerializedName("tid") val tid: Long,
     @SerializedName("userInfo") val userInfo: UserInfo,
@@ -266,7 +254,6 @@ data class ThirdAccountListData(
 ) : Parcelable
 
 @Parcelize
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FBAccountListData(
     val tid: Long,
     val userInfo: UserInfo,
@@ -284,7 +271,6 @@ enum class EmailReason(val reason: Int) {
     GOOGLE_LOGIN(2)
 }
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class AccountInfo(
     @SerializedName("bindEmail") val bindEmail: String, //用户绑定的邮箱
     @SerializedName("password") val password: String, //密码
@@ -296,7 +282,6 @@ data class AccountInfo(
     @SerializedName("uid") val uid: Long, //用户uid
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class BindAccountWithPhoneReq(
     @SerializedName("phoneNumber") val phoneNumber: String,//手机号;需要填写区号
     @SerializedName("verifyCode") val verifyCode: String,//验证码

+ 0 - 4
module/anchor/src/main/java/com/adealink/weparty/anchor/data/getAnchorMessagesReq.kt

@@ -1,15 +1,12 @@
 package com.adealink.weparty.anchor.data
 
 import com.adealink.weparty.module.anchor.data.AnchorMessage
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 
 /**
  * Created by XiaoDongLin.
  * Date: 2025/5/29
  */
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GetAnchorMessagesReq(
     @SerializedName("messageType")
     val messageType: List<Int> = emptyList(), //消息类型
@@ -17,7 +14,6 @@ data class GetAnchorMessagesReq(
     val filterUnreply: Boolean = true,//只过滤出未回复消息
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class GetAnchorMessagesRes(
     @SerializedName("messages")
     val messages: List<AnchorMessage> = emptyList(), //消息列表

+ 0 - 4
module/attribution/src/main/java/com/adealink/weparty/attribution/utm/FacebookUtm.kt

@@ -4,9 +4,7 @@ import com.adealink.frame.data.json.froJsonErrorNull
 import com.adealink.frame.log.Log
 import com.adealink.weparty.BuildConfig
 import com.adealink.weparty.stat.constant.TAG_ATTRIBUTION
-import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
-import com.google.gson.internal.bind.ExtReflectiveTypeAdapterFactory
 import java.net.URLDecoder
 import java.util.Locale
 import javax.crypto.Cipher
@@ -14,14 +12,12 @@ import javax.crypto.spec.GCMParameterSpec
 import javax.crypto.spec.SecretKeySpec
 
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FacebookUtmContent(
     @SerializedName("app") val app: String,
     @SerializedName("t") val t: String,
     @SerializedName("source") val source: FacebookUtmContentSource,
 )
 
-@JsonAdapter(ExtReflectiveTypeAdapterFactory::class)
 data class FacebookUtmContentSource(
     @SerializedName("data") val data: String, //加密的广告数据
     @SerializedName("nonce") val nonce: String, //加密随机码

Деякі файли не було показано, через те що забагато файлів було змінено