6060

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>

.idea/kotlinc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.7.10" />
+  </component>
+</project>

.idea/misc.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ASMIdeaPluginConfiguration">
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
@@ -305,7 +304,7 @@
     <option name="priority" value="Medium" />
     <option name="excludeFilter" value="" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/build.gradle

@@ -15,8 +15,8 @@ android {
         applicationId "com.swago.app"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 6053
-        versionName "6.0.5.3"
+        versionCode 6060
+        versionName "6.0.6.0"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

app/src/main/AndroidManifest.xml

@@ -25,7 +25,7 @@
         android:name=".SwagoApp"
         android:allowBackup="false"
         tools:replace="android:allowBackup"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/ic_launcher_foreground"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"

baseswago/src/main/java/com/swago/baseswago/PersonDataDFragment.kt

@@ -167,6 +167,16 @@ class PersonDataDFragment : BaseXDFragment<DialogPersonDataBinding>() {
             binding.tvFollowNum.text = it.user_follow_num
             binding.tvAccount.setUserId(it.is_pretty_account==1,it.user_account)
             binding.tvLevelView.setUserLevel(it.user_wealth_level.toInt())
+
+            if (it.user_type == 1){
+                binding.swagoHostBigLevelView.visibility = View.VISIBLE
+                binding.swagoHostBigLevelView.setUserLevel(it.user_level.toInt())
+                binding.swagoUserBigLevelView.visibility = View.VISIBLE
+                binding.swagoUserBigLevelView.setUserLevel(it.user_wealth_level.toInt())
+            }else{
+                binding.swagoUserBigLevelView.visibility = View.VISIBLE
+                binding.swagoUserBigLevelView.setUserLevel(it.user_wealth_level.toInt())
+            }
             if (isFollow == 1) {
                 binding.tvFollow.text = AppContext.getContext().resources.getString(R.string.followed)
                 binding.ivFollow.setImageResource(R.mipmap.followed)

baseswago/src/main/java/com/swago/baseswago/baseroom/IRoomInfo.kt

@@ -34,4 +34,12 @@ interface IRoomInfo {
     fun getRoomType():Int
 
     fun getAudioNotice():String //语音房公告
+
+    fun getIsFans():Int//是否已经加入粉丝团
+
+    fun getFanScore():String//粉丝团亲密度
+
+    fun getFanClubLevel():Int//粉丝团等级
+
+    fun getLikeNum():String //获取点赞数
 }

baseswago/src/main/java/com/swago/baseswago/cusview/SwagoFansClubLevelView.kt

@@ -0,0 +1,72 @@
+package com.swago.baseswago.cusview
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.FrameLayout
+import com.swago.baseswago.R
+import com.swago.baseswago.databinding.ViewFansClubLevelBinding
+
+class SwagoFansClubLevelView : FrameLayout {
+    private var binding : ViewFansClubLevelBinding? = null
+    constructor(context: Context) : this(context, null)
+    constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
+
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr
+    ){
+        initView(context)
+    }
+
+    private fun initView(context: Context) {
+        binding = ViewFansClubLevelBinding.inflate(LayoutInflater.from(context),this,true)
+    }
+
+    fun setUserLevel(level:Int){
+        binding?.let {
+            if (level in 0..9){
+                it.tvLevel.text = "$level"
+            }else{
+                it.tvLevel.text = level.toString()
+            }
+            when (level) {
+                in 0..10 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_fans_club_eight)
+                }
+                in 11..15 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_fans_club_eighteen)
+                }
+                in 16..29 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_fans_club_twenty_eight)
+                }
+                in 30..38 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_fans_club_thirty_eight)
+                }
+                in 39..48 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_fans_club_forty_eight)
+                }
+                in 49..55 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_fans_club_fifty_eight)
+                }
+                in 56..65 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_fans_club_sixty_eight)
+                }
+                in 66..76 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_fans_club_seventy_eight)
+                }
+                in 77..88 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_fans_club_eighty_eight)
+                }
+                in 89..98 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_fans_club_ninety_eight)
+                }
+                else ->{
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_fans_club_one_hundred)
+                }
+            }
+        }
+    }
+
+}

