memerge

app/mapping.txt

@@ -1,12 +1,12 @@
 # compiler: R8
 # compiler_version: 2.2.66
 # min_api: 21
-# pg_map_id: ecec49f
+# pg_map_id: ae660bd
 # common_typos_disable
 $$ServiceLoaderMethods -> a:
 # {"id":"sourceFile","fileName":"ServiceLoader"}
-    java.util.Iterator $load$77322() -> a
-    java.util.Iterator $load$77609() -> b
+    java.util.Iterator $load$77330() -> a
+    java.util.Iterator $load$77617() -> b
 android.support.customtabs.ICustomTabsCallback$Stub -> android.support.customtabs.ICustomTabsCallback$Stub:
     1:2:void <init>():18:19 -> <init>
     1:3:android.support.customtabs.ICustomTabsCallback asInterface(android.os.IBinder):30:32 -> asInterface
@@ -157374,30 +157374,32 @@ com.swago.baseswago.http.SwagoJsonFactor -> com.swago.baseswago.b0.f:
 com.swago.baseswago.im.GroupMsgParser -> com.swago.baseswago.c0.a:
 # {"id":"sourceFile","fileName":"GroupMsgParser.kt"}
     kotlin.Lazy gson$delegate -> a
-    1:1:void <init>():30:30 -> <init>
-    2:2:void <init>():32:32 -> <init>
-    1:1:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):38:38 -> a
-    2:3:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):40:41 -> a
-    4:7:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):47:50 -> a
-    8:8:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):52:52 -> a
-    9:11:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):90:90 -> a
-    12:12:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):95:95 -> a
-    13:15:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):72:72 -> a
-    16:16:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):77:77 -> a
-    17:19:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):54:54 -> a
-    20:20:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):59:59 -> a
-    21:23:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):81:81 -> a
-    24:24:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):86:86 -> a
-    25:27:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):63:63 -> a
-    28:28:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):68:68 -> a
-    29:29:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):98:98 -> a
-    30:30:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):100:100 -> a
-    1:1:com.google.gson.Gson getGson():32:32 -> b
+    1:1:void <init>():28:28 -> <init>
+    2:2:void <init>():30:30 -> <init>
+    1:1:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):36:36 -> a
+    2:3:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):38:39 -> a
+    4:7:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):45:48 -> a
+    8:8:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):50:50 -> a
+    9:11:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):79:79 -> a
+    12:12:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):84:84 -> a
+    13:15:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):88:88 -> a
+    16:16:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):93:93 -> a
+    17:19:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):97:97 -> a
+    20:20:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):102:102 -> a
+    21:23:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):70:70 -> a
+    24:24:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):75:75 -> a
+    25:27:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):52:52 -> a
+    28:28:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):57:57 -> a
+    29:31:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):61:61 -> a
+    32:32:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):66:66 -> a
+    33:33:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):105:105 -> a
+    34:34:java.lang.Object parserGroupMsg(com.tencent.imsdk.v2.V2TIMMessage,kotlin.coroutines.Continuation):107:107 -> a
+    1:1:com.google.gson.Gson getGson():30:30 -> b
 com.swago.baseswago.im.GroupMsgParser$gson$2 -> com.swago.baseswago.c0.a$a:
 # {"id":"sourceFile","fileName":"GroupMsgParser.kt"}
     com.swago.baseswago.im.GroupMsgParser$gson$2 INSTANCE -> n
-    1:1:com.google.gson.Gson invoke():33:33 -> invoke
-    1:1:java.lang.Object invoke():32 -> invoke
+    1:1:com.google.gson.Gson invoke():31:31 -> invoke
+    1:1:java.lang.Object invoke():30 -> invoke
 com.swago.baseswago.im.IGroupNewMsg -> com.swago.baseswago.c0.b:
 # {"id":"sourceFile","fileName":"IGroupNewMsg.kt"}
     void onNewMessage(com.swago.baseswago.im.IGroupNewMsgBean) -> a
@@ -158037,6 +158039,12 @@ com.swago.baseswago.model.im.CusNewMsgBean -> com.swago.baseswago.model.im.CusNe
     1:1:com.tencent.imsdk.v2.V2TIMMessage getV2TIMMessage():12:12 -> getV2TIMMessage
     1:1:void setData(java.lang.Object):13:13 -> setData
     1:1:void setV2TIMMessage(com.tencent.imsdk.v2.V2TIMMessage):12:12 -> setV2TIMMessage
+com.swago.baseswago.model.im.DiamondWindupBean -> com.swago.baseswago.model.im.DiamondWindupBean:
+    1:1:void <init>():7:7 -> <init>
+    1:1:java.lang.String getIncomeCount():22:22 -> getIncomeCount
+    1:1:java.lang.String getRoomId():14:14 -> getRoomId
+    1:1:void setIncomeCount(java.lang.String):26:26 -> setIncomeCount
+    1:1:void setRoomId(java.lang.String):18:18 -> setRoomId
 com.swago.baseswago.model.im.RoomChatMsgBean -> com.swago.baseswago.model.im.RoomChatMsgBean:
     1:1:void <init>():12:12 -> <init>
     1:1:int getIsBenefit():45:45 -> getIsBenefit
@@ -163675,7 +163683,7 @@ com.swago.room.gift.-$$Lambda$GiftDialog$initOther$1$5$3MQmGnKpNmavgK-A68N8dJc9g
     1:1:void com.swago.room.gift.GiftDialog$initOther$1$5.getTitleView$lambda-0(com.swago.room.gift.GiftDialog,int,android.view.View):0:0 -> onClick
     1:1:void com.swago.room.gift.GiftDialog$initOther$1$5.lambda$3MQmGnKpNmavgK-A68N8dJc9gLI(com.swago.room.gift.GiftDialog,int,android.view.View):0 -> onClick
     1:1:void onClick(android.view.View):0 -> onClick
-    2:2:void com.swago.room.gift.GiftDialog$initOther$1$5.getTitleView$lambda-0(com.swago.room.gift.GiftDialog,int,android.view.View):176:176 -> onClick
+    2:2:void com.swago.room.gift.GiftDialog$initOther$1$5.getTitleView$lambda-0(com.swago.room.gift.GiftDialog,int,android.view.View):178:178 -> onClick
     2:2:void com.swago.room.gift.GiftDialog$initOther$1$5.lambda$3MQmGnKpNmavgK-A68N8dJc9gLI(com.swago.room.gift.GiftDialog,int,android.view.View):0 -> onClick
     2:2:void onClick(android.view.View):0 -> onClick
 com.swago.room.gift.-$$Lambda$GiftDialog$pKMlnIftIiVz9FEzDgFARA1yUzI -> com.swago.room.gift.c:
@@ -163909,208 +163917,209 @@ com.swago.room.gift.GiftDialog -> com.swago.room.gift.GiftDialog:
     com.swago.baseswago.SwagoAdapter viewPagerAdapter -> G
     int giftBatch -> t
     int returnGiftBatch -> u
-    1:1:void access$sendGift(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftModel,int,int):37:37 -> <init>
-    1:1:void <init>():37 -> <init>
+    1:1:void access$sendGift(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftModel,int,int):38:38 -> <init>
+    1:1:void <init>():38 -> <init>
     2:2:kotlin.Lazy androidx.fragment.app.FragmentViewModelLazyKt.viewModels$default(androidx.fragment.app.Fragment,kotlin.jvm.functions.Function0,kotlin.jvm.functions.Function0,int,java.lang.Object):56:56 -> <init>
-    2:2:void <init>():362 -> <init>
+    2:2:void <init>():364 -> <init>
     3:3:kotlin.Lazy androidx.fragment.app.FragmentViewModelLazyKt.viewModels$default(androidx.fragment.app.Fragment,kotlin.jvm.functions.Function0,kotlin.jvm.functions.Function0,int,java.lang.Object):58:58 -> <init>
-    3:3:void <init>():364 -> <init>
-    4:4:com.swago.room.gift.GiftVm getGiftVm():39:39 -> <init>
-    4:4:void <init>():39 -> <init>
-    5:6:void <init>():42:43 -> <init>
-    7:7:com.google.gson.Gson getGson():45:45 -> <init>
-    7:7:void <init>():45 -> <init>
-    8:10:void <init>():50:52 -> <init>
-    11:11:void <init>():49:49 -> <init>
-    12:12:void <init>():54:54 -> <init>
-    13:15:void <init>():59:61 -> <init>
-    16:16:void <init>():64:64 -> <init>
-    17:17:void <init>():66:66 -> <init>
-    18:19:void <init>():69:70 -> <init>
-    1:3:void initOther():88:90 -> A
-    4:5:void initOther():93:94 -> A
-    6:6:com.google.gson.Gson getGson():45:45 -> A
-    6:6:void initOther():98 -> A
-    7:7:void initOther():98:98 -> A
+    3:3:void <init>():366 -> <init>
+    4:4:com.swago.room.gift.GiftVm getGiftVm():40:40 -> <init>
+    4:4:void <init>():40 -> <init>
+    5:6:void <init>():43:44 -> <init>
+    7:7:com.google.gson.Gson getGson():46:46 -> <init>
+    7:7:void <init>():46 -> <init>
+    8:10:void <init>():51:53 -> <init>
+    11:11:void <init>():50:50 -> <init>
+    12:12:void <init>():55:55 -> <init>
+    13:15:void <init>():60:62 -> <init>
+    16:16:void <init>():65:65 -> <init>
+    17:17:void <init>():67:67 -> <init>
+    18:19:void <init>():70:71 -> <init>
+    1:3:void initOther():89:91 -> A
+    4:5:void initOther():94:95 -> A
+    6:6:com.google.gson.Gson getGson():46:46 -> A
+    6:6:void initOther():99 -> A
+    7:7:void initOther():99:99 -> A
     8:8:void kotlin.collections.CollectionsKt___CollectionsKt.forEach(java.lang.Iterable,kotlin.jvm.functions.Function1):1849:1849 -> A
