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

@@ -38,6 +38,7 @@ class PersonDataDFragment : BaseXDFragment<DialogPersonDataBinding>() {
     var roomId:String = ""
     var isAnchor = false //是否是主播点击了资料卡
     var isAdmin = false
+    var isMessage = false
     private var inRoom = false
     private var isForbid = 0 //0没有被禁言  1已被禁言
     var openGiftDialog:((nickName:String,userId:String)->Unit)? = null
@@ -45,13 +46,14 @@ class PersonDataDFragment : BaseXDFragment<DialogPersonDataBinding>() {
     var sendMsgInRoom:((nickName:String)->Unit)? = null
 
     companion object{
-        fun newInstance(uid:String,isAnchor:Boolean=false,inRoom:Boolean=false,roomId:String=""): PersonDataDFragment {
+        fun newInstance(uid:String,isAnchor:Boolean=false,inRoom:Boolean=false,roomId:String="",isMessage:Boolean=false): PersonDataDFragment {
             val dialog = PersonDataDFragment()
             val bundle = Bundle()
             bundle.putString("uid",uid)
             bundle.putBoolean("inRoom",inRoom)
             bundle.putBoolean("isAnchor",isAnchor)
             bundle.putString("roomId",roomId)
+            bundle.putBoolean("isMessage",isMessage)
             dialog.arguments = bundle
             return dialog
         }
@@ -64,13 +66,16 @@ class PersonDataDFragment : BaseXDFragment<DialogPersonDataBinding>() {
             inRoom = it.getBoolean("inRoom")
             isAnchor = it.getBoolean("isAnchor")
             roomId = it.getString("roomId","")
+            isMessage = it.getBoolean("isMessage")
             if (!TextUtils.isEmpty(uid)){
                 userVm.getOtherUserInfo(uid,roomId)
             }
 
             UserInfo.getUserInfo()?.let {
                 if (it.id == uid){
-//                    binding.ivGift.visibility = View.GONE
+                    if (isMessage){
+                        binding.ivGift.visibility = View.GONE
+                    }
                     binding.tvAt.visibility = View.GONE
                     binding.llChat.visibility = View.GONE
                     binding.llToFollow.visibility = View.GONE

baseswago/src/main/java/com/swago/baseswago/constant/ARouteConstant.kt

@@ -23,6 +23,7 @@ object ARouteConstant {
         const val blacklist = "$rootPath/TabBlackActivity"
         const val customService = "$rootPath/CustomServiceActivity"
         const val modifyPwd = "$rootPath/ModifyPwdActivity"
+        const val storeList = "$rootPath/StoreListActivity"
     }
 
     object Home {

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

@@ -0,0 +1,16 @@
+package com.swago.baseswago.model
+
+import android.app.Application
+import androidx.lifecycle.MutableLiveData
+import com.swago.baseswago.util.BaseViewModel
+
+class UnreadMessageVm (application: Application) : BaseViewModel(application){
+
+    val unreadMessageData by lazy {
+        MutableLiveData<Long>()
+    }
+
+    fun setTotalUnreadCount(count: Long) {
+        unreadMessageData.value = count
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.swago.baseswago.model
+
+import android.app.Application
+import androidx.lifecycle.ViewModelProvider
+
+object ViewModelProviderUtil {
+    private var unreadMessageViewModel: UnreadMessageVm? = null
+
+    fun getUnreadMessageViewModel(application: Application): UnreadMessageVm {
+        if (unreadMessageViewModel == null) {
+            unreadMessageViewModel = ViewModelProvider.AndroidViewModelFactory(application)
+                .create(UnreadMessageVm::class.java)
+        }
+        return unreadMessageViewModel!!
+    }
+}

baseswago/src/main/java/com/swago/baseswago/util/IMUtil.kt

@@ -85,4 +85,25 @@ object IMUtil {
             loginCallback?.invoke()
         }
     }
+
+    /**
+     * 未读消息数
+     * */
+    fun updateUnreadMessageCount(call:(total:Long)->Unit){
+        V2TIMManager.getConversationManager().getTotalUnreadMessageCount(object :V2TIMValueCallback<Long>{
+            override fun onSuccess(totalUnreadCount: Long) {
+                call.invoke(totalUnreadCount)
+            }
+
+            override fun onError(code: Int, desc: String?) {
+
+            }
+        })
+        V2TIMManager.getConversationManager().addConversationListener(object :V2TIMConversationListener(){
+            override fun onTotalUnreadMessageCountChanged(totalUnreadCount: Long) {
+                super.onTotalUnreadMessageCountChanged(totalUnreadCount)
+                call.invoke(totalUnreadCount)
+            }
+        })
+    }
 }

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

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

home/src/main/java/com/swago/home/ChatDetailActivity.kt

@@ -10,6 +10,7 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.alibaba.android.arouter.launcher.ARouter
 import com.google.gson.Gson
 import com.gyf.immersionbar.ImmersionBar
+import com.swago.baseswago.PersonDataDFragment
 import com.swago.baseswago.UserVm
 import com.swago.baseswago.dialog.ReportBlockDialogFragment
 import com.swago.baseswago.activity.BaseXActivity
@@ -20,6 +21,9 @@ import com.swago.baseswago.util.UserInfo
 import com.swago.home.databinding.ActivityChatDetailBinding
 import com.tencent.imsdk.v2.V2TIMConversation
 import com.tencent.qcloud.tim.uikit.modules.chat.base.ChatInfo
+import com.tencent.qcloud.tim.uikit.modules.chat.layout.message.MessageLayout
+import com.tencent.qcloud.tim.uikit.modules.message.MessageInfo
+import com.tencent.qcloud.tim.uikit.utils.ToastUtil
 
 /**
  *@date 2021/8/24 15:01
@@ -76,6 +80,23 @@ class ChatDetailActivity  : BaseXActivity<ActivityChatDetailBinding>() {
             UserInfo.setUserInfo(it)
             SpUtil.putString("user_info", Gson().toJson(it))
         }
+
+        val messageRecyclerView = binding.chatLayout.messageLayout
+        messageRecyclerView.setOnItemClickListener(object : MessageLayout.OnItemLongClickListener{
+            override fun onMessageLongClick(view: View?, position: Int, messageInfo: MessageInfo?) {
+
+            }
+
+            override fun onUserIconClick(view: View?, position: Int, messageInfo: MessageInfo?) {
+                UserInfo.getUserInfo()?.let {
+                    PersonDataDFragment.newInstance(it.id,
+                        isAnchor = false,
+                        inRoom = false,
+                        isMessage = true
+                    ).show(supportFragmentManager,"PersonDataDFragment")
+                }
+            }
+        })
     }
 
     override fun initLiveData() {

home/src/main/java/com/swago/home/HomeActivity.kt

@@ -1,30 +1,28 @@
 package com.swago.home
 
 import android.text.TextUtils
+import android.view.View
 import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.fragment.app.FragmentActivity
-import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.viewpager.widget.ViewPager
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.android.billingclient.api.Purchase
-import com.google.gson.Gson
 import com.swago.baseswago.PayVm
 import com.swago.baseswago.SwagoAdapter
-import com.swago.baseswago.UserVm
 import com.swago.baseswago.activity.BaseXActivity
 import com.swago.baseswago.constant.ARouteConstant
 import com.swago.baseswago.constant.UrlConstant
 import com.swago.baseswago.dialog.CloseAccountDialog
-import com.swago.baseswago.dialog.ForceOfflineDialog
-import com.swago.baseswago.dialog.InviteBindingDialog
 import com.swago.baseswago.dialog.OrderLostDialog
 import com.swago.baseswago.im.GroupMsgParser
 import com.swago.baseswago.im.IMMessageManager
 import com.swago.baseswago.inter.ApiManager
 import com.swago.baseswago.libpay.IPayCallback
 import com.swago.baseswago.libpay.PayManager
+import com.swago.baseswago.model.UnreadMessageVm
+import com.swago.baseswago.model.ViewModelProviderUtil
 import com.swago.baseswago.model.pay.PayModel
 import com.swago.baseswago.util.*
 import com.swago.home.databinding.ActivityHomeBinding
@@ -49,6 +47,7 @@ class HomeActivity : BaseXActivity<ActivityHomeBinding>(), IPayCallback {
     private val officialVm by viewModels<OfficialVm>()
     private val homeVm by viewModels<HomeVm>()
     private val payVm by viewModels<PayVm>()
+    private lateinit var unreadMessageVm: UnreadMessageVm
 
     private val listFragment =
         arrayListOf(HomeFragment(), MessageFragment(), MineFragment())
@@ -58,6 +57,7 @@ class HomeActivity : BaseXActivity<ActivityHomeBinding>(), IPayCallback {
     }
 
     override fun initOther() {
+        unreadMessageVm = ViewModelProviderUtil.getUnreadMessageViewModel(application)
         TUIKit.init(this, UrlConstant.getImId(), TUIKitConfigs.getConfigs())
         PayManager.init()
         IMMessageManager.groupMessageParser.add(GroupMsgParser())
@@ -119,6 +119,16 @@ class HomeActivity : BaseXActivity<ActivityHomeBinding>(), IPayCallback {
         })
 
         binding.viewPager.adapter = SwagoAdapter(listFragment, supportFragmentManager)
+        unreadMessageVm.unreadMessageData.observe(this){
+            if (it > 0){
+                binding.tvMessageNum.visibility = View.VISIBLE
+                binding.tvMessageNum.text = "$it"
+            } else {
+                binding.tvMessageNum.visibility = View.GONE
+            }
+
+        }
+
     }
 
     /**
@@ -271,6 +281,9 @@ class HomeActivity : BaseXActivity<ActivityHomeBinding>(), IPayCallback {
                 IUIKitCallBack {
                 override fun onSuccess(data: Any?) {
                     IMUtil.joinGroup(null)
+                    IMUtil.updateUnreadMessageCount {unread->
+                        unreadMessageVm.setTotalUnreadCount(unread)
+                    }
                 }
 
                 override fun onError(module: String?, errCode: Int, errMsg: String?) {

home/src/main/java/com/swago/home/MineFragment.kt

@@ -140,6 +140,18 @@ class MineFragment : BaseXFragment<FragmentMineBinding>() {
             }
         })
 
+        binding.tvXStore.setOnClickListener(object :NoDoubleClickListener(){
+            override fun onClick() {
+                ARouter.getInstance().build(ARouteConstant.User.storeList).navigation()
+            }
+        })
+
+        binding.tvXoutfit.setOnClickListener(object :NoDoubleClickListener(){
+            override fun onClick() {
+                ARouter.getInstance().build(ARouteConstant.User.storeList).navigation()
+            }
+        })
+
         payVm.getBenefit()
     }
 

home/src/main/java/com/swago/home/update/UpdateDialog.kt

@@ -56,7 +56,7 @@ class UpdateDialog : BaseXDFragment<DialogUpdateBinding>() {
                     if (SwagoInfo.isGooglePackage()) {
                         val intent = Intent(Intent.ACTION_VIEW)
                         intent.data =
-                            Uri.parse("market://details?id=${AppContext.getContext().packageName}")
+                            Uri.parse("https://play.google.com/store/apps/details?id=${AppContext.getContext().packageName}")
                         startActivity(intent)
                     } else {
                         val intent = Intent()

home/src/main/res/layout/activity_home.xml

@@ -1,6 +1,7 @@
 <?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:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -51,4 +52,20 @@
 
     </RadioGroup>
 
+    <TextView
+        android:id="@+id/tvMessageNum"
+        android:layout_width="12dp"
+        android:layout_height="12dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginBottom="28dp"
+        android:layout_marginStart="18dp"
+        android:textColor="#fff"
+        tools:text="1"
+        android:textSize="8sp"
+        android:gravity="center"
+        android:visibility="gone"
+        android:background="@drawable/shape_d54941_circle"/>
+
 </androidx.constraintlayout.widget.ConstraintLayout>

home/src/main/res/layout/fragment_mine.xml

@@ -270,7 +270,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/frameLayout"
         android:layout_width="match_parent"
-        android:layout_height="80dp"
+        android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="21dp"
         android:layout_marginEnd="16dp"
@@ -286,7 +286,7 @@
             android:text="@string/level"
             android:textColor="#131B23"
             android:textSize="12dp"
-            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginTop="12dp"
             app:layout_constraintEnd_toStartOf="@+id/tvXTopUp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -300,7 +300,7 @@
             android:text="@string/top_up"
             android:textColor="#131B23"
             android:textSize="12dp"
-            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginTop="12dp"
             app:layout_constraintEnd_toStartOf="@+id/tvXWithdrawal"
             app:layout_constraintStart_toEndOf="@+id/tvXLevel"
             app:layout_constraintTop_toTopOf="parent" />
@@ -314,8 +314,8 @@
             android:text="@string/withdrawal"
             android:textColor="#131B23"
             android:textSize="12dp"
+            android:layout_marginTop="12dp"
             android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/tvXTaskCenter"
             app:layout_constraintStart_toEndOf="@+id/tvXTopUp"
             app:layout_constraintTop_toTopOf="parent" />
@@ -329,11 +329,40 @@
             android:text="@string/task_center"
             android:textColor="#131B23"
             android:textSize="12dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginTop="12dp"
             app:layout_constraintStart_toEndOf="@+id/tvXWithdrawal"
+            app:layout_constraintEnd_toStartOf="@+id/tvXStore"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.swago.baseswago.cusview.RegularTextView
+            android:id="@+id/tvXStore"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableTop="@mipmap/icon_my_store"
+            android:drawablePadding="2dp"
+            android:text="@string/task_center"
+            android:textColor="#131B23"
+            android:textSize="12dp"
+            android:layout_marginTop="12dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/tvXTaskCenter"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <com.swago.baseswago.cusview.RegularTextView
+            android:id="@+id/tvXoutfit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableTop="@mipmap/icon_my_outfit"
+            android:drawablePadding="2dp"
+            android:text="@string/level"
+            android:textColor="#131B23"
+            android:textSize="12dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="12dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/tvXTopUp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvXLevel" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 

room/src/main/java/com/swago/room/anchor/AnchorRoomFragment.kt

@@ -144,6 +144,10 @@ class AnchorRoomFragment : BaseComFragment<FragmentBaseComBinding>() {
         lianMaiVm.showLianMaiDotFun = {
             (iFooter as AnchorFooterView).showLianMaiDot()
         }
+
+        unreadMessageVm.unreadMessageData.observe(this) {
+            unReadNum = it
+        }
     }
 
     private fun openLianMaiListDialog() {

room/src/main/java/com/swago/room/base/BaseComFragment.kt

@@ -36,6 +36,8 @@ import com.swago.baseswago.dialog.ChoiceDialogFragment
 import com.swago.baseswago.dialog.ReportDialog
 import com.swago.baseswago.fragment.BaseXFragment
 import com.swago.baseswago.im.IRoomChat
+import com.swago.baseswago.model.UnreadMessageVm
+import com.swago.baseswago.model.ViewModelProviderUtil
 import com.swago.baseswago.model.im.GamePrize
 import com.swago.baseswago.model.im.RoomSystemMsgBean
 import com.swago.baseswago.model.live.RoomConfig
@@ -113,6 +115,7 @@ abstract class BaseComFragment<T : FragmentBaseComBinding> : BaseXFragment<T>(),
     val roomOtherVm by activityViewModels<RoomOtherVm>()
     val msgVm by activityViewModels<MsgVm>()
     val userVm by activityViewModels<UserVm>()
+    lateinit var unreadMessageVm: UnreadMessageVm
 
     /**
      * 麦位信息
@@ -121,6 +124,7 @@ abstract class BaseComFragment<T : FragmentBaseComBinding> : BaseXFragment<T>(),
         CopyOnWriteArrayList<PositionBean>()
     }
     var count = 2
+    var unReadNum:Long = 0
 
     //直播间观众列表
     var roomUserList = CopyOnWriteArrayList<RoomUserModel.ListBean>()
@@ -175,6 +179,7 @@ abstract class BaseComFragment<T : FragmentBaseComBinding> : BaseXFragment<T>(),
     }
 
     override fun initOther() {
+        unreadMessageVm = ViewModelProviderUtil.getUnreadMessageViewModel(AppContext.getContext())
         RoomTimer.timeTickList.add(this)
         PKStateManager.addPKListener(this)
         SwagoRoomManager.addListener(this)
@@ -445,7 +450,13 @@ abstract class BaseComFragment<T : FragmentBaseComBinding> : BaseXFragment<T>(),
         }
 
         (iHeader as ComHeaderView).openAudienceListDialog = {
-            AudienceListDialog.newInstance().show(childFragmentManager, "AudienceListDialog")
+            AudienceListDialog.newInstance().apply {
+                this.showUserInfo = {userid ->
+                   PersonDataDFragment.newInstance(userid,
+                       isAnchor = false,
+                       inRoom = true).show(this@BaseComFragment.childFragmentManager,"PersonDataDFragment")
+                }
+            }.show(childFragmentManager, "AudienceListDialog")
         }
 
         (iHeader as ComHeaderView).showFanClubFun = {
@@ -726,7 +737,7 @@ abstract class BaseComFragment<T : FragmentBaseComBinding> : BaseXFragment<T>(),
     }
 
     fun openMoreDialog(){
-        FooterMoreDialog.newInstance().apply {
+        FooterMoreDialog.newInstance(unReadNum).apply {
             openMessageFun = {
                 openMessageListDialog()
             }

room/src/main/java/com/swago/room/dialog/AudienceListDialog.kt

@@ -29,6 +29,7 @@ import de.hdodenhof.circleimageview.CircleImageView
 class AudienceListDialog : BaseListDialogFragment<DialogAudienceListBinding,RoomUserModel.ListBean>() {
 
     private val roomVm by activityViewModels<RoomVm>()
+    var showUserInfo:((id:String)->Unit)? = null
 
     init {
         setGravity(Gravity.BOTTOM)
@@ -75,6 +76,13 @@ class AudienceListDialog : BaseListDialogFragment<DialogAudienceListBinding,Room
 
            }
        }
+
+        adapter.setOnItemClickListener { _, _, position ->
+            if (adapter.data.size>position){
+                showUserInfo?.invoke(adapter.data[position].user_id)
+                dismissAllowingStateLoss()
+            }
+        }
     }
 
 

room/src/main/java/com/swago/room/dialog/FooterMoreDialog.kt

@@ -7,6 +7,9 @@ import android.view.View.OnClickListener
 import androidx.fragment.app.viewModels
 import com.swago.baseswago.baseroom.SwagoRoomManager
 import com.swago.baseswago.dialog.BaseXDFragment
+import com.swago.baseswago.model.UnreadMessageVm
+import com.swago.baseswago.model.ViewModelProviderUtil
+import com.swago.baseswago.util.AppContext
 import com.swago.baseswago.util.NoDoubleClickListener
 import com.swago.baseswago.util.SwagoLoading
 import com.swago.room.bean.UserRoomModel
@@ -18,7 +21,6 @@ class FooterMoreDialog : BaseXDFragment<DialogFooterMoreBinding>() {
 
     var openMessageFun:(()->Unit)? = null
     var openShareFun:(()->Unit)? = null
-
     init {
         setGravity(Gravity.BOTTOM)
         setDimAmount(0.5f)
@@ -26,8 +28,9 @@ class FooterMoreDialog : BaseXDFragment<DialogFooterMoreBinding>() {
     }
 
     companion object{
-        fun newInstance(): FooterMoreDialog {
+        fun newInstance(unReadNum:Long): FooterMoreDialog {
             val args = Bundle()
+            args.putLong("unReadNum", unReadNum)
             val fragment = FooterMoreDialog()
             fragment.arguments = args
             return fragment
@@ -35,10 +38,18 @@ class FooterMoreDialog : BaseXDFragment<DialogFooterMoreBinding>() {
     }
 
     override fun initOther() {
-
     }
 
     override fun initLiveData() {
+        arguments?.let {
+            val unReadNum = it.getLong("unReadNum",0)
+            if (unReadNum > 0){
+                binding.tvNum.visibility = View.VISIBLE
+                binding.tvNum.text = "$unReadNum"
+            } else {
+                binding.tvNum.visibility = View.GONE
+            }
+        }
         binding.ivMessage.setOnClickListener {
             openMessageFun?.invoke()
             dismissAllowingStateLoss()

room/src/main/java/com/swago/room/user/UserRoomFragment.kt

@@ -124,6 +124,10 @@ class UserRoomFragment : BaseComFragment<FragmentBaseComBinding>() {
             openLianMaiListDialog()
         }
 
+        unreadMessageVm.unreadMessageData.observe(this){
+            footerView.setUnReadCount(it)
+        }
+
         msgVm.forbidSpeakOrCancel = {
             isForbid = it
         }

room/src/main/java/com/swago/room/widget/UserFooterView.kt

@@ -123,4 +123,13 @@ class UserFooterView : ConstraintLayout, IFooter,IRoomActiveListener {
     override fun closeRoomed() {
         SwagoRoomManager.removeListener(this)
     }
+
+    fun setUnReadCount(num:Long){
+        if (num > 0){
+            binding.tvNum.visibility = View.VISIBLE
+            binding.tvNum.text = "$num"
+        } else {
+            binding.tvNum.visibility = View.GONE
+        }
+    }
 }

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

@@ -1,6 +1,7 @@
 <?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:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -11,23 +12,42 @@
         android:layout_width="match_parent"
         android:layout_height="0dp">
 
-    <ImageView
-        android:id="@+id/ivMessage"
-        android:layout_marginStart="10dp"
-        android:background="@drawable/shape_80000000_20"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        android:src="@mipmap/live_message"
-        android:layout_marginTop="@dimen/dp_10"
-        android:layout_width="40dp"
-        android:layout_height="40dp"/>
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/clMessage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            android:layout_marginTop="@dimen/dp_10">
+            <ImageView
+                android:id="@+id/ivMessage"
+                android:layout_marginStart="10dp"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                android:background="@drawable/shape_80000000_20"
+                android:src="@mipmap/live_message"
+                android:layout_width="40dp"
+                android:layout_height="40dp"/>
+            <TextView
+                android:id="@+id/tvNum"
+                android:layout_width="12dp"
+                android:layout_height="12dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                android:textColor="#fff"
+                tools:text="1"
+                android:textSize="8sp"
+                android:gravity="center"
+                android:visibility="gone"
+                android:background="@drawable/shape_d54941_circle"/>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
     <ImageView
         android:id="@+id/ivShare"
         android:layout_marginStart="16dp"
         android:background="@drawable/shape_80000000_20"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/ivMessage"
+        app:layout_constraintStart_toEndOf="@+id/clMessage"
         android:src="@mipmap/live_share"
         android:padding="6dp"
         android:layout_marginTop="@dimen/dp_10"

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

@@ -63,14 +63,36 @@
         android:layout_width="40dp"
         android:layout_height="40dp"/>
 
-    <ImageView
-        android:id="@+id/ivMessage"
-        android:background="@drawable/shape_80000000_20"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toEndOf="@+id/ivShare"
-        android:layout_marginStart="10dp"
-        android:src="@mipmap/live_message"
-        android:layout_width="40dp"
-        android:layout_height="40dp"/>
+        android:layout_marginStart="10dp">
+
+        <ImageView
+            android:id="@+id/ivMessage"
+            android:background="@drawable/shape_80000000_20"
+            android:src="@mipmap/live_message"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            android:layout_width="40dp"
+            android:layout_height="40dp"/>
+
+        <TextView
+            android:id="@+id/tvNum"
+            android:layout_width="12dp"
+            android:layout_height="12dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:textColor="#fff"
+            tools:text="1"
+            android:textSize="8sp"
+            android:gravity="center"
+            android:visibility="gone"
+            android:background="@drawable/shape_d54941_circle"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>

user/src/main/AndroidManifest.xml

@@ -25,6 +25,8 @@
             android:screenOrientation="portrait"/>
         <activity android:name=".ModifyPwdActivity"
             android:screenOrientation="portrait"/>
+        <activity android:name=".store.StoreListActivity"
+            android:screenOrientation="portrait"/>
     </application>
 
 </manifest>

user/src/main/java/com/swago/user/store/StoreBuyDialog.kt

@@ -0,0 +1,74 @@
+package com.swago.user.store
+
+import android.os.Bundle
+import android.view.Gravity
+import android.view.View
+import com.opensource.svgaplayer.SVGADrawable
+import com.opensource.svgaplayer.SVGAParser
+import com.opensource.svgaplayer.SVGAVideoEntity
+import com.swago.baseswago.dialog.BaseXDFragment
+import com.swago.user.databinding.DialogStoreDetailBinding
+import java.io.File
+import java.net.URL
+
+class StoreBuyDialog : BaseXDFragment<DialogStoreDetailBinding>(){
+
+    private var svgaParser: SVGAParser? = null
+    var svgaString: String ?= null
+    init {
+        setGravity(Gravity.BOTTOM)
+        setDimAmount(0.5f)
+        setCanCancel(true)
+    }
+
+    companion object{
+        fun newInstance(): StoreBuyDialog {
+            val dialog = StoreBuyDialog()
+            val bundle = Bundle()
+//            bundle.putString("svgaString",svgaString)
+            dialog.arguments = bundle
+            return dialog
+        }
+    }
+
+
+    override fun initOther() {
+        svgaParser = SVGAParser(activity)
+//        arguments?.let {
+//            svgaString = it.getString("svgaString")
+//        }
+        svgaString?.let {
+            svgaParser?.let { svgaParser ->
+                svgaParser.decodeFromURL(URL(it), object : SVGAParser.ParseCompletion{
+                    override fun onComplete(videoItem: SVGAVideoEntity) {
+                        val drawable = SVGADrawable(videoItem)
+                        binding.svgContent.setImageDrawable(drawable)
+                        binding.svgContent.startAnimation()
+                    }
+
+                    override fun onError() {
+
+                    }
+                })
+
+            }
+        }
+        svgaParser?.let {
+            it.decodeFromAssets("jojo_audio.svga",object : SVGAParser.ParseCompletion{
+                override fun onComplete(videoItem: SVGAVideoEntity) {
+                    val drawable = SVGADrawable(videoItem)
+                    binding.svgContent.setImageDrawable(drawable)
+                    binding.svgContent.startAnimation()
+                }
+
+                override fun onError() {
+
+                }
+            })
+        }
+    }
+
+    override fun initLiveData() {
+
+    }
+}

user/src/main/java/com/swago/user/store/StoreItemAdapter.kt

@@ -0,0 +1,16 @@
+package com.swago.user.store
+
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.BaseViewHolder
+import com.swago.user.R
+
+class StoreItemAdapter : BaseQuickAdapter<String, BaseViewHolder>(R.layout.item_store, arrayListOf())  {
+    override fun convert(helper: BaseViewHolder?, item: String?) {
+        helper?.apply {
+            item?.let {
+                setText(R.id.tv_name ,item)
+            }
+
+        }
+    }
+}

user/src/main/java/com/swago/user/store/StoreListActivity.kt

@@ -0,0 +1,51 @@
+package com.swago.user.store
+
+import android.graphics.Color
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.swago.baseswago.activity.BaseXActivity
+import com.swago.baseswago.constant.ARouteConstant
+import com.swago.user.R
+import com.swago.user.databinding.ActivityStoreListBinding
+import com.swago.user.vm.TaskVm
+
+/**
+ *@date 2022/2/26 13:37
+ *description:
+ */
+@Route(path = ARouteConstant.User.storeList)
+class StoreListActivity : BaseXActivity<ActivityStoreListBinding>() {
+
+    val adapter by lazy {
+        StoreTypeAdapter()
+    }
+
+    override fun loadData() {
+    }
+
+    override fun initOther() {
+        setBackView(binding.toolbar.ivBack)
+        binding.toolbar.ivBack.setImageResource(R.mipmap.back_white)
+        binding.toolbar.tvTitle.setTextColor(Color.parseColor("#FFFFFF"))
+        binding.toolbar.tvTitle.text =
+            "Store"
+    }
+
+    override fun initLiveData() {
+        binding.swagoRv.layoutManager = LinearLayoutManager(this)
+        adapter.setNewData(arrayListOf(StoreListBean("dfg", false), StoreListBean("fsdfds", false)))
+        binding.swagoRv.adapter = adapter
+        adapter.setOnItemChildClickListener { _, view, positon ->
+            when (view?.id) {
+                R.id.clMore -> {
+                    adapter.data[positon].isExpanded = !adapter.data[positon].isExpanded
+                    adapter.notifyItemChanged(positon)
+                }
+            }
+        }
+        adapter.itemClickFun = { typeItem, position ->
+            StoreBuyDialog.newInstance().show(supportFragmentManager ,"StoreBuyDialog")
+        }
+    }
+
+}

user/src/main/java/com/swago/user/store/StoreListBean.kt

@@ -0,0 +1,6 @@
+package com.swago.user.store
+
+data class StoreListBean(
+    val name: String,
+    var isExpanded: Boolean
+)

user/src/main/java/com/swago/user/store/StoreTypeAdapter.kt

@@ -0,0 +1,39 @@
+package com.swago.user.store
+
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.BaseViewHolder
+import com.swago.user.R
+
+class StoreTypeAdapter: BaseQuickAdapter<StoreListBean, BaseViewHolder>(R.layout.item_type_store, arrayListOf())  {
+    var itemClickFun: ((typeItem: StoreListBean , position:Int) -> Unit)? = null
+
+    override fun convert(helper: BaseViewHolder?, item: StoreListBean?) {
+        val itemAdapter = StoreItemAdapter()
+        val array = arrayListOf("ds", "ferg","dfdg","dfdg")
+        helper?.apply {
+            item?.let {
+                setText(R.id.tvType ,item.name)
+                if (item.isExpanded){
+                    itemAdapter.setNewData(array)
+                    setText(R.id.tvMore ,"Show Less")
+                    setImageResource(R.id.ivMore , R.mipmap.ic_show_less)
+                } else {
+                    itemAdapter.setNewData(array.subList(0 , array.size.coerceAtMost(3)))
+                    setText(R.id.tvMore ,"Show More")
+                    setImageResource(R.id.ivMore , R.mipmap.ic_show_more)
+                }
+                val recyclerView = itemView.findViewById<RecyclerView>(R.id.rvType)
+                recyclerView.layoutManager = GridLayoutManager(mContext, 3)
+                recyclerView.adapter = itemAdapter
+                addOnClickListener(R.id.clMore)
+                itemAdapter.setOnItemClickListener { _, _, postion ->
+                    itemClickFun?.invoke(item,postion)
+                }
+            }
+
+
+        }
+    }
+}

user/src/main/res/drawable/shape_0fffffff_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="#0FFFFFFF"/>
+    <corners android:radius="4dp"/>
+</shape>

user/src/main/res/layout/activity_store_list.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#030417"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <ImageView
+        android:background="@mipmap/bg_store"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_width="match_parent"
+        android:layout_height="300dp"/>
+
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/layout_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:layout_marginTop="25dp"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <FrameLayout
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginTop="81dp"
+        android:layout_width="match_parent"
+        android:layout_height="0dp">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/swagoRv"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </FrameLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

user/src/main/res/layout/dialog_store_detail.xml

@@ -0,0 +1,69 @@
+<?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:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+        <com.opensource.svgaplayer.SVGAImageView
+            android:id="@+id/svg_content"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:autoPlay="true"
+            app:fillMode="Forward"
+            app:layout_constraintDimensionRatio="h,1:1"
+            app:layout_constraintBottom_toTopOf="@+id/cl_bottom"
+            app:layout_constraintTop_toTopOf="parent"
+            app:loopCount="1" />
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_bottom"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="#0E0F26"
+            android:paddingBottom="24dp"
+            app:layout_constraintBottom_toBottomOf="parent">
+
+            <com.swago.baseswago.cusview.MediumTextView
+                android:id="@+id/tv_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="18dp"
+                android:maxWidth="120dp"
+                android:textColor="#ffffff"
+                android:textSize="16sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="fgg" />
+
+            <com.swago.baseswago.cusview.MediumTextView
+                android:id="@+id/tv_coin"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:drawableStart="@mipmap/ic_coin_store"
+                android:drawablePadding="2dp"
+                android:textColor="#A3FFFFFF"
+                android:textSize="14sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_name"
+                tools:text="fgg" />
+
+            <com.swago.baseswago.cusview.MediumTextView
+                android:layout_width="match_parent"
+                android:layout_height="44dp"
+                android:layout_marginStart="17dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginEnd="17dp"
+                android:background="@drawable/shape_9b20fc_20"
+                android:gravity="center"
+                android:text="Buy Now"
+                android:textColor="@color/_ffffff"
+                android:textSize="@dimen/sp_16"
+                app:layout_constraintTop_toBottomOf="@+id/tv_coin" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

user/src/main/res/layout/item_store.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
+        android:layout_marginTop="8dp"
+        android:background="@drawable/shape_0fffffff_4"
+        app:layout_constraintDimensionRatio="h,52:66"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/iv_svg"
+            android:layout_width="90dp"
+            android:layout_height="90dp"
+            android:src="@mipmap/bg_host_eight"
+            android:padding="@dimen/dp_4"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"/>
+        <com.swago.baseswago.cusview.MediumTextView
+            android:id="@+id/tv_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/iv_svg"
+            tools:text="fgg"
+            android:textSize="12sp"
+            android:maxWidth="120dp"
+            android:textColor="#ffffff"/>
+        <com.swago.baseswago.cusview.MediumTextView
+            android:id="@+id/tv_coin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:drawablePadding="2dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_name"
+            tools:text="fgg"
+            android:drawableStart="@mipmap/ic_coin_store"
+            android:textSize="10sp"
+            android:textColor="#A3FFFFFF"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

user/src/main/res/layout/item_type_store.xml

@@ -0,0 +1,57 @@
+<?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:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/clMore"
+        android:layout_width="match_parent"
+        android:layout_height="43dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.swago.baseswago.cusview.BoldTextView
+            android:id="@+id/tvType"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:textColor="#fff"
+            android:textSize="@dimen/sp_16"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="Enter" />
+
+        <com.swago.baseswago.cusview.MediumTextView
+            android:id="@+id/tvMore"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="2dp"
+            android:drawablePadding="2dp"
+            android:textColor="#99ffffff"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/ivMore"
+            app:layout_constraintTop_toTopOf="parent"
+            android:text="Show Less" />
+        <ImageView
+            android:id="@+id/ivMore"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:src="@mipmap/ic_show_more"
+            android:layout_marginEnd="16dp"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvType"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
+        app:layout_constraintTop_toBottomOf="@+id/clMore"/>
+</androidx.constraintlayout.widget.ConstraintLayout>