baseswago/src/main/java/com/swago/baseswago/cusview/SwagoHostBigLevelView.kt

@@ -0,0 +1,73 @@
+package com.swago.baseswago.cusview
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.FrameLayout
+import com.swago.baseswago.R
+import com.swago.baseswago.databinding.ViewHostLevelBinding
+
+class SwagoHostBigLevelView: FrameLayout {
+
+    private var binding : ViewHostLevelBinding? = null
+    constructor(context: Context) : this(context, null)
+    constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
+
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr
+    ){
+        initView(context)
+    }
+
+    private fun initView(context: Context) {
+        binding = ViewHostLevelBinding.inflate(LayoutInflater.from(context),this,true)
+    }
+
+    fun setUserLevel(level:Int){
+        binding?.let {
+            if (level in 0..9){
+                it.tvLevel.text = "$level"
+            }else{
+                it.tvLevel.text = level.toString()
+            }
+            when (level) {
+                in 0..10 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_host_eight)
+                }
+                in 11..15 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_host_eighteen)
+                }
+                in 16..29 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_host_twenty_eight)
+                }
+                in 30..38 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_host_thirty_eight)
+                }
+                in 39..48 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_host_forty_eight)
+                }
+                in 49..55 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_host_fifty_eight)
+                }
+                in 56..65 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_host_sixty_eight)
+                }
+                in 66..76 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_host_seventy_eight)
+                }
+                in 77..88 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_host_eighty_eight)
+                }
+                in 89..98 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_host_ninety_eight)
+                }
+                else ->{
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_host_one_hundred)
+                }
+            }
+        }
+    }
+
+}

baseswago/src/main/java/com/swago/baseswago/cusview/SwagoHostLevelView.kt

@@ -0,0 +1,74 @@
+package com.swago.baseswago.cusview
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.FrameLayout
+import com.swago.baseswago.R
+import com.swago.baseswago.databinding.ViewSwagoLevelBinding
+
+class SwagoHostLevelView : FrameLayout {
+
+    private var binding : ViewSwagoLevelBinding? = null
+
+    constructor(context: Context) : this(context, null)
+    constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
+
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr
+    ){
+        initView(context)
+    }
+
+    private fun initView(context: Context) {
+        binding = ViewSwagoLevelBinding.inflate(LayoutInflater.from(context),this,true)
+    }
+
+    fun setUserLevel(level:Int){
+        binding?.let {
+            if (level in 0..9){
+                it.tvLevel.text = "0$level"
+            }else{
+                it.tvLevel.text = level.toString()
+            }
+            when (level) {
+                in 0..10 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.level_host_8)
+                }
+                in 11..15 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.level_host_18)
+                }
+                in 16..29 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.level_host_28)
+                }
+                in 30..38 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.level_host_38)
+                }
+                in 39..48 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.level_host_48)
+                }
+                in 49..55 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.level_host_58)
+                }
+                in 56..65 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.level_host_68)
+                }
+                in 66..76 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.level_host_78)
+                }
+                in 77..88 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.level_host_89)
+                }
+                in 89..98 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.level_host_99)
+                }
+                else ->{
+                    it.ivBg.setBackgroundResource(R.mipmap.level_host_100)
+                }
+            }
+        }
+    }
+
+}

baseswago/src/main/java/com/swago/baseswago/cusview/SwagoUserBigLevelView.kt