-    8:8:void initOther():365 -> A
-    9:9:void initOther():100:100 -> A
-    10:13:void initOther():115:118 -> A
-    14:15:void initOther():109:110 -> A
-    16:17:void initOther():103:104 -> A
-    18:18:void initOther():122:122 -> A
-    19:19:void initOther():124:124 -> A
+    8:8:void initOther():367 -> A
+    9:9:void initOther():101:101 -> A
+    10:13:void initOther():116:119 -> A
+    14:15:void initOther():110:111 -> A
+    16:17:void initOther():104:105 -> A
+    18:18:void initOther():123:123 -> A
+    19:19:void initOther():125:125 -> A
     20:20:void com.swago.room.gift.GiftVm.getGiftList():0:0 -> A
-    20:20:void initOther():124 -> A
-    21:21:void com.swago.room.gift.GiftVm.getGiftList():27:27 -> A
-    21:21:void initOther():124 -> A
-    22:24:void initOther():125:127 -> A
-    25:25:void initOther():126:126 -> A
-    26:26:void initOther():129:129 -> A
+    20:20:void initOther():125 -> A
+    21:21:void com.swago.room.gift.GiftVm.getGiftList():28:28 -> A
+    21:21:void initOther():125 -> A
+    22:24:void initOther():126:128 -> A
+    25:25:void initOther():127:127 -> A
+    26:26:void initOther():130:130 -> A
     27:27:com.swago.room.gift.GiftFragment com.swago.room.gift.GiftFragment$Companion.newInstance(int,java.util.ArrayList):0:0 -> A
-    27:27:void initOther():129 -> A
+    27:27:void initOther():130 -> A
     28:32:com.swago.room.gift.GiftFragment com.swago.room.gift.GiftFragment$Companion.newInstance(int,java.util.ArrayList):31:35 -> A
-    28:32:void initOther():129 -> A
-    33:34:void initOther():129:130 -> A
+    28:32:void initOther():130 -> A
+    33:34:void initOther():130:131 -> A
     35:35:com.swago.room.gift.GiftFragment com.swago.room.gift.GiftFragment$Companion.newInstance(int,java.util.ArrayList):0:0 -> A
-    35:35:void initOther():130 -> A
+    35:35:void initOther():131 -> A
     36:40:com.swago.room.gift.GiftFragment com.swago.room.gift.GiftFragment$Companion.newInstance(int,java.util.ArrayList):31:35 -> A
-    36:40:void initOther():130 -> A
-    41:42:void initOther():130:131 -> A
+    36:40:void initOther():131 -> A
+    41:42:void initOther():131:132 -> A
     43:43:com.swago.room.gift.GiftFragment com.swago.room.gift.GiftFragment$Companion.newInstance(int,java.util.ArrayList):0:0 -> A
-    43:43:void initOther():131 -> A
+    43:43:void initOther():132 -> A
     44:48:com.swago.room.gift.GiftFragment com.swago.room.gift.GiftFragment$Companion.newInstance(int,java.util.ArrayList):31:35 -> A
-    44:48:void initOther():131 -> A
-    49:49:void initOther():131:131 -> A
-    50:52:void initOther():133:135 -> A
-    53:53:void initOther():141:141 -> A
-    54:54:void initOther():146:146 -> A
-    55:55:void initOther():151:151 -> A
-    56:58:void initOther():157:159 -> A
-    59:60:void initOther():161:162 -> A
-    61:62:void initOther():194:195 -> A
-    63:63:void initOther():198:198 -> A
-    64:64:void initOther():214:214 -> A
-    65:65:void initOther():222:222 -> A
-    66:66:void initOther():230:230 -> A
-    67:67:void initOther():227:227 -> A
-    68:68:void initOther():224:224 -> A
-    69:69:void initOther():234:234 -> A
-    70:70:void initOther():251:251 -> A
-    1:1:void access$sendGift(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftModel,int,int):37:37 -> B
-    1:1:com.swago.room.gift.GiftFragment access$getHotFragment$p(com.swago.room.gift.GiftDialog):37 -> B
-    1:1:void access$sendGift(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftModel,int,int):37:37 -> C
-    1:1:java.util.ArrayList access$getLuckyData$p(com.swago.room.gift.GiftDialog):37 -> C
-    1:1:void access$sendGift(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftModel,int,int):37:37 -> D
-    1:1:com.swago.room.gift.GiftFragment access$getLuckyFragment$p(com.swago.room.gift.GiftDialog):37 -> D
-    1:1:void access$sendGift(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftModel,int,int):37:37 -> E
-    1:1:com.swago.room.gift.GiftFragment access$getLuxuryFragment$p(com.swago.room.gift.GiftDialog):37 -> E
-    1:1:void access$sendGift(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftModel,int,int):37:37 -> F
-    1:1:java.util.ArrayList access$getTitleList$p(com.swago.room.gift.GiftDialog):37 -> F
-    1:3:void resetSendState():291:293 -> G
-    1:3:void access$resetSendState(com.swago.room.gift.GiftDialog):37 -> G
-    1:1:void access$sendGift(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftModel,int,int):37:37 -> H
-    1:1:void access$sendGift(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftModel,int,int):37:37 -> I
-    1:1:void access$setType$p(com.swago.room.gift.GiftDialog,int):37 -> I
-    1:1:com.swago.room.gift.GiftVm getGiftVm():39:39 -> J
+    44:48:void initOther():132 -> A
+    49:49:void initOther():132:132 -> A
+    50:52:void initOther():134:136 -> A
+    53:53:void initOther():142:142 -> A
+    54:54:void initOther():147:147 -> A
+    55:55:void initOther():152:152 -> A
+    56:58:void initOther():158:160 -> A
+    59:60:void initOther():162:163 -> A
+    61:62:void initOther():196:197 -> A
+    63:63:void initOther():200:200 -> A
+    64:64:void initOther():216:216 -> A
+    65:65:void initOther():224:224 -> A
+    66:66:void initOther():232:232 -> A
+    67:67:void initOther():229:229 -> A
+    68:68:void initOther():226:226 -> A
+    69:69:void initOther():236:236 -> A
+    70:70:void initOther():253:253 -> A
+    1:1:void access$sendGift(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftModel,int,int):38:38 -> B
+    1:1:com.swago.room.gift.GiftFragment access$getHotFragment$p(com.swago.room.gift.GiftDialog):38 -> B
+    1:1:void access$sendGift(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftModel,int,int):38:38 -> C
+    1:1:java.util.ArrayList access$getLuckyData$p(com.swago.room.gift.GiftDialog):38 -> C
+    1:1:void access$sendGift(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftModel,int,int):38:38 -> D
+    1:1:com.swago.room.gift.GiftFragment access$getLuckyFragment$p(com.swago.room.gift.GiftDialog):38 -> D
+    1:1:void access$sendGift(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftModel,int,int):38:38 -> E
+    1:1:com.swago.room.gift.GiftFragment access$getLuxuryFragment$p(com.swago.room.gift.GiftDialog):38 -> E
+    1:1:void access$sendGift(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftModel,int,int):38:38 -> F
+    1:1:java.util.ArrayList access$getTitleList$p(com.swago.room.gift.GiftDialog):38 -> F
+    1:3:void resetSendState():293:295 -> G
+    1:3:void access$resetSendState(com.swago.room.gift.GiftDialog):38 -> G
+    1:1:void access$sendGift(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftModel,int,int):38:38 -> H
+    1:1:void access$sendGift(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftModel,int,int):38:38 -> I
+    1:1:void access$setType$p(com.swago.room.gift.GiftDialog,int):38 -> I
+    1:1:com.swago.room.gift.GiftVm getGiftVm():40:40 -> J
     1:1:void initOther$lambda-2$lambda-1(com.swago.room.gift.GiftDialog,android.view.View):0:0 -> K
     1:1:void lambda$4GEt-Zdu8_519fWNEXTa3Ol1Y3o(com.swago.room.gift.GiftDialog,android.view.View):0 -> K
-    2:2:void initOther$lambda-2$lambda-1(com.swago.room.gift.GiftDialog,android.view.View):252:252 -> K
+    2:2:void initOther$lambda-2$lambda-1(com.swago.room.gift.GiftDialog,android.view.View):254:254 -> K
     2:2:void lambda$4GEt-Zdu8_519fWNEXTa3Ol1Y3o(com.swago.room.gift.GiftDialog,android.view.View):0 -> K
