d

.idea/misc.xml

@@ -19,6 +19,9 @@
         <entry key="app/src/main/res/layout/activity_splash.xml" value="0.3259668508287293" />
         <entry key="app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.4015384615384615" />
         <entry key="app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml" value="0.39375" />
+        <entry key="baseswago/src/main/res/drawable/shape_161722_top_20.xml" value="0.283" />
+        <entry key="baseswago/src/main/res/drawable/shape_20000000_41.xml" value="0.2745" />
+        <entry key="baseswago/src/main/res/drawable/shape_2f3043_37.xml" value="0.283" />
         <entry key="baseswago/src/main/res/drawable/shape_80000000_20.xml" value="0.13229166666666667" />
         <entry key="baseswago/src/main/res/drawable/shape_9ffd88_5_stroke.xml" value="0.3145833333333333" />
         <entry key="baseswago/src/main/res/drawable/shape_9ffd88_63f2df.xml" value="0.39375" />
@@ -34,6 +37,7 @@
         <entry key="baseswago/src/main/res/drawable/shape_f7f8fa_5.xml" value="0.19895833333333332" />
         <entry key="baseswago/src/main/res/drawable/shape_fef0bf_30fef0bf_12.xml" value="0.20572916666666666" />
         <entry key="baseswago/src/main/res/drawable/shape_ff4747_ffe249_23.xml" value="0.20572916666666666" />
+        <entry key="baseswago/src/main/res/drawable/shape_ff56b7_37.xml" value="0.2745" />
         <entry key="baseswago/src/main/res/drawable/shape_ff9300_20.xml" value="0.21927083333333333" />
         <entry key="baseswago/src/main/res/drawable/shape_touming.xml" value="0.37333333333333335" />
         <entry key="baseswago/src/main/res/drawable/shape_tranparent.xml" value="0.2415" />
@@ -118,7 +122,7 @@
         <entry key="room/src/main/res/layout/layout_anchor_header_view.xml" value="0.33" />
         <entry key="room/src/main/res/layout/layout_svg_dan_dao_view.xml" value="0.36302083333333335" />
         <entry key="room/src/main/res/layout/layout_user_footer_view.xml" value="0.35688405797101447" />
-        <entry key="room/src/main/res/layout/layout_user_header_view.xml" value="0.3776041666666667" />
+        <entry key="room/src/main/res/layout/layout_user_header_view.xml" value="0.44811655680338547" />
         <entry key="room/src/main/res/layout/layout_user_room.xml" value="0.3776041666666667" />
         <entry key="room/src/main/res/layout/layout_view_stub_user_end.xml" value="0.309375" />
         <entry key="room/src/main/res/layout/layout_view_waft.xml" value="0.39166666666666666" />

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

@@ -3,6 +3,7 @@ package com.swago.baseswago
 import android.Manifest
 import android.os.Bundle
 import android.text.TextUtils
+import android.view.Gravity
 import android.view.View
 import android.widget.Toast
 import androidx.fragment.app.viewModels