@@ -0,0 +1,74 @@
+package com.swago.baseswago.cusview
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.FrameLayout
+import com.swago.baseswago.R
+import com.swago.baseswago.databinding.ViewUserLevelBinding
+
+class SwagoUserBigLevelView: FrameLayout {
+
+    private var binding : ViewUserLevelBinding? = null
+
+    constructor(context: Context) : this(context, null)
+    constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
+
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr
+    ){
+        initView(context)
+    }
+
+    private fun initView(context: Context) {
+        binding = ViewUserLevelBinding.inflate(LayoutInflater.from(context),this,true)
+    }
+
+    fun setUserLevel(level:Int){
+        binding?.let {
+            if (level in 0..9){
+                it.tvLevel.text = "$level"
+            }else{
+                it.tvLevel.text = level.toString()
+            }
+            when (level) {
+                in 0..10 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_user_eight)
+                }
+                in 11..15 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_user_seventeen)
+                }
+                in 16..29 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_user_twenty_seven)
+                }
+                in 30..38 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_user_thirty_seven)
+                }
+                in 39..48 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_user_forty_seven)
+                }
+                in 49..55 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_user_fifty_seven)
+                }
+                in 56..65 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_user_sixty_seven)
+                }
+                in 66..76 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_user_seventy_seven)
+                }
+                in 77..88 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_user_eighty_seven)
+                }
+                in 89..98 -> {
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_user_ninety_seven)
+                }
+                else ->{
+                    it.ivBg.setBackgroundResource(R.mipmap.bg_user_one_hundred)
+                }
+            }
+        }
+    }
+
+}

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

@@ -23,9 +23,11 @@ import com.swago.baseswago.im.ImConstant.invite_user_on_mic
 import com.swago.baseswago.im.ImConstant.jifen_change
 import com.swago.baseswago.im.ImConstant.jifen_clear
 import com.swago.baseswago.im.ImConstant.launch_mic
+import com.swago.baseswago.im.ImConstant.level_up
 import com.swago.baseswago.im.ImConstant.lock_un_lock_mic
 import com.swago.baseswago.im.ImConstant.lucky_gift
 import com.swago.baseswago.im.ImConstant.lucky_gift_prize
+import com.swago.baseswago.im.ImConstant.modify_wish_gift
 import com.swago.baseswago.im.ImConstant.multi_jifen_change
 import com.swago.baseswago.im.ImConstant.multi_send_gift
 import com.swago.baseswago.im.ImConstant.notice_update
@@ -40,6 +42,7 @@ import com.swago.baseswago.im.ImConstant.red_envelope_broadcast
 import com.swago.baseswago.im.ImConstant.remove_room
 import com.swago.baseswago.im.ImConstant.room_chat_text
 import com.swago.baseswago.im.ImConstant.room_dan_mu
+import com.swago.baseswago.im.ImConstant.send_wish_gift
 import com.swago.baseswago.im.ImConstant.set_room_admin
 import com.swago.baseswago.im.ImConstant.svg_gift
 import com.swago.baseswago.im.ImConstant.update_audience
@@ -48,12 +51,14 @@ import com.swago.baseswago.im.ImConstant.user_agree_invite_by_anchor
 import com.swago.baseswago.im.ImConstant.user_down_mic
 import com.swago.baseswago.im.ImConstant.user_exit_room
 import com.swago.baseswago.im.ImConstant.user_join_room
+import com.swago.baseswago.im.ImConstant.user_like
 import com.swago.baseswago.im.ImConstant.user_refuse_invite_by_anchor
 import com.swago.baseswago.model.RedEnvelope
 import com.swago.baseswago.model.im.*
 import com.swago.baseswago.model.live.ForceCloseModel
 import com.swago.baseswago.model.live.ReceiveModel
 import com.swago.baseswago.model.im.GamePrize
+import com.swago.baseswago.model.live.IMWishGiftModel
 import com.swago.baseswago.model.live.RoomUserChangeModel
 import com.swago.baseswago.model.live.audio.*
 import com.swago.baseswago.model.live.gift.IMGiftModel
@@ -314,6 +319,25 @@ class GroupMsgParser : IGroupNewMsgParser {
                     parserModel = CusNewMsgBean<String>()
                     parserModel.type = common_game_msg
                 }