-    3:4:void initOther$lambda-2$lambda-1(com.swago.room.gift.GiftDialog,android.view.View):278:279 -> K
+    3:4:void initOther$lambda-2$lambda-1(com.swago.room.gift.GiftDialog,android.view.View):280:281 -> K
     3:4:void lambda$4GEt-Zdu8_519fWNEXTa3Ol1Y3o(com.swago.room.gift.GiftDialog,android.view.View):0 -> K
-    5:5:void sendGift$default(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftModel,int,int,int,java.lang.Object):297:297 -> K
-    5:5:void initOther$lambda-2$lambda-1(com.swago.room.gift.GiftDialog,android.view.View):280 -> K
+    5:5:void sendGift$default(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftModel,int,int,int,java.lang.Object):299:299 -> K
+    5:5:void initOther$lambda-2$lambda-1(com.swago.room.gift.GiftDialog,android.view.View):282 -> K
     5:5:void lambda$4GEt-Zdu8_519fWNEXTa3Ol1Y3o(com.swago.room.gift.GiftDialog,android.view.View):0 -> K
-    6:6:void initOther$lambda-2$lambda-1(com.swago.room.gift.GiftDialog,android.view.View):281:281 -> K
+    6:6:void initOther$lambda-2$lambda-1(com.swago.room.gift.GiftDialog,android.view.View):283:283 -> K
     6:6:void lambda$4GEt-Zdu8_519fWNEXTa3Ol1Y3o(com.swago.room.gift.GiftDialog,android.view.View):0 -> K
-    7:8:void initOther$lambda-2$lambda-1(com.swago.room.gift.GiftDialog,android.view.View):268:269 -> K
+    7:8:void initOther$lambda-2$lambda-1(com.swago.room.gift.GiftDialog,android.view.View):270:271 -> K
     7:8:void lambda$4GEt-Zdu8_519fWNEXTa3Ol1Y3o(com.swago.room.gift.GiftDialog,android.view.View):0 -> K
-    9:9:void sendGift$default(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftModel,int,int,int,java.lang.Object):297:297 -> K
-    9:9:void initOther$lambda-2$lambda-1(com.swago.room.gift.GiftDialog,android.view.View):270 -> K
+    9:9:void sendGift$default(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftModel,int,int,int,java.lang.Object):299:299 -> K
+    9:9:void initOther$lambda-2$lambda-1(com.swago.room.gift.GiftDialog,android.view.View):272 -> K
     9:9:void lambda$4GEt-Zdu8_519fWNEXTa3Ol1Y3o(com.swago.room.gift.GiftDialog,android.view.View):0 -> K
-    10:10:void initOther$lambda-2$lambda-1(com.swago.room.gift.GiftDialog,android.view.View):271:271 -> K
+    10:10:void initOther$lambda-2$lambda-1(com.swago.room.gift.GiftDialog,android.view.View):273:273 -> K
     10:10:void lambda$4GEt-Zdu8_519fWNEXTa3Ol1Y3o(com.swago.room.gift.GiftDialog,android.view.View):0 -> K
-    11:13:void initOther$lambda-2$lambda-1(com.swago.room.gift.GiftDialog,android.view.View):255:257 -> K
+    11:13:void initOther$lambda-2$lambda-1(com.swago.room.gift.GiftDialog,android.view.View):257:259 -> K
     11:13:void lambda$4GEt-Zdu8_519fWNEXTa3Ol1Y3o(com.swago.room.gift.GiftDialog,android.view.View):0 -> K
-    14:16:void initOther$lambda-2$lambda-1(com.swago.room.gift.GiftDialog,android.view.View):259:261 -> K
+    14:16:void initOther$lambda-2$lambda-1(com.swago.room.gift.GiftDialog,android.view.View):261:263 -> K
     14:16:void lambda$4GEt-Zdu8_519fWNEXTa3Ol1Y3o(com.swago.room.gift.GiftDialog,android.view.View):0 -> K
     1:1:void initLiveData$lambda-5(com.swago.room.gift.GiftDialog,java.util.List):0:0 -> L
     1:1:void lambda$pKMlnIftIiVz9FEzDgFARA1yUzI(com.swago.room.gift.GiftDialog,java.util.List):0 -> L
-    2:2:com.google.gson.Gson getGson():45:45 -> L
-    2:2:void initLiveData$lambda-5(com.swago.room.gift.GiftDialog,java.util.List):315 -> L
+    2:2:com.google.gson.Gson getGson():46:46 -> L
+    2:2:void initLiveData$lambda-5(com.swago.room.gift.GiftDialog,java.util.List):317 -> L
     2:2:void lambda$pKMlnIftIiVz9FEzDgFARA1yUzI(com.swago.room.gift.GiftDialog,java.util.List):0 -> L
-    3:5:void initLiveData$lambda-5(com.swago.room.gift.GiftDialog,java.util.List):315:317 -> L
+    3:5:void initLiveData$lambda-5(com.swago.room.gift.GiftDialog,java.util.List):317:319 -> L
     3:5:void lambda$pKMlnIftIiVz9FEzDgFARA1yUzI(com.swago.room.gift.GiftDialog,java.util.List):0 -> L
-    6:6:void initLiveData$lambda-5(com.swago.room.gift.GiftDialog,java.util.List):319:319 -> L
+    6:6:void initLiveData$lambda-5(com.swago.room.gift.GiftDialog,java.util.List):321:321 -> L
     6:6:void lambda$pKMlnIftIiVz9FEzDgFARA1yUzI(com.swago.room.gift.GiftDialog,java.util.List):0 -> L
     7:7:void kotlin.collections.CollectionsKt___CollectionsKt.forEach(java.lang.Iterable,kotlin.jvm.functions.Function1):1849:1849 -> L
-    7:7:void initLiveData$lambda-5(com.swago.room.gift.GiftDialog,java.util.List):367 -> L
+    7:7:void initLiveData$lambda-5(com.swago.room.gift.GiftDialog,java.util.List):369 -> L
     7:7:void lambda$pKMlnIftIiVz9FEzDgFARA1yUzI(com.swago.room.gift.GiftDialog,java.util.List):0 -> L
-    8:8:void initLiveData$lambda-5(com.swago.room.gift.GiftDialog,java.util.List):320:320 -> L
+    8:8:void initLiveData$lambda-5(com.swago.room.gift.GiftDialog,java.util.List):322:322 -> L
     8:8:void lambda$pKMlnIftIiVz9FEzDgFARA1yUzI(com.swago.room.gift.GiftDialog,java.util.List):0 -> L
-    9:12:void initLiveData$lambda-5(com.swago.room.gift.GiftDialog,java.util.List):335:338 -> L
+    9:12:void initLiveData$lambda-5(com.swago.room.gift.GiftDialog,java.util.List):337:340 -> L
     9:12:void lambda$pKMlnIftIiVz9FEzDgFARA1yUzI(com.swago.room.gift.GiftDialog,java.util.List):0 -> L
-    13:14:void initLiveData$lambda-5(com.swago.room.gift.GiftDialog,java.util.List):329:330 -> L
+    13:14:void initLiveData$lambda-5(com.swago.room.gift.GiftDialog,java.util.List):331:332 -> L
     13:14:void lambda$pKMlnIftIiVz9FEzDgFARA1yUzI(com.swago.room.gift.GiftDialog,java.util.List):0 -> L
-    15:16:void initLiveData$lambda-5(com.swago.room.gift.GiftDialog,java.util.List):323:324 -> L
+    15:16:void initLiveData$lambda-5(com.swago.room.gift.GiftDialog,java.util.List):325:326 -> L
     15:16:void lambda$pKMlnIftIiVz9FEzDgFARA1yUzI(com.swago.room.gift.GiftDialog,java.util.List):0 -> L
-    17:18:void initLiveData$lambda-5(com.swago.room.gift.GiftDialog,java.util.List):342:343 -> L
+    17:18:void initLiveData$lambda-5(com.swago.room.gift.GiftDialog,java.util.List):344:345 -> L
     17:18:void lambda$pKMlnIftIiVz9FEzDgFARA1yUzI(com.swago.room.gift.GiftDialog,java.util.List):0 -> L
     1:1:void initLiveData$lambda-6(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftSendModel):0:0 -> M
     1:1:void lambda$z3BjxaWQGXYte-NI1FaMlPRokew(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftSendModel):0 -> M
-    2:5:void initLiveData$lambda-6(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftSendModel):349:352 -> M
+    2:5:void initLiveData$lambda-6(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftSendModel):351:354 -> M
     2:5:void lambda$z3BjxaWQGXYte-NI1FaMlPRokew(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftSendModel):0 -> M
-    6:6:com.swago.baseswago.dialog.PayDialog com.swago.baseswago.dialog.PayDialog$Companion.newInstance():44:44 -> M
-    6:6:void initLiveData$lambda-6(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftSendModel):355 -> M
+    6:6:void <init>():44:44 -> M
+    6:6:com.swago.baseswago.dialog.PayDialog com.swago.baseswago.dialog.PayDialog$Companion.newInstance():44 -> M
+    6:6:void initLiveData$lambda-6(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftSendModel):357 -> M
     6:6:void lambda$z3BjxaWQGXYte-NI1FaMlPRokew(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftSendModel):0 -> M