@@ -51,6 +52,7 @@ class PersonDataDFragment : BaseXDFragment<DialogPersonDataBinding>() {
     }
 
     override fun initOther() {
+        setDimAmount(0f)
         arguments?.let {
             uid = it.getString("uid","")
             inRoom = it.getBoolean("inRoom")
@@ -59,33 +61,37 @@ class PersonDataDFragment : BaseXDFragment<DialogPersonDataBinding>() {
                 userVm.getOtherUserInfo(uid)
             }
 
+            if (inRoom){
+                setGravity(Gravity.BOTTOM)
+            }else{
+                setGravity(Gravity.CENTER)
+            }
 
 
             UserInfo.getUserInfo()?.let {
                 if (it.id == uid){
-                    binding.llSendGift.visibility = View.GONE
+                    binding.ivGift.visibility = View.GONE
                     binding.llChat.visibility = View.GONE
+                    binding.llToFollow.visibility = View.GONE
                     binding.ivMore.visibility = View.GONE
-                    binding.llFans.visibility = View.GONE
                     binding.ivReport.visibility = View.GONE
                 }else{
                     if (inRoom){
                         SwagoRoomManager.iRoomInfo?.let {
                             handleVm.getUserRoomAuth(uid,it.getRoomId())
                         }
-                        binding.llSendGift.visibility = View.VISIBLE
+                        binding.ivGift.visibility = View.VISIBLE
                     }else{
-                        binding.llSendGift.visibility = View.GONE
+                        binding.ivGift.visibility = View.GONE
                     }
                     binding.llChat.visibility = View.VISIBLE
                     binding.ivMore.visibility = View.VISIBLE
 
-                    binding.llFans.visibility = View.VISIBLE
                     binding.ivReport.visibility = View.VISIBLE
                 }
             }
 
-            binding.ivFollow.setOnClickListener(object:NoDoubleClickListener(){
+            binding.llToFollow.setOnClickListener(object:NoDoubleClickListener(){
                 override fun onClick() {
                     if (isFollow == 0){
                         userVm.followUser(uid,0)
@@ -120,7 +126,7 @@ class PersonDataDFragment : BaseXDFragment<DialogPersonDataBinding>() {
                 }
             })
 
-            binding.llSendGift.setOnClickListener(object:NoDoubleClickListener(){
+            binding.ivGift.setOnClickListener(object:NoDoubleClickListener(){
                 override fun onClick() {
                     openGiftDialog?.invoke(nickName,uid)
                     dismissAllowingStateLoss()
@@ -152,7 +158,6 @@ class PersonDataDFragment : BaseXDFragment<DialogPersonDataBinding>() {
                 .placeholder(R.mipmap.default_avatar)
                 .error(R.mipmap.default_avatar).into(binding.ivAvatar)
             binding.tvName.text = it.user_name
-            binding.tvSign.text = it.user_signature
             binding.tvFansNum.text = it.user_fans_num
             binding.tvFollowNum.text = it.user_follow_num
             binding.tvAccount.text =
@@ -161,7 +166,7 @@ class PersonDataDFragment : BaseXDFragment<DialogPersonDataBinding>() {
             if (isFollow == 1) {
                 binding.ivFollow.setImageResource(R.mipmap.followed)
             } else {
-                binding.ivFollow.setImageResource(R.mipmap.follow)
+                binding.ivFollow.setImageResource(R.mipmap.icon_info_follow)
             }
 
             if (it.user_sex == 1) {
@@ -185,7 +190,7 @@ class PersonDataDFragment : BaseXDFragment<DialogPersonDataBinding>() {
                 Toast.makeText(AppContext.getContext(), "Follow success", Toast.LENGTH_SHORT).show()
             } else {
                 isFollow = 0
-                binding.ivFollow.setImageResource(R.mipmap.follow)
+                binding.ivFollow.setImageResource(R.mipmap.icon_info_follow)
                 Toast.makeText(AppContext.getContext(), "Follow canceled", Toast.LENGTH_SHORT)
                     .show()
 

baseswago/src/main/java/com/swago/baseswago/baseroom/widget/RoomAdapter.kt

@@ -19,8 +19,6 @@ class RoomAdapter<T: IRoomInfo> :VerticalAdapter<T>(R.layout.item_room) {
         helper.apply {
             val ivCover = itemView.findViewById<ImageView>(R.id.ivCover)
             Glide.with(itemView.context).load(item.getRoomCover())
-                .placeholder(R.mipmap.default_avatar)
-                .error(R.mipmap.default_avatar)
                 .dontAnimate()
                 .apply(RequestOptions.bitmapTransform(BlurTransformation(5,100)))
                 .into(ivCover)

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#161722"/>
+    <corners android:topLeftRadius="20dp"
+        android:topRightRadius="20dp"/>
+</shape>

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

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

baseswago/src/main/res/drawable/shape_2f3043_37.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="#2f3043"/>
+    <corners android:radius="37dp"/>
+</shape>

baseswago/src/main/res/drawable/shape_ff56b7_37.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="#ff56b7"/>
+    <corners android:radius="37dp"/>
+</shape>

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

@@ -1,279 +1,271 @@
 <?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"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginStart="30dp"
-        android:layout_marginEnd="30dp"
-        android:background="@drawable/shape_white_20"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent">
 
-        <ImageView
-            android:id="@+id/ivBg"
-            android:background="@drawable/shape_9ffd88_6ef2df_top_20"
-            app:layout_constraintTop_toTopOf="parent"
-            android:layout_width="match_parent"
-            android:layout_height="125dp"/>
-
-        <ImageView
-            android:id="@+id/ivReport"
-            android:src="@mipmap/icon_report"
-            app:layout_constraintTop_toTopOf="@+id/tvName"
-            app:layout_constraintEnd_toStartOf="@+id/ivMore"
-            android:layout_marginEnd="10dp"
-            android:layout_width="20dp"
-            android:layout_height="20dp"/>
-
-        <ImageView
-            android:id="@+id/ivMore"
-            android:src="@mipmap/icon_more"
-            android:visibility="visible"
-            app:layout_constraintTop_toTopOf="@+id/tvName"
-            android:layout_marginEnd="10dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:layout_width="20dp"
-            android:layout_height="20dp"/>
 
-        <de.hdodenhof.circleimageview.CircleImageView
-            android:id="@+id/ivAvatar"
-            android:layout_marginStart="20dp"
-            android:layout_marginTop="20dp"
-            android:src="@mipmap/default_avatar"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:layout_width="50dp"
-            android:layout_height="50dp"/>
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="40dp"
+            android:background="@drawable/shape_161722_top_20"
+            app:layout_constraintTop_toTopOf="parent">
 
-        <ImageView
-            android:id="@+id/ivOnLive"
-            android:src="@mipmap/onlive"
-            android:visibility="gone"
-            app:layout_constraintStart_toStartOf="@+id/ivAvatar"
-            app:layout_constraintTop_toTopOf="@+id/ivAvatar"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            <ImageView
+                android:id="@+id/ivGift"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="16dp"
+                android:src="@mipmap/live_gift"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
 
-        <TextView
-            android:id="@+id/tvName"
-            android:textSize="18dp"
-            android:textColor="#000"
-            tools:text="Swago"
-            android:maxLines="1"
-            android:maxWidth="200dp"
-            android:layout_marginStart="20dp"
-            app:layout_constraintStart_toEndOf="@+id/ivAvatar"
-            app:layout_constraintTop_toTopOf="@+id/ivAvatar"
-            android:layout_marginTop="2dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-
-        <com.swago.baseswago.cusview.SwagoLevelView
-            android:id="@+id/tvLevelView"
-            app:layout_constraintStart_toEndOf="@+id/tvName"
-            app:layout_constraintTop_toTopOf="@+id/tvName"
-            app:layout_constraintBottom_toBottomOf="@+id/tvName"
-            android:layout_marginStart="7dp"
-            android:layout_marginTop="5dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            <ImageView
+                android:id="@+id/ivReport"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="10dp"
+                android:src="@mipmap/icon_report"
+                app:layout_constraintEnd_toStartOf="@+id/ivMore"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageView
-            android:id="@+id/ivVip"
-            android:src="@mipmap/vip"
-            app:layout_constraintStart_toEndOf="@+id/tvLevelView"
-            android:layout_marginStart="5dp"
-            android:layout_marginBottom="2dp"
-            tools:visibility="visible"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@+id/tvName"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            <ImageView
+                android:id="@+id/ivMore"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="16dp"
+                android:src="@mipmap/icon_more"
+                android:visibility="visible"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
 
-        <ImageView
-            android:id="@+id/ivSex"
-            app:layout_constraintEnd_toEndOf="@+id/ivAvatar"
-            app:layout_constraintBottom_toBottomOf="@+id/ivAvatar"
-            android:layout_marginTop="5dp"
-            android:src="@mipmap/info_female"
-            android:layout_marginStart="10dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            <com.swago.baseswago.cusview.MediumTextView
+                android:id="@+id/tvName"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="54dp"
+                android:maxWidth="200dp"
+                android:maxLines="1"
+                android:textColor="#fff"
+                android:textSize="18dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="Swago" />
 
 
-        <TextView
-            android:id="@+id/tvAccount"
-            app:layout_constraintStart_toEndOf="@+id/ivAvatar"
-            app:layout_constraintBottom_toBottomOf="@+id/ivAvatar"
-            android:layout_marginBottom="2dp"
-            android:layout_marginStart="20dp"
-            tools:text="ID:1323332"
-            android:textSize="12dp"
-            android:textColor="#868686"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            <com.swago.baseswago.cusview.MediumTextView
+                android:id="@+id/tvAccount"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="#868686"
+                android:textSize="12dp"
+                app:layout_constraintTop_toBottomOf="@+id/tvName"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                tools:text="ID:1323332" />
 
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="85dp"
-            android:background="@drawable/shape_white_20"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            <com.swago.baseswago.cusview.SwagoLevelView
+                android:id="@+id/tvLevelView"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                app:layout_constraintEnd_toStartOf="@+id/ivVip"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tvAccount" />
 
 
-            <TextView
-                android:id="@+id/tvSign"
-                app:layout_constraintStart_toStartOf="parent"
+            <ImageView
+                android:id="@+id/ivVip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:src="@mipmap/vip"
+                android:visibility="visible"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_margin="20dp"
-                android:layout_width="0dp"
-                android:textSize="12dp"
-                android:textColor="#868686"
-                tools:text="胜多负少的说法顺丰到付发送方发的发多少   是的的都是发送都是 都是"
-                android:layout_height="wrap_content"/>
+                app:layout_constraintStart_toEndOf="@+id/tvLevelView"
+                app:layout_constraintTop_toTopOf="@+id/tvLevelView"
+                app:layout_constraintBottom_toBottomOf="@+id/tvLevelView"
+                tools:visibility="visible" />
 
 
             <LinearLayout
                 android:id="@+id/llFollow"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tvSign"
-                android:layout_marginStart="20dp"
-                android:layout_marginBottom="40dp"
-                android:layout_marginTop="20dp"
-                android:orientation="horizontal"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:layout_marginTop="51dp"
+                android:orientation="horizontal"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/llFans"
+                app:layout_constraintTop_toBottomOf="@+id/tvName">
 
-                <TextView
+                <com.swago.baseswago.cusview.MediumTextView
                     android:id="@+id/tvFollowNum"
-                    android:textSize="24dp"
-                    android:textColor="#000"
-                    tools:text="24"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:textColor="#ffffff"
+                    android:textSize="14dp"
+                    tools:text="24" />
 
-                <TextView
-                    android:textColor="#868686"
-                    android:textSize="12dp"
+                <com.swago.baseswago.cusview.MediumTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:layout_marginStart="5dp"
                     android:text="@string/follow"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:textColor="#ffffff"
+                    android:textSize="14dp" />
 
             </LinearLayout>
 
 
             <LinearLayout
                 android:id="@+id/llFans"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tvSign"
-                android:layout_marginTop="20dp"
-                android:layout_marginStart="120dp"
-                android:layout_marginBottom="40dp"
-                android:orientation="horizontal"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:layout_marginTop="51dp"
+                android:layout_marginStart="20dp"
+                android:orientation="horizontal"
+                app:layout_constraintTop_toBottomOf="@+id/tvName"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/llFollow">
 
-                <TextView
+                <com.swago.baseswago.cusview.MediumTextView
                     android:id="@+id/tvFansNum"
-                    android:textSize="24dp"
-                    android:textColor="#000"
-                    tools:text="24"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:textColor="#fff"
+                    android:textSize="14dp"
+                    tools:text="24" />
 
-                <TextView
-                    android:textColor="#868686"
-                    android:textSize="12dp"
+                <com.swago.baseswago.cusview.MediumTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:layout_marginStart="5dp"
                     android:text="@string/fans"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:textColor="#fff"
+                    android:textSize="12dp" />
 
             </LinearLayout>
 
 
-            <ImageView
-                android:id="@+id/ivFollow"
-                android:src="@mipmap/follow"
-                app:layout_constraintEnd_toEndOf="parent"
-                android:layout_marginEnd="20dp"
-                app:layout_constraintTop_toTopOf="@+id/llFans"
-                app:layout_constraintBottom_toBottomOf="@+id/llFans"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
 
             <LinearLayout
                 android:id="@+id/llChat"
+                android:layout_width="150dp"
+                android:layout_height="44dp"
                 android:layout_marginTop="30dp"
-                android:layout_marginStart="20dp"
                 android:layout_marginEnd="20dp"
-                android:layout_marginBottom="10dp"
-                android:background="@drawable/shape_black_5"
-                app:layout_constraintTop_toBottomOf="@+id/llFans"
-                app:layout_constraintBottom_toTopOf="@+id/llSendGift"
+                android:background="@drawable/shape_2f3043_37"
                 android:gravity="center"
-                android:layout_width="match_parent"
-                android:layout_height="44dp">
+                android:layout_marginBottom="20dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/llToFollow"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/llFans">
 
                 <ImageView
-                    android:src="@mipmap/chat"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-                <TextView
-                    android:textSize="14dp"
+                    android:layout_height="wrap_content"
+                    android:src="@mipmap/chat" />
+
+                <com.swago.baseswago.cusview.MediumTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
                     android:text="@string/message"
                     android:textColor="#fff"
-                    android:layout_marginStart="10dp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:textSize="14dp" />
 
             </LinearLayout>
 
+
             <LinearLayout
-                android:id="@+id/llSendGift"
-                android:layout_marginStart="20dp"
-                android:layout_marginEnd="20dp"
-                android:visibility="gone"
-                tools:visibility="visible"
-                android:background="@drawable/shape_9ffd88_6ef2df"
-                app:layout_constraintTop_toBottomOf="@+id/llChat"
-                app:layout_constraintBottom_toBottomOf="parent"
-                android:layout_marginBottom="10dp"
+                android:id="@+id/llToFollow"
+                android:layout_width="150dp"
+                android:layout_height="44dp"
+                android:layout_marginStart="12dp"
+                android:layout_marginTop="30dp"
+                android:background="@drawable/shape_ff56b7_37"
                 android:gravity="center"
-                android:layout_width="match_parent"
-                android:layout_height="44dp">
+                android:layout_marginBottom="20dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/llChat"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/llFans">
 
                 <ImageView
-                    android:src="@mipmap/live_gift"
+                    android:id="@+id/ivFollow"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:src="@mipmap/icon_info_follow" />
 
-                <TextView
-                    android:textSize="14dp"
-                    android:text="@string/send_gift"
-                    android:textColor="#fff"
-                    android:layout_marginStart="10dp"
+                <com.swago.baseswago.cusview.MediumTextView
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="@string/follow"
+                    android:textColor="#fff"
+                    android:textSize="14dp" />
 
             </LinearLayout>
 
 
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <ImageView
+            android:id="@+id/ivSex"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="5dp"
+            android:src="@mipmap/info_female"
+            app:layout_constraintBottom_toBottomOf="@+id/ivAvatar"
+            app:layout_constraintEnd_toEndOf="@+id/ivAvatar" />
 
 
 
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/ivAvatar"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:layout_marginStart="20dp"
+            android:src="@mipmap/default_avatar"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+        <ImageView
+            android:id="@+id/ivOnLive"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@mipmap/onlive"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="@+id/ivAvatar"
+            app:layout_constraintEnd_toEndOf="@+id/ivAvatar"
+            tools:visibility="visible" />
+
+
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -65,8 +65,7 @@
         android:id="@+id/tvLevelView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="7dp"
-        android:layout_marginTop="5dp"
+        android:layout_marginStart="3dp"
         app:layout_constraintBottom_toBottomOf="@+id/tvName"
         app:layout_constraintStart_toEndOf="@+id/tvName"
         app:layout_constraintTop_toTopOf="@+id/tvName" />
@@ -76,9 +75,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="5dp"
-        android:layout_marginBottom="2dp"
         android:src="@mipmap/vip"
         android:visibility="visible"
+        app:layout_constraintTop_toTopOf="@+id/tvName"
         app:layout_constraintBottom_toBottomOf="@+id/tvName"
         app:layout_constraintStart_toEndOf="@+id/tvLevelView"
         tools:visibility="visible" />

room/src/main/java/com/swago/room/game/GamePlayDialog.kt

@@ -110,7 +110,7 @@ class GamePlayDialog : BaseXDFragment<DialogGamePlayBinding>(),IRoomActiveListen
                 UserInfo.getUserInfo()?.let { userInfoModel ->
                     UserInfo.getLoginModel()?.let { loginModel ->
                         val gameInfoModel = GameInfoModel(
-                            it.getRoomId(),
+                            (it as UserRoomModel).roomModel?.broadcast_id?:"",
                             userInfoModel.id,
                             it.getAnchorId(),
                             it.getAnchorType(),

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

@@ -146,8 +146,6 @@ class UserRoomActivity : AbsUserActivity<ActivityAbsRoomUserBinding, UserRoomMod
         ivCover?.let {
             Glide.with(this)
                 .load(iRoomInfo.getRoomCover())
-                .placeholder(R.mipmap.default_avatar)
-                .error(R.mipmap.default_avatar)
                 .dontAnimate()
                 .apply(RequestOptions.bitmapTransform(BlurTransformation(5, 100)))
                 .into(it)

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

@@ -54,7 +54,7 @@ class ComHeaderView  : ConstraintLayout, IRoomActiveListener, IHeader {
         binding.rvUser.layoutManager = LinearLayoutManager(context,RecyclerView.HORIZONTAL,false)
         binding.rvUser.adapter = adapter
 
-        binding.ivFollow.setOnClickListener(object : NoDoubleClickListener() {
+        binding.tvFollow.setOnClickListener(object : NoDoubleClickListener() {
             override fun onClick() {
                 SwagoRoomManager.iRoomInfo?.let {
                     followFun?.invoke(it.getAnchorId())
@@ -115,12 +115,12 @@ class ComHeaderView  : ConstraintLayout, IRoomActiveListener, IHeader {
         binding.tvIncome.text = iRoomInfo.getRoomIncome()
 
         if (SwagoRoomManager.roleType == RoleType.anchor){
-            binding.ivFollow.visibility = View.GONE
+            binding.tvFollow.visibility = View.GONE
         }else{
             if (iRoomInfo.getIsFollow()==1){
-                binding.ivFollow.visibility = View.GONE
+                binding.tvFollow.visibility = View.GONE
             }else{
-                binding.ivFollow.visibility = View.VISIBLE
+                binding.tvFollow.visibility = View.VISIBLE
             }
         }
     }
@@ -144,7 +144,7 @@ class ComHeaderView  : ConstraintLayout, IRoomActiveListener, IHeader {
     }
 
     fun setFollow(){
-        binding.ivFollow.visibility = View.GONE
+        binding.tvFollow.visibility = View.GONE
     }
 
 

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

@@ -14,13 +14,13 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         android:layout_width="wrap_content"
-        android:layout_marginStart="10dp"
-        android:background="@drawable/shape_white_20"
-        android:layout_height="45dp">
+        android:layout_marginStart="12dp"
+        android:background="@drawable/shape_20000000_41"
+        android:layout_height="34dp">
 
         <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/ivAvatar"
-            android:layout_marginStart="8dp"
+            android:layout_marginStart="2dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -34,12 +34,12 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent">
 
-            <TextView
+            <com.swago.baseswago.cusview.MediumTextView
                 android:id="@+id/tvName"
                 android:textSize="14dp"
-                android:textColor="#000"
+                android:textColor="#fff"
                 app:layout_constraintTop_toTopOf="parent"
-                android:layout_marginTop="4dp"
+                android:layout_marginTop="2dp"
                 android:layout_marginStart="8dp"
                 android:layout_marginEnd="8dp"
                 android:maxLines="1"
@@ -51,12 +51,12 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
 
-            <TextView
+            <com.swago.baseswago.cusview.RegularTextView
                 android:id="@+id/tvId"
-                android:textSize="12dp"
-                android:textColor="#868686"
+                android:textSize="8dp"
+                android:textColor="#fff"
                 app:layout_constraintBottom_toBottomOf="parent"
-                android:layout_marginBottom="4dp"
+                android:layout_marginBottom="2dp"
                 android:layout_marginStart="8dp"
                 android:layout_marginEnd="8dp"
                 android:maxWidth="120dp"
@@ -70,18 +70,24 @@
 
         </LinearLayout>
 
-        <ImageView
-            android:id="@+id/ivFollow"
-            android:src="@mipmap/follow"
+        <com.swago.baseswago.cusview.MediumTextView
+            android:id="@+id/tvFollow"
+            android:background="@drawable/shape_ff56b7_37"
             app:layout_constraintTop_toTopOf="@+id/cl"
             app:layout_constraintStart_toEndOf="@+id/ll"
             android:visibility="gone"
             tools:visibility="visible"
+            android:textSize="12dp"
+            android:textColor="#fff"
+            android:text="@string/follow"
+            android:gravity="center"
+            android:paddingStart="10dp"
+            android:paddingEnd="10dp"
             app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginEnd="10dp"
+            android:layout_marginEnd="2dp"
             app:layout_constraintBottom_toBottomOf="@+id/cl"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            android:layout_height="30dp"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -96,15 +102,15 @@
         android:layout_width="0dp"
         android:layout_height="30dp"/>
 
-    <TextView
+    <com.swago.baseswago.cusview.RegularTextView
         android:id="@+id/tvIncome"
         android:textSize="12dp"
         android:textColor="#fff"
-        tools:text="1000"
+        tools:text="0000000000"
         android:paddingStart="10dp"
         android:paddingEnd="10dp"
         android:drawablePadding="4dp"
-        android:background="@drawable/shape_80000000_20"
+        android:background="@drawable/shape_20000000_41"
         app:layout_constraintStart_toStartOf="@+id/cl"
         android:layout_marginTop="10dp"
         android:gravity="center"
@@ -114,16 +120,16 @@
         android:layout_width="wrap_content"
         android:layout_height="24dp"/>
 
-    <TextView
+    <com.swago.baseswago.cusview.RegularTextView
         android:id="@+id/tvHot"
         android:textSize="12dp"
         android:textColor="#fff"
-        tools:text="1000"
+        tools:text="0000000000"
         android:paddingStart="10dp"
         android:paddingEnd="10dp"
         android:drawablePadding="4dp"
         android:maxLines="1"
-        android:background="@drawable/shape_80000000_20"
+        android:background="@drawable/shape_20000000_41"
         app:layout_constraintStart_toEndOf="@+id/tvIncome"
         android:layout_marginTop="10dp"
         android:layout_marginStart="10dp"
@@ -132,4 +138,5 @@
         android:drawableStart="@mipmap/hot"
         android:layout_width="wrap_content"
         android:layout_height="24dp"/>
+
 </androidx.constraintlayout.widget.ConstraintLayout>

user/src/main/java/com/swago/user/EditDialog.kt

@@ -44,14 +44,15 @@ class EditDialog : BaseXDFragment<DialogEditBinding>() {
     override fun initOther() {
         binding.tvCancel.setOnClickListener(object:NoDoubleClickListener(){
             override fun onClick() {
-                activity?.let { KeyboardUtils.hideSoftInput(it) }
+                KeyboardUtils.hideSoftInput(binding.etContent)
                 dismissAllowingStateLoss()
             }
         })
 
         binding.tvConfirm.setOnClickListener(object:NoDoubleClickListener(){
             override fun onClick() {
-                activity?.let { KeyboardUtils.hideSoftInput(it) }
+                KeyboardUtils.hideSoftInput(binding.etContent)
+                content = binding.etContent.text.toString().trim()
                 callback?.invoke(content)
                 dismissAllowingStateLoss()
             }

user/src/main/java/com/swago/user/EditInfoActivity.kt

@@ -127,6 +127,7 @@ class EditInfoActivity : BaseXActivity<ActivityUserEditBinding>() {
                 EditDialog.newInstance(1,name).apply {
                     callback = {
                         name = it
+                        this@EditInfoActivity.binding.tvEditName.text = name
                     }
                 }.show(supportFragmentManager,"EditDialog")
             }
@@ -137,6 +138,7 @@ class EditInfoActivity : BaseXActivity<ActivityUserEditBinding>() {
                 EditDialog.newInstance(2,sign).apply {
                     callback = {
                         sign = it
+                        this@EditInfoActivity.binding.tvEditSign.text = sign
                     }
                 }.show(supportFragmentManager,"EditDialog")
             }

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

@@ -195,7 +195,7 @@
         android:paddingStart="20dp"
         android:paddingEnd="20dp"
         android:layout_marginTop="8dp"
-        android:text="@string/country"
+        android:text="@string/sign"
         android:textColor="#131B23"
         android:textSize="16dp" />
 
@@ -209,7 +209,10 @@
         android:layout_marginEnd="37dp"
         android:gravity="center_vertical"
         android:layout_marginTop="8dp"
+        android:maxWidth="200dp"
         tools:text="female"
+        android:maxLines="1"
+        android:ellipsize="end"
         android:textColor="#435568"
         android:textSize="14dp" />