+
+                level_up,user_like -> {
+                    parameterizedTypeImpl = ParameterizedTypeImpl(
+                        arrayOf<Type>(IMLevelUpMsgBean::class.java),
+                        CusNewMsgBean::class.java,
+                        CusNewMsgBean::class.java
+                    )
+                    parserModel = gson.fromJson(resultString,parameterizedTypeImpl)
+                }
+
+                send_wish_gift, modify_wish_gift -> {
+                    parameterizedTypeImpl = ParameterizedTypeImpl(
+                        arrayOf<Type>(IMWishGiftModel::class.java),
+                        CusNewMsgBean::class.java,
+                        CusNewMsgBean::class.java
+                    )
+                    parserModel = gson.fromJson(resultString,parameterizedTypeImpl)
+                }
+
             }
             parserModel?.v2TIMMessage = v2TIMMessage
         }catch (e:Exception){

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

@@ -207,6 +207,28 @@ object ImConstant {
      */
     const val room_dan_mu = 313
 
+    /******************************************/
+
+    /**
+     * 用户或者主播升级
+     */
+    const val level_up = 401
+
+    /**
+     * 点赞
+     */
+    const val user_like = 402
+
+    /**
+     * 送心愿礼物
+     */
+    const val send_wish_gift = 403
+
+    /**
+     * 主播修改心愿礼物
+     */
+    const val modify_wish_gift = 404
+
     /**********游戏相关IM********/
     const val fruit_game = 1001
     const val beauty_game = 1002

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

@@ -11,5 +11,6 @@ object RoomMsgType {
     const val SYSTEM_MESSAGE = 3
     const val FOLLOW_MESSAGE = 4
     const val BECOME_MANAGER = 5
+    const val LEVEL_UP = 6
 
 }

baseswago/src/main/java/com/swago/baseswago/inter/RoomApi.kt

@@ -1,7 +1,9 @@
 package com.swago.baseswago.inter
 
+import com.swago.baseswago.model.FanClubUserModel
 import com.swago.baseswago.model.MomentModel
 import com.swago.baseswago.model.RedEnvelope
+import com.swago.baseswago.model.UploadInfo
 import com.swago.baseswago.model.live.*
 import com.swago.baseswago.model.live.audio.*
 import com.swago.baseswago.model.live.game.GameListModel
@@ -111,6 +113,29 @@ interface RoomApi {
         @Field("pk_id") pk_id: String,
     ): GiftSendModel
 
+
+    /**
+     * 视频房赠送心愿礼物
+     */
+    @FormUrlEncoded
+    @POST("/v4/rtc/buy/gift")
+    suspend fun sendVideoWishGift(
+        @Field("room_id") room_id: String,
+        @Field("gift_id") gift_id: String,
+        @Field("gift_batch") gift_batch: Int,
+        @Field("gift_receive_id") gift_receive_id: String,
+        @Field("is_combo") is_combo: Int,
+        @Field("gift_num") gift_num: Int,
+        @Field("pk_id") pk_id: String,
+    ): GiftSendModel
+
+    /**
+     * 语音房赠送心愿礼物
+     */
+    @POST("/v4/rtc/yuying/buy/gift")
+    suspend fun sendAudioWishGift(@Body requestBody: RequestBody): AudioSendGiftModel
+
+
     /**
      * 用户在直播间权限
      */
@@ -470,4 +495,53 @@ interface RoomApi {
     @FormUrlEncoded
     @POST("/v1/rtc/broadcast/package/detail")
     suspend fun getRedReceivedList(@Field("package_id") package_id: String):RedReceiveListModel
+
+    /**
+     * 主播端心愿礼物列表
+     */
+    @FormUrlEncoded
+    @POST("/v4/rtc/broadcast/gift/list")
+    suspend fun getWishGiftData(@Field("broadcast_type") broadcast_type:Int):WishGiftModel
+
+    /**
+     * 添加心愿礼物
+     */
+    @POST("/v4/rtc/broadcast/gift/add")
+    suspend fun addWishGift(@Body body: WishGiftModel):Any
+
+    /**
+     * 设置心愿礼物是否开启
+     */
+    @FormUrlEncoded
+    @POST("/v4/rtc/broadcast/gift/set")
+    suspend fun setWishGiftStatus(@Field("user_broadcast_gift_show") user_broadcast_gift_show: Int):Any
+
+    /**
+     * 用户端心愿礼物列表
+     */
+    @FormUrlEncoded
+    @POST("/v4/rtc/broadcast/user/gift/list")
+    suspend fun getWishGiftDataOnUser(@Field("room_id") room_id:String):UserWishGiftModel
+
+    /**
+     * 用户点赞
+     */
+    @FormUrlEncoded
+    @POST("/v4/rtc/broadcast/give")
+    suspend fun userDianZan(@Field("room_id") room_id:String):Any
+
+    /**
+     * 粉丝团列表
+     */
+    @FormUrlEncoded
+    @POST("/v4/rtc/broadcast/fans/list")
+    suspend fun getFanClubList(@Field("room_id") room_id:String,@Field("page") page:Int,@Field("page_size") page_size:Int=50): FanClubUserModel
+
+    /**
+     * 加入粉丝团
+     */
+    @FormUrlEncoded
+    @POST("/v4/rtc/broadcast/fans/join")
+    suspend fun joinFanClub(@Field("room_id") room_id:String):Any
+
 }

baseswago/src/main/java/com/swago/baseswago/model/FanClubUserModel.kt

@@ -0,0 +1,18 @@
+package com.swago.baseswago.model
+
+data class FanClubUserModel(
+    val list: List<FanClubUser>,
+    val total: String,
+    val fans_score: String,
+    val fans_level:Int
+)
+
+data class FanClubUser(
+    val fans_score: String,
+    val id: String,
+    val user_head_img_url: String,
+    val user_id: String,
+    val user_name: String,
+    val fans_level:Int,
+    val user_level:Int
+)

baseswago/src/main/java/com/swago/baseswago/model/UserInfoModel.java

@@ -36,6 +36,7 @@ public class UserInfoModel {
     private int user_type;//0用户 1主播 2家族长
     private String user_level;
     private String user_jingyan_value;
+    private String user_wealth_jingyan_value;
     private String user_wealth_level;
     private String next_wealth_level;
     private String next_wealth_need_jingyan;
@@ -250,6 +251,14 @@ public class UserInfoModel {
         this.user_jingyan_value = user_jingyan_value;
     }
 
+    public String getUser_wealth_jingyan_value() {
+        return user_wealth_jingyan_value;
+    }
+
+    public void setUser_wealth_jingyan_value(String user_wealth_jingyan_value) {
+        this.user_wealth_jingyan_value = user_wealth_jingyan_value;
+    }
+
     public String getNext_wealth_level() {
         return next_wealth_level;
     }

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

@@ -22,6 +22,9 @@ public class FollowSuccessMsgBean implements IRoomChat {
    public int isPrettyAccount;
    public int isService;
    public int isOfficial;
+   public int isAdmin;
+   public int isCrown;
+   public int isCup;
 
 
    @NonNull

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

@@ -0,0 +1,147 @@
+package com.swago.baseswago.model.im;
+
+import static com.swago.baseswago.im.RoomMsgType.LEVEL_UP;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import androidx.annotation.NonNull;
+
+import com.swago.baseswago.im.IRoomChat;
+
+public class IMLevelUpMsgBean implements IRoomChat, Parcelable {
+    private String roomId;
+    private String senderId;
+    private String senderName;
+    private String senderAvatar;
+    int senderLevel;
+    int isBenefit;
+    int isPrettyAccount;
+    public int isService;
+    public int isOfficial;
+    public int isAdmin;
+    public int isCrown;
+    public int isCup;
+
+    public String giveVal;
+
+    protected IMLevelUpMsgBean(Parcel in) {
+        roomId = in.readString();
+        senderId = in.readString();
+        senderName = in.readString();
+        senderAvatar = in.readString();
+        senderLevel = in.readInt();
+        isBenefit = in.readInt();
+        isPrettyAccount = in.readInt();
+    }
+
+    public static final Creator<IMLevelUpMsgBean> CREATOR = new Creator<IMLevelUpMsgBean>() {
+        @Override
+        public IMLevelUpMsgBean createFromParcel(Parcel in) {
+            return new IMLevelUpMsgBean(in);
+        }
+
+        @Override
+        public IMLevelUpMsgBean[] newArray(int size) {
+            return new IMLevelUpMsgBean[size];
+        }
+    };
+
+    public String getRoomId() {
+        return roomId;
+    }
+
+    public void setRoomId(String roomId) {
+        this.roomId = roomId;
+    }
+
+    @NonNull
+    @Override
+    public String getSenderId() {
+        return senderId;
+    }
+
+    public void setSenderId(String senderId) {
+        this.senderId = senderId;
+    }
+
+    @NonNull
+    @Override
+    public String getSenderName() {
+        return senderName;
+    }
+
+    public void setSenderName(String senderName) {
+        this.senderName = senderName;
+    }
+
+    public String getSenderAvatar() {
+        return senderAvatar;
+    }
+
+    public void setSenderAvatar(String senderAvatar) {
+        this.senderAvatar = senderAvatar;
+    }
+
+    public int getSenderLevel() {
+        return senderLevel;
+    }
+
+    public void setSenderLevel(int senderLevel) {
+        this.senderLevel = senderLevel;
+    }
+
+    @Override
+    public int getIsBenefit() {
+        return isBenefit;
+    }
+
+    public void setIsBenefit(int isBenefit) {
+        this.isBenefit = isBenefit;
+    }
+
+    public int getIsPrettyAccount() {
+        return isPrettyAccount;
+    }
+
+    public void setIsPrettyAccount(int isPrettyAccount) {
+        this.isPrettyAccount = isPrettyAccount;
+    }
+
+    @NonNull
+    @Override
+    public String getMsgContent() {
+        return "Level upgrade to Lv"+senderLevel;
+    }
+
+    @Override
+    public int getMsgType() {
+        return LEVEL_UP;
+    }
+
+    @Override
+    public int getUserLevel() {
+        return senderLevel;
+    }
+
+    @Override
+    public boolean getIsPrettyId() {
+        return isPrettyAccount==1;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(roomId);
+        dest.writeString(senderId);
+        dest.writeString(senderName);
+        dest.writeString(senderAvatar);
+        dest.writeInt(senderLevel);
+        dest.writeInt(isBenefit);
+        dest.writeInt(isPrettyAccount);
+    }
+}

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

@@ -24,6 +24,8 @@ public class RoomChatMsgBean implements IRoomChat {
     public int isCup;
     public int isAdmin;
 
+    public int isFans;
+
 
     @NonNull
     @Override

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

@@ -26,6 +26,9 @@ public class UserJoinRoomBean implements IRoomChat {
     public int isService;
     public int isOfficial;
     public int isAdmin;
+    public int isCrown;
+    public int isCup;
+    public int isFans;
 
     @NonNull
     @Override

baseswago/src/main/java/com/swago/baseswago/model/live/IMWishGiftModel.kt

@@ -0,0 +1,9 @@
+package com.swago.baseswago.model.live
+
+import java.util.concurrent.CopyOnWriteArrayList
+
+data class IMWishGiftModel(
+    val roomId:String,
+    val roomSessionId:String,
+    val list:CopyOnWriteArrayList<WishGift>
+)

baseswago/src/main/java/com/swago/baseswago/model/live/RoomModel.java

@@ -42,6 +42,13 @@ public class RoomModel {
     private String broadcast_notice_content;
     private String yuying_notice_content;//语音房公告
 
+    private int is_fans;//是否加入粉丝团
+
+    private String fans_score;
+    private int fans_level;
+
+    private String give_val;
+
     public String getRtc_token() {
         return rtc_token;
     }
@@ -217,4 +224,36 @@ public class RoomModel {
     public void setYuying_notice_content(String yuying_notice_content) {
         this.yuying_notice_content = yuying_notice_content;
     }
+
+    public int getIs_fans() {
+        return is_fans;
+    }
+
+    public void setIs_fans(int is_fans) {
+        this.is_fans = is_fans;
+    }
+
+    public String getFans_score() {
+        return fans_score;
+    }
+
+    public void setFans_score(String fans_score) {
+        this.fans_score = fans_score;
+    }
+
+    public int getFans_level() {
+        return fans_level;
+    }
+
+    public void setFans_level(int fans_level) {
+        this.fans_level = fans_level;
+    }
+
+    public String getGive_val() {
+        return give_val;
+    }
+
+    public void setGive_val(String give_val) {
+        this.give_val = give_val;
+    }
 }

baseswago/src/main/java/com/swago/baseswago/model/live/RoomUserModel.java

@@ -55,6 +55,8 @@ public class RoomUserModel {
         private int is_crown;
         private int is_cup;
 
+        private String contribute_val;
+
         public String getUser_id() {
             return user_id;
         }
@@ -159,5 +161,13 @@ public class RoomUserModel {
         public void setIs_cup(int is_cup) {
             this.is_cup = is_cup;
         }
+
+        public String getContribute_val() {
+            return contribute_val;
+        }
+
+        public void setContribute_val(String contribute_val) {
+            this.contribute_val = contribute_val;
+        }
     }
 }

baseswago/src/main/java/com/swago/baseswago/model/live/UserWishGiftModel.kt

@@ -0,0 +1,15 @@
+package com.swago.baseswago.model.live
+
+import java.util.concurrent.CopyOnWriteArrayList
+
+data class UserWishGiftModel(
+    val list: CopyOnWriteArrayList<WishGift>,
+    val logs: List<Log>,
+    val total:Int
+)
+
+data class Log(
+    val id: String,
+    val user_head_img_url: String,
+    val user_name: String
+)

baseswago/src/main/java/com/swago/baseswago/model/live/WishGiftModel.kt

@@ -0,0 +1,25 @@
+package com.swago.baseswago.model.live
+
+import java.util.concurrent.CopyOnWriteArrayList
+
+/**
+ * 心愿礼物列表
+ */
+data class WishGiftModel(
+    val list: CopyOnWriteArrayList<WishGift>,
+    val user_broadcast_gift_show: Int,
+    val broadcast_type:Int,
+    val room_id:String
+)
+
+data class WishGift(
+    val gift_icon_url: String,
+    val gift_id: String,
+    val gift_num: String,
+    var gift_receive_num: String,
+    val gift_coins:String,
+    val gift_name:String,
+    val gift_id_name:String,
+    val gift_ar_name:String,
+    val gift_en_name:String,
+)

baseswago/src/main/java/com/swago/baseswago/model/live/audio/AudioSendGiftModel.kt

@@ -19,6 +19,10 @@ data class AudioSendGiftModel(
     val giftArName:String,
     val giftIdName:String,
     val giftEnName:String,
+    val giftId:String,
+    val senderLevel:Int,
+    val userWealthJingyanValue:String,
+    val nextWealthNeedJingyan:String
 )
 
 data class Receiver(

baseswago/src/main/java/com/swago/baseswago/model/live/gift/IMGiftModel.java

@@ -54,6 +54,10 @@ public class IMGiftModel implements IPiaoTiao {
 
     private String giftIdName = "";
 
+    private String userWealthJingyanValue;
+
+    private String nextWealthNeedJingyan;
+
     public String getRoomId() {
         return roomId;
     }
@@ -229,4 +233,21 @@ public class IMGiftModel implements IPiaoTiao {
     public void setGiftIdName(String giftIdName) {
         this.giftIdName = giftIdName;
     }
+
+
+    public String getUserWealthJingyanValue() {
+        return userWealthJingyanValue;
+    }
+
+    public void setUserWealthJingyanValue(String userWealthJingyanValue) {
+        this.userWealthJingyanValue = userWealthJingyanValue;
+    }
+
+    public String getNextWealthNeedJingyan() {
+        return nextWealthNeedJingyan;
+    }
+
+    public void setNextWealthNeedJingyan(String nextWealthNeedJingyan) {
+        this.nextWealthNeedJingyan = nextWealthNeedJingyan;
+    }
 }

baseswago/src/main/java/com/swago/baseswago/model/pay/CoinModel.kt

@@ -6,5 +6,8 @@ package com.swago.baseswago.model.pay
  */
 data class CoinModel(
     val id :String,
-    val user_coins:String
+    val user_coins:String,
+    val sender_level:Int,
+    val user_wealth_jingyan_value:String,
+    val next_wealth_need_jingyan:String
 )

baseswago/src/main/res/drawable/shape_182553_1e1542_top_20.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient android:angle="270"
+        android:startColor="#182553"
+        android:endColor="#1e1542"/>
+    <corners android:topLeftRadius="20dp"
+        android:topRightRadius="20dp"/>
+</shape>

baseswago/src/main/res/drawable/shape_33000000_4.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#33000000"/>
+    <corners android:radius="4dp"/>
+</shape>

baseswago/src/main/res/drawable/shape_80ff56b7_14.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#80FF56B7"/>
+    <corners android:radius="14dp"/>
+</shape>

baseswago/src/main/res/layout/dialog_person_data.xml

@@ -241,6 +241,30 @@
             </LinearLayout>
 
 
+            <com.swago.baseswago.cusview.SwagoUserBigLevelView
+                android:id="@+id/swagoUserBigLevelView"
+                app:layout_constraintTop_toBottomOf="@+id/llFans"
+                android:layout_marginTop="10dp"
+                android:visibility="gone"
+                tools:visibility="visible"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/swagoHostBigLevelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
+            <com.swago.baseswago.cusview.SwagoHostBigLevelView
+                app:layout_constraintTop_toBottomOf="@+id/llFans"
+                android:id="@+id/swagoHostBigLevelView"
+                android:layout_marginTop="10dp"
+                android:layout_marginStart="12dp"
+                android:visibility="gone"
+                tools:visibility="visible"
+                app:layout_constraintStart_toEndOf="@+id/swagoUserBigLevelView"
+                app:layout_constraintEnd_toEndOf="parent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
 
             <LinearLayout
                 android:id="@+id/llChat"
@@ -253,7 +277,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/llToFollow"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/llFans">
+                app:layout_constraintTop_toBottomOf="@+id/swagoUserBigLevelView">
 
                 <ImageView
                     android:layout_width="wrap_content"
@@ -283,7 +307,7 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/llChat"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/llFans">
+                app:layout_constraintTop_toBottomOf="@+id/swagoUserBigLevelView">
 
                 <ImageView
                     android:id="@+id/ivFollow"

baseswago/src/main/res/layout/view_fans_club_level.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layoutDirection="ltr"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+
+    <ImageView
+        android:id="@+id/ivBg"
+        tools:background="@mipmap/level55"
+        android:layout_width="31dp"
+        android:layout_height="14dp"/>
+
+
+    <com.swago.baseswago.cusview.BoldTextView
+        android:id="@+id/tvLevel"
+        android:textColor="#fff"
+        android:text="01"
+        android:textSize="10dp"
+        android:textStyle="bold"
+        android:layout_gravity="end"
+        android:layout_marginEnd="4dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+
+</FrameLayout>

baseswago/src/main/res/layout/view_host_level.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layoutDirection="ltr"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/ivBg"
+        android:src="@mipmap/bg_host_eight"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:id="@+id/tvHostLevel"
+        android:text="Host Level"
+        app:layout_constraintTop_toTopOf="@+id/ivBg"
+        app:layout_constraintEnd_toEndOf="@+id/ivBg"
+        android:layout_marginEnd="10dp"
+        android:layout_marginTop="6dp"
+        android:textSize="12dp"
+        android:textColor="#B3FFFFFF"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <com.swago.baseswago.cusview.MediumTextView
+        android:id="@+id/tvLevel"
+        tools:text="18"
+        app:layout_constraintStart_toStartOf="@+id/tvHostLevel"
+        app:layout_constraintTop_toBottomOf="@+id/tvHostLevel"
+        android:textSize="18dp"
+        android:textColor="#ffffff"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

baseswago/src/main/res/layout/view_user_level.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layoutDirection="ltr"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/ivBg"
+        android:src="@mipmap/bg_user_eight"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:id="@+id/tvHostLevel"
+        android:text="User Level"
+        app:layout_constraintTop_toTopOf="@+id/ivBg"
+        app:layout_constraintEnd_toEndOf="@+id/ivBg"
+        android:layout_marginEnd="10dp"
+        android:layout_marginTop="6dp"
+        android:textSize="12dp"
+        android:textColor="#B3FFFFFF"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <com.swago.baseswago.cusview.MediumTextView
+        android:id="@+id/tvLevel"
+        tools:text="18"
+        app:layout_constraintStart_toStartOf="@+id/tvHostLevel"
+        app:layout_constraintTop_toBottomOf="@+id/tvHostLevel"
+        android:textSize="18dp"
+        android:textColor="#ffffff"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>