-    7:7:com.google.gson.Gson getGson():45:45 -> M
-    7:7:com.swago.baseswago.dialog.PayDialog com.swago.baseswago.dialog.PayDialog$Companion.newInstance():45 -> M
-    7:7:void initLiveData$lambda-6(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftSendModel):355 -> M
+    7:7:com.swago.baseswago.dialog.PayDialog com.swago.baseswago.dialog.PayDialog$Companion.newInstance():45:45 -> M
+    7:7:void initLiveData$lambda-6(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftSendModel):357 -> M
     7:7:void lambda$z3BjxaWQGXYte-NI1FaMlPRokew(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftSendModel):0 -> M
-    8:8:com.swago.baseswago.dialog.PayDialog com.swago.baseswago.dialog.PayDialog$Companion.newInstance():46:46 -> M
-    8:8:void initLiveData$lambda-6(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftSendModel):355 -> M
+    8:8:com.google.gson.Gson getGson():46:46 -> M
+    8:8:com.swago.baseswago.dialog.PayDialog com.swago.baseswago.dialog.PayDialog$Companion.newInstance():46 -> M
+    8:8:void initLiveData$lambda-6(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftSendModel):357 -> M
     8:8:void lambda$z3BjxaWQGXYte-NI1FaMlPRokew(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftSendModel):0 -> M
-    9:10:void initLiveData$lambda-6(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftSendModel):356:357 -> M
+    9:10:void initLiveData$lambda-6(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftSendModel):358:359 -> M
     9:10:void lambda$z3BjxaWQGXYte-NI1FaMlPRokew(com.swago.room.gift.GiftDialog,com.swago.baseswago.model.live.gift.GiftSendModel):0 -> M
-    1:5:com.swago.room.gift.GiftDialog com.swago.room.gift.GiftDialog$Companion.newInstance(java.lang.String,java.lang.String):78:82 -> N
-    1:8:void sendGift(com.swago.baseswago.model.live.gift.GiftModel,int,int):298:305 -> O
+    1:5:com.swago.room.gift.GiftDialog com.swago.room.gift.GiftDialog$Companion.newInstance(java.lang.String,java.lang.String):79:83 -> N
+    1:8:void sendGift(com.swago.baseswago.model.live.gift.GiftModel,int,int):300:307 -> O
     9:9:void com.swago.room.gift.GiftVm.sendGift(java.lang.String,java.lang.String,int,java.lang.String,int,int):0:0 -> O
-    9:9:void sendGift(com.swago.baseswago.model.live.gift.GiftModel,int,int):301 -> O
-    10:10:void <init>():49:49 -> O
-    10:10:void com.swago.room.gift.GiftVm.sendGift(java.lang.String,java.lang.String,int,java.lang.String,int,int):49 -> O
-    10:10:void sendGift(com.swago.baseswago.model.live.gift.GiftModel,int,int):301 -> O
-    1:1:void initLiveData():314:314 -> z
-    2:2:void initLiveData():347:347 -> z
+    9:9:void sendGift(com.swago.baseswago.model.live.gift.GiftModel,int,int):303 -> O
+    10:10:void <init>():50:50 -> O
+    10:10:void com.swago.room.gift.GiftVm.sendGift(java.lang.String,java.lang.String,int,java.lang.String,int,int):50 -> O
+    10:10:void sendGift(com.swago.baseswago.model.live.gift.GiftModel,int,int):303 -> O
+    1:1:void initLiveData():316:316 -> z
+    2:2:void initLiveData():349:349 -> z
 com.swago.room.gift.GiftDialog$gson$2 -> com.swago.room.gift.GiftDialog$a:
 # {"id":"sourceFile","fileName":"GiftDialog.kt"}
     com.swago.room.gift.GiftDialog$gson$2 INSTANCE -> n
-    1:1:com.google.gson.Gson invoke():46:46 -> invoke
-    1:1:java.lang.Object invoke():45 -> invoke
+    1:1:com.google.gson.Gson invoke():47:47 -> invoke
+    1:1:java.lang.Object invoke():46 -> invoke
 com.swago.room.gift.GiftDialog$initOther$1$2 -> com.swago.room.gift.GiftDialog$b:
 # {"id":"sourceFile","fileName":"GiftDialog.kt"}
     com.swago.room.gift.GiftDialog this$0 -> n
-    1:3:void invoke():142:144 -> invoke
-    1:3:java.lang.Object invoke():141 -> invoke
-    4:4:java.lang.Object invoke():141:141 -> invoke
+    1:3:void invoke():143:145 -> invoke
+    1:3:java.lang.Object invoke():142 -> invoke
+    4:4:java.lang.Object invoke():142:142 -> invoke
 com.swago.room.gift.GiftDialog$initOther$1$3 -> com.swago.room.gift.GiftDialog$c:
 # {"id":"sourceFile","fileName":"GiftDialog.kt"}
     com.swago.room.gift.GiftDialog this$0 -> n
-    1:3:void invoke():147:149 -> invoke
-    1:3:java.lang.Object invoke():146 -> invoke
-    4:4:java.lang.Object invoke():146:146 -> invoke
+    1:3:void invoke():148:150 -> invoke
+    1:3:java.lang.Object invoke():147 -> invoke
+    4:4:java.lang.Object invoke():147:147 -> invoke
 com.swago.room.gift.GiftDialog$initOther$1$4 -> com.swago.room.gift.GiftDialog$d:
 # {"id":"sourceFile","fileName":"GiftDialog.kt"}
     com.swago.room.gift.GiftDialog this$0 -> n
-    1:3:void invoke():152:154 -> invoke
-    1:3:java.lang.Object invoke():151 -> invoke
-    4:4:java.lang.Object invoke():151:151 -> invoke
+    1:3:void invoke():153:155 -> invoke
+    1:3:java.lang.Object invoke():152 -> invoke
+    4:4:java.lang.Object invoke():152:152 -> invoke
 com.swago.room.gift.GiftDialog$initOther$1$5 -> com.swago.room.gift.GiftDialog$e:
 # {"id":"sourceFile","fileName":"GiftDialog.kt"}
     com.swago.room.gift.GiftDialog this$0 -> b
-    1:1:void <init>(com.swago.room.gift.GiftDialog):162:162 -> <init>
-    1:1:int getCount():164:164 -> a
-    1:7:net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerIndicator getIndicator(android.content.Context):182:188 -> b
-    1:8:net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerTitleView getTitleView(android.content.Context,int):168:175 -> c
+    1:1:void <init>(com.swago.room.gift.GiftDialog):163:163 -> <init>
+    1:1:int getCount():165:165 -> a
+    1:7:net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerIndicator getIndicator(android.content.Context):184:190 -> b
+    1:9:net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerTitleView getTitleView(android.content.Context,int):169:177 -> c
 com.swago.room.gift.GiftDialog$initOther$1$6 -> com.swago.room.gift.GiftDialog$initOther$1$6:
 # {"id":"sourceFile","fileName":"GiftDialog.kt"}
     com.swago.room.gift.GiftDialog this$0 -> a
-    1:1:void <init>(com.swago.room.gift.GiftDialog):198:198 -> <init>
-    1:2:void onPageSelected(int):209:210 -> onPageSelected
+    1:1:void <init>(com.swago.room.gift.GiftDialog):200:200 -> <init>
+    1:2:void onPageSelected(int):211:212 -> onPageSelected
 com.swago.room.gift.GiftDialog$initOther$1$7 -> com.swago.room.gift.GiftDialog$f:
 # {"id":"sourceFile","fileName":"GiftDialog.kt"}
     com.swago.room.gift.GiftDialog this$0 -> n
-    1:1:void <init>(com.swago.room.gift.GiftDialog):214:214 -> <init>
-    1:3:void onClick():216:218 -> onClick
+    1:1:void <init>(com.swago.room.gift.GiftDialog):216:216 -> <init>
+    1:3:void onClick():218:220 -> onClick
 com.swago.room.gift.GiftDialog$initOther$1$8 -> com.swago.room.gift.GiftDialog$g:
 # {"id":"sourceFile","fileName":"GiftDialog.kt"}
     com.swago.room.gift.GiftDialog this$0 -> a
-    1:1:void <init>(com.swago.room.gift.GiftDialog):234:234 -> <init>
-    1:3:void click():237:239 -> a
-    1:2:void countFinish():244:245 -> b
+    1:1:void <init>(com.swago.room.gift.GiftDialog):236:236 -> <init>
+    1:3:void click():239:241 -> a
+    1:2:void countFinish():246:247 -> b
 com.swago.room.gift.GiftDialog$initOther$1$list$1 -> com.swago.room.gift.GiftDialog$h:
 # {"id":"sourceFile","fileName":"GiftDialog.kt"}
-    1:1:void <init>():98:98 -> <init>
+    1:1:void <init>():99:99 -> <init>
 com.swago.room.gift.GiftDialog$special$$inlined$viewModels$default$1 -> com.swago.room.gift.GiftDialog$i:
 # {"id":"sourceFile","fileName":"FragmentViewModelLazy.kt"}
     androidx.fragment.app.Fragment $this_viewModels -> n
@@ -164238,17 +164247,17 @@ com.swago.room.gift.GiftVm -> com.swago.room.gift.GiftVm:
 # {"id":"sourceFile","fileName":"GiftVm.kt"}
     kotlin.Lazy sendResultLiveData$delegate -> b
     kotlin.Lazy allGiftLiveData$delegate -> a
-    1:1:void <init>(android.app.Application):17:17 -> <init>
-    2:2:void <init>(android.app.Application):19:19 -> <init>
-    3:3:void <init>(android.app.Application):37:37 -> <init>
-    1:1:androidx.lifecycle.MutableLiveData getAllGiftLiveData():19:19 -> a
-    1:1:void getGiftList():27:27 -> b
-    1:1:androidx.lifecycle.MutableLiveData getSendResultLiveData():37:37 -> c
+    1:1:void <init>(android.app.Application):18:18 -> <init>
+    2:2:void <init>(android.app.Application):20:20 -> <init>
+    3:3:void <init>(android.app.Application):38:38 -> <init>
+    1:1:androidx.lifecycle.MutableLiveData getAllGiftLiveData():20:20 -> a
+    1:1:void getGiftList():28:28 -> b
+    1:1:androidx.lifecycle.MutableLiveData getSendResultLiveData():38:38 -> c
 com.swago.room.gift.GiftVm$allGiftLiveData$2 -> com.swago.room.gift.GiftVm$a:
 # {"id":"sourceFile","fileName":"GiftVm.kt"}
     com.swago.room.gift.GiftVm$allGiftLiveData$2 INSTANCE -> n
-    1:1:androidx.lifecycle.MutableLiveData invoke():20:20 -> invoke
-    1:1:java.lang.Object invoke():19 -> invoke
+    1:1:androidx.lifecycle.MutableLiveData invoke():21:21 -> invoke
+    1:1:java.lang.Object invoke():20 -> invoke
 com.swago.room.gift.GiftVm$getGiftList$1 -> com.swago.room.gift.GiftVm$b:
 # {"id":"sourceFile","fileName":"GiftVm.kt"}
     int label -> n
@@ -164258,10 +164267,10 @@ com.swago.room.gift.GiftVm$getGiftList$1 -> com.swago.room.gift.GiftVm$b:
     1:1:java.lang.Object invoke(java.lang.Object,java.lang.Object):0 -> invoke
     2:2:java.lang.Object invoke(kotlinx.coroutines.CoroutineScope,kotlin.coroutines.Continuation):0:0 -> invoke
     2:2:java.lang.Object invoke(java.lang.Object,java.lang.Object):0 -> invoke
-    1:1:java.lang.Object invokeSuspend(java.lang.Object):27:27 -> invokeSuspend
-    2:2:java.lang.Object invokeSuspend(java.lang.Object):30:30 -> invokeSuspend
-    3:5:java.lang.Object invokeSuspend(java.lang.Object):27:27 -> invokeSuspend
-    6:7:java.lang.Object invokeSuspend(java.lang.Object):29:30 -> invokeSuspend
+    1:1:java.lang.Object invokeSuspend(java.lang.Object):28:28 -> invokeSuspend
+    2:2:java.lang.Object invokeSuspend(java.lang.Object):31:31 -> invokeSuspend
+    3:5:java.lang.Object invokeSuspend(java.lang.Object):28:28 -> invokeSuspend
+    6:7:java.lang.Object invokeSuspend(java.lang.Object):30:31 -> invokeSuspend
 com.swago.room.gift.GiftVm$sendGift$1 -> com.swago.room.gift.l:
 # {"id":"sourceFile","fileName":"GiftVm.kt"}
     java.lang.String $gift_id -> o
@@ -164271,14 +164280,14 @@ com.swago.room.gift.GiftVm$sendGift$1 -> com.swago.room.gift.l:
     int $gift_num -> s
     com.swago.room.gift.GiftVm this$0 -> t
     int $gift_batch -> p
-    1:1:java.lang.Object invoke(java.lang.Object):49:49 -> invoke
+    1:1:java.lang.Object invoke(java.lang.Object):50:50 -> invoke
     2:2:void invoke(com.swago.baseswago.util.BaseViewModel$CoroutineScopeX):0:0 -> invoke
-    2:2:java.lang.Object invoke(java.lang.Object):49 -> invoke
-    3:3:void invoke(com.swago.baseswago.util.BaseViewModel$CoroutineScopeX):50:50 -> invoke
-    3:3:java.lang.Object invoke(java.lang.Object):49 -> invoke
-    4:4:void invoke(com.swago.baseswago.util.BaseViewModel$CoroutineScopeX):55:55 -> invoke
-    4:4:java.lang.Object invoke(java.lang.Object):49 -> invoke
-    5:5:java.lang.Object invoke(java.lang.Object):49:49 -> invoke
+    2:2:java.lang.Object invoke(java.lang.Object):50 -> invoke
+    3:3:void invoke(com.swago.baseswago.util.BaseViewModel$CoroutineScopeX):51:51 -> invoke
+    3:3:java.lang.Object invoke(java.lang.Object):50 -> invoke
+    4:4:void invoke(com.swago.baseswago.util.BaseViewModel$CoroutineScopeX):61:61 -> invoke
+    4:4:java.lang.Object invoke(java.lang.Object):50 -> invoke
+    5:5:java.lang.Object invoke(java.lang.Object):50:50 -> invoke
 com.swago.room.gift.GiftVm$sendGift$1$1 -> com.swago.room.gift.j:
 # {"id":"sourceFile","fileName":"GiftVm.kt"}
     int label -> n
@@ -164291,24 +164300,25 @@ com.swago.room.gift.GiftVm$sendGift$1$1 -> com.swago.room.gift.j:
     int $gift_batch -> q
     1:1:java.lang.Object invoke(kotlinx.coroutines.CoroutineScope,kotlin.coroutines.Continuation):0:0 -> invoke
     1:1:java.lang.Object invoke(java.lang.Object,java.lang.Object):0 -> invoke
-    1:1:java.lang.Object invokeSuspend(java.lang.Object):50:50 -> invokeSuspend
-    2:2:java.lang.Object invokeSuspend(java.lang.Object):53:53 -> invokeSuspend
-    3:5:java.lang.Object invokeSuspend(java.lang.Object):50:50 -> invokeSuspend
-    6:7:java.lang.Object invokeSuspend(java.lang.Object):52:53 -> invokeSuspend
+    1:1:java.lang.Object invokeSuspend(java.lang.Object):51:51 -> invokeSuspend
+    2:2:java.lang.Object invokeSuspend(java.lang.Object):59:59 -> invokeSuspend
+    3:5:java.lang.Object invokeSuspend(java.lang.Object):51:51 -> invokeSuspend
+    6:9:java.lang.Object invokeSuspend(java.lang.Object):53:56 -> invokeSuspend
+    10:10:java.lang.Object invokeSuspend(java.lang.Object):59:59 -> invokeSuspend
 com.swago.room.gift.GiftVm$sendGift$1$2 -> com.swago.room.gift.k:
 # {"id":"sourceFile","fileName":"GiftVm.kt"}
     com.swago.room.gift.GiftVm this$0 -> n
-    1:1:java.lang.Object invoke(java.lang.Object):55:55 -> invoke
+    1:1:java.lang.Object invoke(java.lang.Object):61:61 -> invoke
     2:2:void invoke(java.lang.Exception):0:0 -> invoke
-    2:2:java.lang.Object invoke(java.lang.Object):55 -> invoke
-    3:6:void invoke(java.lang.Exception):56:59 -> invoke
-    3:6:java.lang.Object invoke(java.lang.Object):55 -> invoke
-    7:7:java.lang.Object invoke(java.lang.Object):55:55 -> invoke
+    2:2:java.lang.Object invoke(java.lang.Object):61 -> invoke
+    3:6:void invoke(java.lang.Exception):62:65 -> invoke
+    3:6:java.lang.Object invoke(java.lang.Object):61 -> invoke
+    7:7:java.lang.Object invoke(java.lang.Object):61:61 -> invoke
 com.swago.room.gift.GiftVm$sendResultLiveData$2 -> com.swago.room.gift.GiftVm$c:
 # {"id":"sourceFile","fileName":"GiftVm.kt"}
     com.swago.room.gift.GiftVm$sendResultLiveData$2 INSTANCE -> n
-    1:1:androidx.lifecycle.MutableLiveData invoke():38:38 -> invoke
-    1:1:java.lang.Object invoke():37 -> invoke
+    1:1:androidx.lifecycle.MutableLiveData invoke():39:39 -> invoke
+    1:1:java.lang.Object invoke():38 -> invoke
 com.swago.room.gift.HorizontalPagerSnapHelper -> com.swago.room.gift.HorizontalPagerSnapHelper:
     androidx.recyclerview.widget.OrientationHelper mVerticalHelper -> a
     androidx.recyclerview.widget.RecyclerView mRecyclerView -> c
@@ -165381,126 +165391,136 @@ com.swago.room.vm.MsgVm -> com.swago.room.vm.MsgVm:
     kotlin.jvm.functions.Function1 inComeChange -> r
     kotlin.jvm.functions.Function1 anchorRoomClosed -> q
     kotlin.jvm.functions.Function1 updateHotValue -> s
-    1:1:void <init>(android.app.Application):33:33 -> <init>
-    1:1:void setReady(boolean):35:35 -> A
-    1:1:void setShowGiftDanDao(kotlin.jvm.functions.Function1):64:64 -> B
-    1:1:void setUpdateHotValue(kotlin.jvm.functions.Function1):43:43 -> C
-    1:1:void setUpdateUserRoom(kotlin.jvm.functions.Function2):49:49 -> D
-    1:1:void setWaftFun(kotlin.jvm.functions.Function1):59:59 -> E
-    1:1:void receiveMsg():67:67 -> c
-    2:2:void receiveMsg():75:75 -> c
-    3:3:void receiveMsg():88:88 -> c
-    4:4:void receiveMsg():100:100 -> c
-    5:5:void receiveMsg():107:107 -> c
-    6:6:void receiveMsg():120:120 -> c
-    7:7:void receiveMsg():134:134 -> c
-    8:8:void receiveMsg():146:146 -> c
-    9:9:void receiveMsg():158:158 -> c
+    1:1:void <init>(android.app.Application):31:31 -> <init>
+    1:1:void setReady(boolean):33:33 -> A
+    1:1:void setShowGiftDanDao(kotlin.jvm.functions.Function1):62:62 -> B
+    1:1:void setUpdateHotValue(kotlin.jvm.functions.Function1):41:41 -> C
+    1:1:void setUpdateUserRoom(kotlin.jvm.functions.Function2):47:47 -> D
+    1:1:void setWaftFun(kotlin.jvm.functions.Function1):57:57 -> E
+    1:1:void receiveMsg():65:65 -> c
+    2:2:void receiveMsg():73:73 -> c
+    3:3:void receiveMsg():86:86 -> c
+    4:4:void receiveMsg():98:98 -> c
+    5:5:void receiveMsg():105:105 -> c
+    6:6:void receiveMsg():118:118 -> c
+    7:7:void receiveMsg():131:131 -> c
+    8:8:void receiveMsg():144:144 -> c
+    9:9:void receiveMsg():156:156 -> c
+    10:10:void receiveMsg():168:168 -> c
     void leaveRoom(com.swago.baseswago.baseroom.IRoomInfo) -> d
     void endRoom(com.swago.baseswago.baseroom.IRoomInfo) -> e
-    1:1:kotlin.jvm.functions.Function1 getAnchorRoomClosed():39:39 -> f
-    1:1:kotlin.jvm.functions.Function1 getForbidSpeakOrCancel():47:47 -> g
-    1:1:kotlin.jvm.functions.Function1 getInComeChange():41:41 -> h
-    1:1:kotlin.jvm.functions.Function0 getKickFromRoom():45:45 -> i
-    1:1:kotlin.jvm.functions.Function1 getNewChatMsgFun():37:37 -> j
-    1:1:kotlin.jvm.functions.Function1 getPlaySvgUrl():54:54 -> k
-    1:1:kotlin.jvm.functions.Function1 getShowGiftDanDao():64:64 -> l
-    1:1:kotlin.jvm.functions.Function1 getUpdateHotValue():43:43 -> n
-    1:1:kotlin.jvm.functions.Function2 getUpdateUserRoom():49:49 -> o
+    1:1:kotlin.jvm.functions.Function1 getAnchorRoomClosed():37:37 -> f
+    1:1:kotlin.jvm.functions.Function1 getForbidSpeakOrCancel():45:45 -> g
+    1:1:kotlin.jvm.functions.Function1 getInComeChange():39:39 -> h
+    1:1:kotlin.jvm.functions.Function0 getKickFromRoom():43:43 -> i
+    1:1:kotlin.jvm.functions.Function1 getNewChatMsgFun():35:35 -> j
+    1:1:kotlin.jvm.functions.Function1 getPlaySvgUrl():52:52 -> k
+    1:1:kotlin.jvm.functions.Function1 getShowGiftDanDao():62:62 -> l
+    1:1:kotlin.jvm.functions.Function1 getUpdateHotValue():41:41 -> n
+    1:1:kotlin.jvm.functions.Function2 getUpdateUserRoom():47:47 -> o
     void closeRoomed() -> p
     void joinedRoom(com.swago.baseswago.baseroom.IRoomInfo) -> q
     void changeRoom(com.swago.baseswago.baseroom.IRoomInfo) -> r
-    1:1:kotlin.jvm.functions.Function1 getWaftFun():59:59 -> s
-    1:1:boolean isReady():35:35 -> t
-    1:1:void setAnchorRoomClosed(kotlin.jvm.functions.Function1):39:39 -> u
-    1:1:void setForbidSpeakOrCancel(kotlin.jvm.functions.Function1):47:47 -> v
-    1:1:void setInComeChange(kotlin.jvm.functions.Function1):41:41 -> w
-    1:1:void setKickFromRoom(kotlin.jvm.functions.Function0):45:45 -> x
-    1:1:void setNewChatMsgFun(kotlin.jvm.functions.Function1):37:37 -> y
-    1:1:void setPlaySvgUrl(kotlin.jvm.functions.Function1):54:54 -> z
-com.swago.room.vm.MsgVm$receiveMsg$1 -> com.swago.room.vm.MsgVm$a:
+    1:1:kotlin.jvm.functions.Function1 getWaftFun():57:57 -> s
+    1:1:boolean isReady():33:33 -> t
+    1:1:void setAnchorRoomClosed(kotlin.jvm.functions.Function1):37:37 -> u
+    1:1:void setForbidSpeakOrCancel(kotlin.jvm.functions.Function1):45:45 -> v
+    1:1:void setInComeChange(kotlin.jvm.functions.Function1):39:39 -> w
+    1:1:void setKickFromRoom(kotlin.jvm.functions.Function0):43:43 -> x
+    1:1:void setNewChatMsgFun(kotlin.jvm.functions.Function1):35:35 -> y
+    1:1:void setPlaySvgUrl(kotlin.jvm.functions.Function1):52:52 -> z
+com.swago.room.vm.MsgVm$receiveMsg$1 -> com.swago.room.vm.MsgVm$b:
 # {"id":"sourceFile","fileName":"MsgVm.kt"}
     com.swago.room.vm.MsgVm this$0 -> n
-    1:1:java.lang.Object invoke(java.lang.Object):67:67 -> invoke
+    1:1:java.lang.Object invoke(java.lang.Object):65:65 -> invoke
     2:2:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):0:0 -> invoke
-    2:2:java.lang.Object invoke(java.lang.Object):67 -> invoke
-    3:5:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):68:70 -> invoke
-    3:5:java.lang.Object invoke(java.lang.Object):67 -> invoke
-    6:6:java.lang.Object invoke(java.lang.Object):67:67 -> invoke
-com.swago.room.vm.MsgVm$receiveMsg$2 -> com.swago.room.vm.MsgVm$b:
+    2:2:java.lang.Object invoke(java.lang.Object):65 -> invoke
+    3:5:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):66:68 -> invoke
+    3:5:java.lang.Object invoke(java.lang.Object):65 -> invoke
+    6:6:java.lang.Object invoke(java.lang.Object):65:65 -> invoke
+com.swago.room.vm.MsgVm$receiveMsg$10 -> com.swago.room.vm.MsgVm$a:
 # {"id":"sourceFile","fileName":"MsgVm.kt"}
     com.swago.room.vm.MsgVm this$0 -> n
-    1:1:java.lang.Object invoke(java.lang.Object):75:75 -> invoke
+    1:1:java.lang.Object invoke(java.lang.Object):168:168 -> invoke
     2:2:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):0:0 -> invoke
-    2:2:java.lang.Object invoke(java.lang.Object):75 -> invoke
-    3:8:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):76:81 -> invoke
-    3:8:java.lang.Object invoke(java.lang.Object):75 -> invoke
-    9:9:java.lang.Object invoke(java.lang.Object):75:75 -> invoke
-com.swago.room.vm.MsgVm$receiveMsg$3 -> com.swago.room.vm.MsgVm$c:
+    2:2:java.lang.Object invoke(java.lang.Object):168 -> invoke
+    3:7:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):169:173 -> invoke
+    3:7:java.lang.Object invoke(java.lang.Object):168 -> invoke
+    8:8:java.lang.Object invoke(java.lang.Object):168:168 -> invoke
+com.swago.room.vm.MsgVm$receiveMsg$2 -> com.swago.room.vm.MsgVm$c:
 # {"id":"sourceFile","fileName":"MsgVm.kt"}
     com.swago.room.vm.MsgVm this$0 -> n
-    1:1:java.lang.Object invoke(java.lang.Object):88:88 -> invoke
+    1:1:java.lang.Object invoke(java.lang.Object):73:73 -> invoke
     2:2:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):0:0 -> invoke
-    2:2:java.lang.Object invoke(java.lang.Object):88 -> invoke
-    3:7:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):89:93 -> invoke
-    3:7:java.lang.Object invoke(java.lang.Object):88 -> invoke
-    8:8:java.lang.Object invoke(java.lang.Object):88:88 -> invoke
-com.swago.room.vm.MsgVm$receiveMsg$4 -> com.swago.room.vm.MsgVm$d:
+    2:2:java.lang.Object invoke(java.lang.Object):73 -> invoke
+    3:8:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):74:79 -> invoke
+    3:8:java.lang.Object invoke(java.lang.Object):73 -> invoke
+    9:9:java.lang.Object invoke(java.lang.Object):73:73 -> invoke
+com.swago.room.vm.MsgVm$receiveMsg$3 -> com.swago.room.vm.MsgVm$d:
 # {"id":"sourceFile","fileName":"MsgVm.kt"}
     com.swago.room.vm.MsgVm this$0 -> n
-    1:1:java.lang.Object invoke(java.lang.Object):100:100 -> invoke
+    1:1:java.lang.Object invoke(java.lang.Object):86:86 -> invoke
     2:2:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):0:0 -> invoke
-    2:2:java.lang.Object invoke(java.lang.Object):100 -> invoke
-    3:5:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):101:103 -> invoke
-    3:5:java.lang.Object invoke(java.lang.Object):100 -> invoke
-    6:6:java.lang.Object invoke(java.lang.Object):100:100 -> invoke
-com.swago.room.vm.MsgVm$receiveMsg$5 -> com.swago.room.vm.MsgVm$e:
+    2:2:java.lang.Object invoke(java.lang.Object):86 -> invoke
+    3:7:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):87:91 -> invoke
+    3:7:java.lang.Object invoke(java.lang.Object):86 -> invoke
+    8:8:java.lang.Object invoke(java.lang.Object):86:86 -> invoke
+com.swago.room.vm.MsgVm$receiveMsg$4 -> com.swago.room.vm.MsgVm$e:
 # {"id":"sourceFile","fileName":"MsgVm.kt"}
     com.swago.room.vm.MsgVm this$0 -> n
-    1:1:java.lang.Object invoke(java.lang.Object):107:107 -> invoke
+    1:1:java.lang.Object invoke(java.lang.Object):98:98 -> invoke
     2:2:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):0:0 -> invoke
-    2:2:java.lang.Object invoke(java.lang.Object):107 -> invoke
-    3:8:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):108:113 -> invoke
-    3:8:java.lang.Object invoke(java.lang.Object):107 -> invoke
-    9:9:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):115:115 -> invoke
-    9:9:java.lang.Object invoke(java.lang.Object):107 -> invoke
-    10:10:java.lang.Object invoke(java.lang.Object):107:107 -> invoke
-com.swago.room.vm.MsgVm$receiveMsg$6 -> com.swago.room.vm.MsgVm$f:
+    2:2:java.lang.Object invoke(java.lang.Object):98 -> invoke
+    3:5:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):99:101 -> invoke
+    3:5:java.lang.Object invoke(java.lang.Object):98 -> invoke
+    6:6:java.lang.Object invoke(java.lang.Object):98:98 -> invoke
+com.swago.room.vm.MsgVm$receiveMsg$5 -> com.swago.room.vm.MsgVm$f:
 # {"id":"sourceFile","fileName":"MsgVm.kt"}
     com.swago.room.vm.MsgVm this$0 -> n
-    1:1:java.lang.Object invoke(java.lang.Object):120:120 -> invoke
+    1:1:java.lang.Object invoke(java.lang.Object):105:105 -> invoke
     2:2:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):0:0 -> invoke
-    2:2:java.lang.Object invoke(java.lang.Object):120 -> invoke
-    3:8:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):121:126 -> invoke
-    3:8:java.lang.Object invoke(java.lang.Object):120 -> invoke
-    9:9:java.lang.Object invoke(java.lang.Object):120:120 -> invoke
-com.swago.room.vm.MsgVm$receiveMsg$7 -> com.swago.room.vm.MsgVm$g:
+    2:2:java.lang.Object invoke(java.lang.Object):105 -> invoke
+    3:8:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):106:111 -> invoke
+    3:8:java.lang.Object invoke(java.lang.Object):105 -> invoke
+    9:9:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):113:113 -> invoke
+    9:9:java.lang.Object invoke(java.lang.Object):105 -> invoke
+    10:10:java.lang.Object invoke(java.lang.Object):105:105 -> invoke
+com.swago.room.vm.MsgVm$receiveMsg$6 -> com.swago.room.vm.MsgVm$g:
+# {"id":"sourceFile","fileName":"MsgVm.kt"}
+    com.swago.room.vm.MsgVm this$0 -> n
+    1:1:java.lang.Object invoke(java.lang.Object):118:118 -> invoke
+    2:2:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):0:0 -> invoke
+    2:2:java.lang.Object invoke(java.lang.Object):118 -> invoke
+    3:8:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):119:124 -> invoke
+    3:8:java.lang.Object invoke(java.lang.Object):118 -> invoke
+    9:9:java.lang.Object invoke(java.lang.Object):118:118 -> invoke
+com.swago.room.vm.MsgVm$receiveMsg$7 -> com.swago.room.vm.MsgVm$h:
 # {"id":"sourceFile","fileName":"MsgVm.kt"}
     com.swago.room.vm.MsgVm this$0 -> n
-    1:1:java.lang.Object invoke(java.lang.Object):134:134 -> invoke
+    1:1:java.lang.Object invoke(java.lang.Object):131:131 -> invoke
     2:2:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):0:0 -> invoke
-    2:2:java.lang.Object invoke(java.lang.Object):134 -> invoke
-    3:7:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):135:139 -> invoke
-    3:7:java.lang.Object invoke(java.lang.Object):134 -> invoke
-    8:8:java.lang.Object invoke(java.lang.Object):134:134 -> invoke
-com.swago.room.vm.MsgVm$receiveMsg$8 -> com.swago.room.vm.MsgVm$h:
+    2:2:java.lang.Object invoke(java.lang.Object):131 -> invoke
+    3:7:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):132:136 -> invoke
+    3:7:java.lang.Object invoke(java.lang.Object):131 -> invoke
+    8:8:java.lang.Object invoke(java.lang.Object):131:131 -> invoke
+com.swago.room.vm.MsgVm$receiveMsg$8 -> com.swago.room.vm.MsgVm$i:
 # {"id":"sourceFile","fileName":"MsgVm.kt"}
     com.swago.room.vm.MsgVm this$0 -> n
-    1:1:java.lang.Object invoke(java.lang.Object):146:146 -> invoke
+    1:1:java.lang.Object invoke(java.lang.Object):144:144 -> invoke
     2:2:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):0:0 -> invoke
-    2:2:java.lang.Object invoke(java.lang.Object):146 -> invoke
-    3:7:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):147:151 -> invoke
-    3:7:java.lang.Object invoke(java.lang.Object):146 -> invoke
-    8:8:java.lang.Object invoke(java.lang.Object):146:146 -> invoke
-com.swago.room.vm.MsgVm$receiveMsg$9 -> com.swago.room.vm.MsgVm$i:
+    2:2:java.lang.Object invoke(java.lang.Object):144 -> invoke
+    3:7:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):145:149 -> invoke
+    3:7:java.lang.Object invoke(java.lang.Object):144 -> invoke
+    8:8:java.lang.Object invoke(java.lang.Object):144:144 -> invoke
+com.swago.room.vm.MsgVm$receiveMsg$9 -> com.swago.room.vm.MsgVm$j:
 # {"id":"sourceFile","fileName":"MsgVm.kt"}
     com.swago.room.vm.MsgVm this$0 -> n
-    1:1:java.lang.Object invoke(java.lang.Object):158:158 -> invoke
+    1:1:java.lang.Object invoke(java.lang.Object):156:156 -> invoke
     2:2:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):0:0 -> invoke
-    2:2:java.lang.Object invoke(java.lang.Object):158 -> invoke
-    3:7:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):159:163 -> invoke
-    3:7:java.lang.Object invoke(java.lang.Object):158 -> invoke
-    8:8:java.lang.Object invoke(java.lang.Object):158:158 -> invoke
+    2:2:java.lang.Object invoke(java.lang.Object):156 -> invoke
+    3:7:void invoke(com.swago.baseswago.model.im.CusNewMsgBean):157:161 -> invoke
+    3:7:java.lang.Object invoke(java.lang.Object):156 -> invoke
+    8:8:java.lang.Object invoke(java.lang.Object):156:156 -> invoke
 com.swago.room.vm.RoomOtherVm -> com.swago.room.vm.RoomOtherVm:
 # {"id":"sourceFile","fileName":"RoomOtherVm.kt"}
     kotlin.Lazy gameListModelLiveData$delegate -> b

app/release/output-metadata.json

@@ -10,9 +10,9 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 106,
-      "versionName": "1.0.6",
-      "outputFile": "com.swago.app-release-1.0.6.apk"
+      "versionCode": 1070,
+      "versionName": "1.0.7.0",
+      "outputFile": "com.swago.app-release-1.0.7.0.apk"
     }
   ]
 }

baseswago/src/main/java/com/swago/baseswago/GradientIndicator.java

@@ -61,7 +61,7 @@ public class GradientIndicator extends View implements IPagerIndicator {
 
     @Override
     protected void onDraw(Canvas canvas) {
-        LinearGradient lg = new LinearGradient(mLineRect.left,mLineRect.top,mLineRect.right,mLineRect.bottom, Color.parseColor("#9FFD88"),Color.parseColor("#6EF2DF"), Shader.TileMode.CLAMP);
+        LinearGradient lg = new LinearGradient(mLineRect.left,mLineRect.top,mLineRect.right,mLineRect.bottom, Color.parseColor("#ff56b7"),Color.parseColor("#ff56b7"), Shader.TileMode.CLAMP);
         mPaint.setShader(lg);
         canvas.drawRoundRect(mLineRect, mRoundRadius, mRoundRadius, mPaint);
     }

baseswago/src/main/java/com/swago/baseswago/im/GroupMsgParser.kt

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.util.ParameterizedTypeImpl
 import com.google.gson.Gson
 import com.swago.baseswago.im.ImConstant.anchor_close_room
 import com.swago.baseswago.im.ImConstant.cancel_forbid_speak
+import com.swago.baseswago.im.ImConstant.diamond_wind_up
 import com.swago.baseswago.im.ImConstant.forbid_speak
 import com.swago.baseswago.im.ImConstant.lucky_gift
 import com.swago.baseswago.im.ImConstant.remove_room
@@ -11,10 +12,7 @@ import com.swago.baseswago.im.ImConstant.room_chat_text
 import com.swago.baseswago.im.ImConstant.svg_gift
 import com.swago.baseswago.im.ImConstant.user_exit_room
 import com.swago.baseswago.im.ImConstant.user_join_room
-import com.swago.baseswago.model.im.AnchorRoomClosedBean
-import com.swago.baseswago.model.im.CusNewMsgBean
-import com.swago.baseswago.model.im.RoomChatMsgBean
-import com.swago.baseswago.model.im.UserJoinRoomBean
+import com.swago.baseswago.model.im.*
 import com.swago.baseswago.model.live.ReceiveModel
 import com.swago.baseswago.model.live.gift.IMGiftModel
 import com.swago.baseswago.util.LogUtil
@@ -77,6 +75,15 @@ class GroupMsgParser : IGroupNewMsgParser {
                     parserModel = gson.fromJson(resultString,parameterizedTypeImpl)
                 }
 
+                diamond_wind_up -> {
+                    parameterizedTypeImpl = ParameterizedTypeImpl(
+                        arrayOf<Type>(DiamondWindupBean::class.java),
+                        CusNewMsgBean::class.java,
+                        CusNewMsgBean::class.java
+                    )
+                    parserModel = gson.fromJson(resultString,parameterizedTypeImpl)
+                }
+
                 svg_gift, lucky_gift -> {
                     parameterizedTypeImpl = ParameterizedTypeImpl(
                         arrayOf<Type>(IMGiftModel::class.java),

baseswago/src/main/java/com/swago/baseswago/im/ImConstant.kt

@@ -31,6 +31,11 @@ object ImConstant {
      */
     const val svg_gift = 201
 
+    /**
+     * 小数结算珍珠
+     */
+    const val diamond_wind_up = 203
+
     /**
      * 幸运礼物
      */

baseswago/src/main/java/com/swago/baseswago/model/im/DiamondWindupBean.java

@@ -0,0 +1,29 @@
+package com.swago.baseswago.model.im;
+
+/**
+ * @date 2022/3/18 14:08
+ * description:
+ */
+public class DiamondWindupBean {
+
+   private String roomId;
+   private String incomeCount;
+
+
+   public String getRoomId() {
+      return roomId;
+   }
+
+   public void setRoomId(String roomId) {
+      this.roomId = roomId;
+   }
+
+   public String getIncomeCount() {
+      return incomeCount;
+   }
+
+   public void setIncomeCount(String incomeCount) {
+      this.incomeCount = incomeCount;
+   }
+
+}

baseswago/src/main/res/values/colors.xml

@@ -5,10 +5,10 @@
     <color name="_ffffff">#ffffff</color>
     <color name="_868686">#868686</color>
 
-    <color name="startColor">#9ffd88</color>
-    <color name="startDownColor">#9ffd88</color>
-    <color name="endColor">#FF4A34</color>
-    <color name="arcColor">#9ffd88</color>
+    <color name="startColor">#ff56b7</color>
+    <color name="startDownColor">#ff56b7</color>
+    <color name="endColor">#ff56b7</color>
+    <color name="arcColor">#ff56b7</color>
     <color name="white">#ffffff</color>
-    <color name="scaleColor">#9ffd88</color>
+    <color name="scaleColor">#ff56b7</color>
 </resources>

room/src/main/java/com/swago/room/gift/GiftDialog.kt

@@ -2,6 +2,7 @@ package com.swago.room.gift
 
 import android.content.Context
 import android.graphics.Color
+import android.graphics.Typeface
 import android.os.Bundle
 import android.util.Log
 import android.view.Gravity
@@ -169,8 +170,9 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
                     simplePagerTitleView.text = titleList[index]
                     val padding = DpPxUtil.dip2px(15f).toFloat()
                     simplePagerTitleView.textSize = 16f
+                    simplePagerTitleView.typeface = Typeface.createFromAsset(AppContext.getContext().assets,"bold.otf")
                     simplePagerTitleView.setPadding(padding.toInt(), 0, padding.toInt(), 0)
-                    simplePagerTitleView.normalColor = Color.parseColor("#868686")
+                    simplePagerTitleView.normalColor = Color.parseColor("#828C9D")
                     simplePagerTitleView.selectedColor = Color.parseColor("#ffffff")
                     simplePagerTitleView.setOnClickListener {
                         binding.viewPager.currentItem = index

room/src/main/java/com/swago/room/gift/GiftVm.kt

@@ -9,6 +9,7 @@ import com.swago.baseswago.model.live.gift.GiftAllModel
 import com.swago.baseswago.model.live.gift.GiftSendModel
 import com.swago.baseswago.util.AppContext
 import com.swago.baseswago.util.BaseViewModel
+import com.swago.baseswago.util.UserInfo
 
 /**
  *@date 2021/12/12 17:03
@@ -50,6 +51,11 @@ class GiftVm(application: Application) : BaseViewModel(application) {
             requestData {
                 val data = ApiManager.roomApi.sendGift(room_id, gift_id, gift_batch, gift_receive_id, isCombo,gift_num)
                 sendResultLiveData.value = data
+                UserInfo.getUserInfo()?.let {
+                    if (data.user_coins.toLong() < it.user_coins.toLong()){
+                        it.user_coins = data.user_coins
+                    }
+                }
             }
 
             requestError {

room/src/main/java/com/swago/room/giftdandao/GiftDanDaoView.kt

@@ -69,11 +69,11 @@ class GiftDanDaoView : FrameLayout {
             clItemGift.removeCallbacks(showRunnable)
             clItemGift.postDelayed(showRunnable, 3000)
             
-            if (imGiftModel.multiple>500){
+            if (imGiftModel.multiple!=0){
                 clWinPrize.visibility = View.VISIBLE
                 tvWinPrize.text = AppContext.getContext().resources.getString(R.string.win_num_prize).format(imGiftModel.multiple)
                 clWinPrize.removeCallbacks(winPrizeRunnable)
-                clWinPrize.postDelayed(winPrizeRunnable, 1000)
+                clWinPrize.postDelayed(winPrizeRunnable, 1500)
             }
         }
 

room/src/main/java/com/swago/room/vm/MsgVm.kt

@@ -9,18 +9,16 @@ import com.swago.baseswago.baseroom.viewmodel.AbsMsgVm
 import com.swago.baseswago.im.IRoomChat
 import com.swago.baseswago.im.ImConstant.anchor_close_room
 import com.swago.baseswago.im.ImConstant.cancel_forbid_speak
+import com.swago.baseswago.im.ImConstant.diamond_wind_up
 import com.swago.baseswago.im.ImConstant.forbid_speak
 import com.swago.baseswago.im.ImConstant.lucky_gift
 import com.swago.baseswago.im.ImConstant.remove_room
-import com.swago.baseswago.model.im.CusNewMsgBean
-import com.swago.baseswago.model.im.RoomChatMsgBean
 import com.swago.baseswago.im.ImConstant.room_chat_text
 import com.swago.baseswago.im.ImConstant.svg_gift
 import com.swago.baseswago.im.ImConstant.user_exit_room
 import com.swago.baseswago.im.ImConstant.user_join_room
 import com.swago.baseswago.inter.ApiManager
-import com.swago.baseswago.model.im.AnchorRoomClosedBean
-import com.swago.baseswago.model.im.UserJoinRoomBean
+import com.swago.baseswago.model.im.*
 import com.swago.baseswago.model.live.ReceiveModel
 import com.swago.baseswago.model.live.gift.IMGiftModel
 import com.swago.baseswago.model.mine.RoomBlack
@@ -130,6 +128,18 @@ class MsgVm (application: Application) : AbsMsgVm(application){
             }
         }
 
+        imGroupNewMsgListener.handleMsgType<CusNewMsgBean<DiamondWindupBean>>(diamond_wind_up){
+            SwagoRoomManager.iRoomInfo?.let { iRoomInfo ->
+                if (isReady){
+                    it.data?.let {
+                        if (iRoomInfo.getRoomId()== it.roomId?:""){
+                            inComeChange?.invoke(it.incomeCount)
+                        }
+                    }
+                }
+            }
+        }
+
 
         imGroupNewMsgListener.handleMsgType<CusNewMsgBean<ReceiveModel>>(remove_room){
             SwagoRoomManager.iRoomInfo?.let { iRoomInfo ->

room/src/main/res/layout/dialog_gift.xml

@@ -59,7 +59,7 @@
         <TextView
             android:id="@+id/tvToSend"
             android:textSize="14dp"
-            android:textColor="#2E2D2B"
+            android:textColor="#fff"
             android:text="@string/send"
             android:gravity="center"
             android:visibility="gone"