diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java
index e823f736..6f3a1c5c 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java
@@ -49,7 +49,7 @@ public class UserInfo extends BaseEvent implements Serializable {
     private String chat_bubble;//聊天气泡
     private String charm;//魅力值
     private String room_id;
-    private String guild;//公会名称
+    private String guild = "";//公会名称
     private String is_mute;//禁言状态 0否 1是
     private String is_mute_pit;//禁麦状态 0否 1是
     private String is_manager;//是否是管理员 0否 1是
@@ -82,8 +82,56 @@ public class UserInfo extends BaseEvent implements Serializable {
     private String enter_text;//爵位飘屏的文字
     private int singer_status;//歌手认证状态0-待审核，1-通过，2-拒绝 -1：未认证
     private int singer_level;//歌手等级
+    private CpInfo cp_info ;
 
 
+      /*"cp_info": {
+        "name": "string",
+                "user_id1": "string",
+                "user_id2": "string",
+                "level": "string",
+                "exp": "string",
+                "pendant": "string",
+                "direction": "string",
+
+    }*/
+    public static class CpInfo{
+          public String name;
+          public String level;
+          public String exp;
+          public String pendant;
+          public String direction;
+          public UserInfo1 user_info1;
+          public UserInfo1 user_info2;
+
+        public static class UserInfo1{
+            public String user_id;
+            public String nickname;
+            public String avatar;
+            public String dress;
+        }
+
+          public static class UserInfo2{
+              public String user_id;
+              public String nickname;
+              public String avatar;
+              public String dress;
+        }
+         /*"user_info1": {
+              "user_id": "string",
+                      "nickname": "string",
+                      "avatar": "string",
+                      "dress": "string"
+          },
+                  "user_info2": {
+              "user_id": "string",
+                      "nickname": "string",
+                      "avatar": "string",
+                      "dress": "string"
+          }*/
+
+    }
+
     //    @Data
 //    public static class  TagList{
 //        private String id;
diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_dialog_u_bg.png b/BaseModule/src/main/res/mipmap-hdpi/icon_dialog_u_bg.png
new file mode 100644
index 00000000..cb2e2486
Binary files /dev/null and b/BaseModule/src/main/res/mipmap-hdpi/icon_dialog_u_bg.png differ
diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_dialog_u_cp_.png b/BaseModule/src/main/res/mipmap-hdpi/icon_dialog_u_cp_.png
new file mode 100644
index 00000000..837eec2f
Binary files /dev/null and b/BaseModule/src/main/res/mipmap-hdpi/icon_dialog_u_cp_.png differ
diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_dialog_u_cp_bg.png b/BaseModule/src/main/res/mipmap-hdpi/icon_dialog_u_cp_bg.png
new file mode 100644
index 00000000..c5d3297f
Binary files /dev/null and b/BaseModule/src/main/res/mipmap-hdpi/icon_dialog_u_cp_bg.png differ
diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_dialog_u_cp_left_top.png b/BaseModule/src/main/res/mipmap-hdpi/icon_dialog_u_cp_left_top.png
new file mode 100644
index 00000000..45e9c59a
Binary files /dev/null and b/BaseModule/src/main/res/mipmap-hdpi/icon_dialog_u_cp_left_top.png differ
diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_dialog_u_cp_lv.png b/BaseModule/src/main/res/mipmap-hdpi/icon_dialog_u_cp_lv.png
new file mode 100644
index 00000000..fb90693f
Binary files /dev/null and b/BaseModule/src/main/res/mipmap-hdpi/icon_dialog_u_cp_lv.png differ
diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_dialog_u_master.png b/BaseModule/src/main/res/mipmap-hdpi/icon_dialog_u_master.png
new file mode 100644
index 00000000..7fcc242e
Binary files /dev/null and b/BaseModule/src/main/res/mipmap-hdpi/icon_dialog_u_master.png differ
diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_dialog_u_bg.png b/BaseModule/src/main/res/mipmap-xhdpi/icon_dialog_u_bg.png
new file mode 100644
index 00000000..3505cad8
Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xhdpi/icon_dialog_u_bg.png differ
diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_dialog_u_cp_.png b/BaseModule/src/main/res/mipmap-xhdpi/icon_dialog_u_cp_.png
new file mode 100644
index 00000000..37e25516
Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xhdpi/icon_dialog_u_cp_.png differ
diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_dialog_u_cp_bg.png b/BaseModule/src/main/res/mipmap-xhdpi/icon_dialog_u_cp_bg.png
new file mode 100644
index 00000000..87f54838
Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xhdpi/icon_dialog_u_cp_bg.png differ
diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_dialog_u_cp_left_top.png b/BaseModule/src/main/res/mipmap-xhdpi/icon_dialog_u_cp_left_top.png
new file mode 100644
index 00000000..d5369578
Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xhdpi/icon_dialog_u_cp_left_top.png differ
diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_dialog_u_cp_lv.png b/BaseModule/src/main/res/mipmap-xhdpi/icon_dialog_u_cp_lv.png
new file mode 100644
index 00000000..f60f156b
Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xhdpi/icon_dialog_u_cp_lv.png differ
diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_dialog_u_master.png b/BaseModule/src/main/res/mipmap-xhdpi/icon_dialog_u_master.png
new file mode 100644
index 00000000..4ca7cf69
Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xhdpi/icon_dialog_u_master.png differ
diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_dialog_u_bg.png b/BaseModule/src/main/res/mipmap-xxhdpi/icon_dialog_u_bg.png
new file mode 100644
index 00000000..cc5c80cf
Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xxhdpi/icon_dialog_u_bg.png differ
diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_dialog_u_cp_.png b/BaseModule/src/main/res/mipmap-xxhdpi/icon_dialog_u_cp_.png
new file mode 100644
index 00000000..dcc26153
Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xxhdpi/icon_dialog_u_cp_.png differ
diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_dialog_u_cp_bg.png b/BaseModule/src/main/res/mipmap-xxhdpi/icon_dialog_u_cp_bg.png
new file mode 100644
index 00000000..1513dfe0
Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xxhdpi/icon_dialog_u_cp_bg.png differ
diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_dialog_u_cp_left_top.png b/BaseModule/src/main/res/mipmap-xxhdpi/icon_dialog_u_cp_left_top.png
new file mode 100644
index 00000000..99eb2799
Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xxhdpi/icon_dialog_u_cp_left_top.png differ
diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_dialog_u_cp_lv.png b/BaseModule/src/main/res/mipmap-xxhdpi/icon_dialog_u_cp_lv.png
new file mode 100644
index 00000000..f18e400a
Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xxhdpi/icon_dialog_u_cp_lv.png differ
diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_dialog_u_master.png b/BaseModule/src/main/res/mipmap-xxhdpi/icon_dialog_u_master.png
new file mode 100644
index 00000000..188a2557
Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xxhdpi/icon_dialog_u_master.png differ
diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
index 58e7770f..963a0412 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
@@ -22,6 +22,7 @@ import android.widget.TextView;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.xscm.modulemain.R;
 import com.xscm.modulemain.activity.room.contacts.RoomUserContacts;
+import com.xscm.modulemain.activity.user.activity.GiftWallActivity;
 import com.xscm.modulemain.databinding.FragmentRoomUserInfoBinding;
 import com.xscm.modulemain.activity.room.fragment.RelationshipFragment;
 import com.xscm.modulemain.activity.room.presenter.RoomUserPresenter;
@@ -172,8 +173,8 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
         mBinding.moreButton.setOnClickListener(this::onClick);
         mBinding.imQml.setOnClickListener(this::onClick);
 
-        ThemeableDrawableUtils.setThemeableRoundedBackground(mBinding.roomMCz, ColorManager.getInstance().getPrimaryColorInt(), 65);
-        mBinding.roomMCz.setTextColor(ColorManager.getInstance().getButtonColorInt());
+//        ThemeableDrawableUtils.setThemeableRoundedBackground(mBinding.roomMCz, ColorManager.getInstance().getPrimaryColorInt(), 65);
+//        mBinding.roomMCz.setTextColor(ColorManager.getInstance().getButtonColorInt());
         mBinding.moreButton.setTextColor(ColorManager.getInstance().getPrimaryColorInt());
 
     }
@@ -201,7 +202,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
             mCustomPopWindow = new CustomPopWindow.PopupWindowBuilder(getContext())
                     .setView(contentView)
                     .create()
-                    .showAsDropDown(mBinding.roomMCz, 0, 20);
+                    .showAsDropDown(mBinding.roomDian, 0, 20);
         } else if (id == R.id.im_room_t) {
             userInfo.setTa("1");
             EventBus.getDefault().post(userInfo);
@@ -225,7 +226,8 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
         } else if (id == R.id.room_lh) {
             MvpPre.addBlackList(user_id);
         } else if (id == R.id.room_rl_gift) {
-            ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).withString("userId", userInfo.getUser_id() + "").withInt("type", 1).navigation();
+//            ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).withString("userId", userInfo.getUser_id() + "").withInt("type", 1).navigation();
+            startActivity(new Intent(getContext(), GiftWallActivity.class));
         } else if (id == R.id.room_jb) {
             Intent intent = new Intent(getActivity(), WebViewActivity.class);
             intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_REPORT_URL(),SpUtil.getToken(),1,user_id));
@@ -382,7 +384,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
         this.userInfo = userInfo1;
         mBinding.ivAvatar.setData(userInfo.getAvatar(), "", userInfo.getNobility_image() + "");
         String sex = userInfo.getSex()==1?"男":"女";
-        mBinding.tvId.setText(sex+" | ID:"+userInfo.getUser_code());
+        mBinding.tvId.setText(sex+" ID:"+userInfo.getUser_code());
         mBinding.tvName.setText(userInfo.getNickname());
 
         if (!userInfo.getNickname_color().isEmpty()){
@@ -402,9 +404,11 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
         }
 
         if (userInfo.getIs_follow() == 1) {
-            mBinding.imRoomGz.setImageDrawable(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.room_ygz));
+//            mBinding.imRoomGz.setImageDrawable(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.room_ygz));
+            mBinding.imRoomGz.setText("已关注");
         } else {
-            mBinding.imRoomGz.setImageDrawable(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.room_gz));
+//            mBinding.imRoomGz.setImageDrawable(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.room_gz));
+            mBinding.imRoomGz.setText("+ 关注");
         }
 
         if (userInfo.getIs_room_owner().equals("1")) {
@@ -419,12 +423,29 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
 
         if (userInfo != null) {
             mBinding.tvGh.setVisibility(VISIBLE);
-            mBinding.tvGh.setText("所属公会：" + ((userInfo.getGuild() != null && !userInfo.getGuild().isEmpty()) ? userInfo.getGuild() : "无"));
+            mBinding.tvJoinGuild.setVisibility(GONE);
+            if (userInfo.getGuild().isEmpty()){
+                mBinding.tvGh.setText("所属公会：无");
+            }else {
+                if (userInfo.getUser_id() != SpUtil.getUserId()) {
+                    mBinding.tvJoinGuild.setVisibility(VISIBLE);
+                }
+                mBinding.tvGh.setText("所属公会：" + userInfo.getGuild());
+            }
         } else {
             mBinding.tvGh.setVisibility(GONE);
+            mBinding.tvJoinGuild.setVisibility(GONE);
         }
         mBinding.tvTs.setText(String.format("90天内累计收到 %s 个礼物", userInfo.getGift_num()));
 
+        mBinding.tvJoinGuild.setOnClickListener(v -> {
+            //跳转加入公会
+            Intent intent=new Intent(getContext(), WebViewActivity.class);
+            intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_GUILD_URL(),SpUtil.getToken()));
+            intent.putExtra("title", "公会");
+            startActivity(intent);
+        });
+
         updateUIBasedOnTypeAndUser();
         dianj(1);
     }
@@ -436,7 +457,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
             setTextViewStyle(mBinding.textView1, true);
             if (userInfo.getQinmi() != null && !userInfo.getQinmi().equals("")) {
                 mBinding.ll.setVisibility(VISIBLE);
-                mBinding.ll.setBackgroundResource(com.xscm.moduleutil.R.mipmap.guxi_k);
+//                mBinding.ll.setBackgroundResource(com.xscm.moduleutil.R.mipmap.guxi_k);
                 ImageUtils.loadHeadCC(userInfo.getQinmi().getAvatar1(), mBinding.userNav1);
                 ImageUtils.loadHeadCC(userInfo.getQinmi().getAvatar2(), mBinding.userNav2);
                 mBinding.tvNickname1.setText(userInfo.getQinmi().getNickname1());
@@ -452,7 +473,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
             setTextViewStyle(mBinding.textView1, false);
             if (userInfo.getZhenai() != null && !userInfo.getZhenai().equals("")) {
                 mBinding.ll.setVisibility(VISIBLE);
-                mBinding.ll.setBackgroundResource(com.xscm.moduleutil.R.mipmap.guxi_w);
+//                mBinding.ll.setBackgroundResource(com.xscm.moduleutil.R.mipmap.guxi_w);
 //                mBinding.rlReqit.setBackgroundResource(com.qxcm.moduleutil.R.mipmap.guanxiw_z);
                 ImageUtils.loadHeadCC(userInfo.getZhenai().getAvatar1(), mBinding.userNav1);
                 ImageUtils.loadHeadCC(userInfo.getZhenai().getAvatar2(), mBinding.userNav2);
@@ -688,10 +709,12 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
     public void userGuanzSuccess(String s) {
         if (userInfo.getIs_follow() == 1) {
             userInfo.setIs_follow(0);
-            mBinding.imRoomGz.setImageDrawable(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.room_gz));
+//            mBinding.imRoomGz.setImageDrawable(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.room_gz));
+            mBinding.imRoomGz.setText("已关注");
         } else {
             userInfo.setIs_follow(1);
-            mBinding.imRoomGz.setImageDrawable(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.room_ygz));
+//            mBinding.imRoomGz.setImageDrawable(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.room_ygz));
+            mBinding.imRoomGz.setText("+ 关注");
         }
     }
 
diff --git a/MainModule/src/main/res/drawable/dialog_user_info_bg.xml b/MainModule/src/main/res/drawable/dialog_user_info_bg.xml
new file mode 100644
index 00000000..05e5bf36
--- /dev/null
+++ b/MainModule/src/main/res/drawable/dialog_user_info_bg.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="180"
+        android:endColor="#ff093a1f"
+        android:startColor="#176D33"
+        android:type="linear"
+        android:useLevel="true" />
+    <corners
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="0dp"
+        android:topLeftRadius="14dp"
+        android:topRightRadius="14dp" />
+</shape>
\ No newline at end of file
diff --git a/MainModule/src/main/res/drawable/shape_15.xml b/MainModule/src/main/res/drawable/shape_15.xml
new file mode 100644
index 00000000..b1d861fe
--- /dev/null
+++ b/MainModule/src/main/res/drawable/shape_15.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="@dimen/dp_15"/>
+    <solid android:color="@android:color/white"/>
+</shape>
\ No newline at end of file
diff --git a/MainModule/src/main/res/layout/fragment_room_user_info.xml b/MainModule/src/main/res/layout/fragment_room_user_info.xml
index 3dd44214..1b96c197 100644
--- a/MainModule/src/main/res/layout/fragment_room_user_info.xml
+++ b/MainModule/src/main/res/layout/fragment_room_user_info.xml
@@ -16,76 +16,135 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_33"
-            android:background="@mipmap/room_user_bj"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
+            android:background="@mipmap/icon_dialog_u_bg"
+            android:paddingStart="@dimen/dp_10"
+            android:paddingEnd="@dimen/dp_20"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
 
+            <com.xscm.moduleutil.utils.MeHeadView
+                android:id="@+id/iv_avatar"
+                android:layout_width="@dimen/dp_90"
+                android:layout_height="@dimen/dp_90"
+                android:layout_marginVertical="@dimen/dp_32"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <com.xscm.moduleutil.utils.MeHeadView
+                android:id="@+id/iv_right_avatar"
+                android:layout_width="@dimen/dp_44"
+                android:layout_height="@dimen/dp_44"
+                android:layout_marginStart="-15dp"
+                android:visibility="gone"
+                app:layout_constraintStart_toEndOf="@+id/iv_avatar"
+                app:layout_constraintTop_toTopOf="@+id/iv_avatar" />
+
+
             <com.xscm.moduleutil.widget.ShineTextView
                 android:id="@+id/tv_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_38"
+                android:layout_marginStart="@dimen/dp_10"
+                android:ellipsize="end"
+                android:lines="1"
+                android:maxWidth="@dimen/dp_100"
                 android:text="用户名"
-                android:textColor="#ffffff"
-                android:textSize="@dimen/sp_14"
+                android:textColor="#52FF96"
+                android:textSize="@dimen/sp_18"
                 app:isShine="false"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="@+id/iv_avatar"
+                app:layout_constraintTop_toBottomOf="@+id/iv_avatar" />
+
+
+            <TextView
+                android:id="@+id/im_room_gz"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_22"
+                android:layout_marginStart="@dimen/dp_10"
+                android:background="@drawable/shape_15"
+                android:backgroundTint="#52FF96"
+                android:gravity="center"
+                android:paddingHorizontal="@dimen/dp_6"
+                android:text="+ 关注"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_12"
+                app:layout_constraintBottom_toBottomOf="@+id/tv_name"
+                app:layout_constraintStart_toEndOf="@+id/tv_name"
+                app:layout_constraintTop_toTopOf="@+id/tv_name" />
+
+            <ImageView
+                android:id="@+id/im_qml"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_22"
+                android:layout_marginEnd="@dimen/dp_10"
+                android:src="@mipmap/qgrml"
+                app:layout_constraintBottom_toBottomOf="@+id/room_m_cz"
+                app:layout_constraintEnd_toStartOf="@+id/room_m_cz"
+                app:layout_constraintTop_toTopOf="@+id/room_m_cz" />
 
-                />
 
             <TextView
                 android:id="@+id/tv_id"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_3"
+                android:layout_marginTop="@dimen/dp_13"
                 android:text="Lv.1"
-                android:textColor="#ffffff"
-                android:textSize="@dimen/sp_12"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
+                android:textColor="@color/colorWhite65"
+                android:textSize="@dimen/sp_10"
+                app:layout_constraintStart_toStartOf="@+id/tv_name"
                 app:layout_constraintTop_toBottomOf="@+id/tv_name" />
 
             <TextView
                 android:id="@+id/tv_gh"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_3"
+                android:ellipsize="end"
+                android:lines="1"
+                android:maxWidth="@dimen/dp_120"
                 android:text="所属公会:"
-                android:textColor="#ffffff"
-                android:textSize="@dimen/sp_12"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
+                android:textColor="@color/colorWhite65"
+                android:textSize="@dimen/sp_10"
+                android:layout_marginTop="@dimen/dp_5"
+                app:layout_constraintStart_toStartOf="@+id/tv_id"
                 app:layout_constraintTop_toBottomOf="@+id/tv_id" />
 
-            <LinearLayout
-                android:id="@+id/line"
+            <TextView
+                android:id="@+id/tv_join_guild"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_3"
-                android:orientation="horizontal"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tv_gh" />
+                android:layout_marginStart="@dimen/dp_5"
+                android:text="立即加入"
+                android:textColor="#FF52FF96"
+                android:textSize="@dimen/sp_12"
+                app:layout_constraintBottom_toBottomOf="@+id/tv_gh"
+                app:layout_constraintStart_toEndOf="@+id/tv_gh" />
+
+            <com.google.android.flexbox.FlexboxLayout
+                android:id="@+id/flex_entry"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_10"
+                app:alignContent="flex_start"
+                app:alignItems="flex_start"
+                app:flexWrap="wrap"
+                app:layout_constraintStart_toStartOf="@+id/tv_name"
+                app:layout_constraintTop_toBottomOf="@+id/tv_id" />
 
             <TextView
                 android:id="@+id/jianj"
-                android:layout_width="@dimen/dp_120"
-                android:layout_height="@dimen/dp_18"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
                 android:ellipsize="end"
-                android:singleLine="true"
+                android:lines="1"
+                android:maxLines="2"
                 android:text="个人介绍"
                 android:textColor="@color/color_FF999999"
-                android:textSize="@dimen/sp_12"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/line" />
+                android:textSize="@dimen/sp_13"
+                android:visibility="gone"
+                app:layout_constraintStart_toStartOf="@+id/tv_name"
+                app:layout_constraintTop_toBottomOf="@+id/flex_entry" />
 
             <TextView
                 android:id="@+id/tv_zb"
@@ -113,26 +172,16 @@
                 app:layout_constraintTop_toTopOf="parent" />
 
 
-            <ImageView
-                android:id="@+id/im_qml"
-                android:layout_width="@dimen/dp_66"
-                android:layout_height="@dimen/dp_20"
-                android:layout_marginStart="@dimen/dp_22"
-                android:layout_marginTop="@dimen/dp_25"
-                android:src="@mipmap/qgrml"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/kb" />
-
             <ImageView
                 android:id="@+id/im_gs"
-                android:layout_width="@dimen/dp_66"
-                android:layout_height="@dimen/dp_20"
-                android:layout_marginStart="@dimen/dp_22"
-                android:layout_marginTop="@dimen/dp_25"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_marginEnd="@dimen/dp_8"
                 android:src="@mipmap/gsui"
                 android:visibility="gone"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/im_qml"
+                app:layout_constraintEnd_toStartOf="@+id/room_m_cz"
+                app:layout_constraintTop_toBottomOf="@+id/room_m_cz"
+                app:layout_constraintTop_toTopOf="@+id/room_m_cz"
                 tools:visibility="visible" />
 
 
@@ -150,13 +199,16 @@
 
             <TextView
                 android:id="@+id/room_m_cz"
-                android:layout_width="@dimen/dp_44"
+                android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_24"
-                android:layout_marginTop="@dimen/dp_22"
-                android:layout_marginEnd="@dimen/dp_64"
+                android:layout_marginTop="@dimen/dp_13"
+                android:layout_marginEnd="@dimen/dp_34"
+                android:background="@drawable/shape_15"
+                android:backgroundTint="#FF3ABC6D"
                 android:gravity="center"
+                android:paddingHorizontal="@dimen/dp_8"
                 android:text="上麦"
-                android:textColor="@color/color_FF333333"
+                android:textColor="@color/white"
                 android:textSize="@dimen/sp_12"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -165,8 +217,7 @@
                 android:id="@+id/room_dian"
                 android:layout_width="@dimen/dp_16"
                 android:layout_height="@dimen/dp_16"
-                android:layout_marginTop="@dimen/dp_22"
-                android:layout_marginEnd="@dimen/dp_22"
+                android:layout_marginTop="@dimen/dp_13"
                 android:src="@mipmap/room_dian"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -175,8 +226,8 @@
                 android:id="@+id/room_jb"
                 android:layout_width="@dimen/dp_44"
                 android:layout_height="@dimen/dp_20"
-                android:layout_marginTop="@dimen/dp_25"
                 android:layout_marginEnd="@dimen/dp_64"
+                android:layout_marginTop="@dimen/dp_13"
                 android:src="@mipmap/room_jb"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -194,14 +245,11 @@
 
             <RelativeLayout
                 android:id="@+id/room_rl_gift"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="@dimen/dp_20"
-                android:layout_marginStart="@dimen/dp_16"
                 android:layout_marginTop="@dimen/dp_20"
-                android:layout_marginEnd="@dimen/dp_16"
-                android:orientation="horizontal"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintStart_toStartOf="@+id/tv_name"
                 app:layout_constraintTop_toBottomOf="@+id/jianj">
 
                 <TextView
@@ -213,64 +261,29 @@
                     android:gravity="center"
                     android:text="礼物图鉴"
                     android:textColor="#ffffff"
-                    android:textSize="@dimen/sp_12" />
+                    android:textSize="@dimen/sp_14" />
 
                 <TextView
                     android:id="@+id/tv_ts"
                     android:layout_width="wrap_content"
                     android:layout_height="@dimen/dp_20"
                     android:layout_alignParentEnd="true"
-                    android:layout_centerInParent="true"
                     android:drawableEnd="@mipmap/room_rig_jt"
-                    android:gravity="center"
                     android:text="90天内累计收到200个礼物"
                     android:textColor="@color/color_FF999999"
-                    android:textSize="@dimen/sp_12" />
+                    android:textSize="@dimen/sp_14" />
 
             </RelativeLayout>
 
-            <!--            <com.example.moduletablayout.CustomSlidingTabLayout-->
-            <!--                android:id="@+id/sliding_tab_layout"-->
-            <!--                android:layout_width="match_parent"-->
-            <!--                android:layout_height="@dimen/dp_24"-->
-            <!--                android:orientation="horizontal"-->
-            <!--                android:layout_marginTop="@dimen/dp_12"-->
-            <!--                android:layout_marginStart="@dimen/dp_16"-->
-            <!--                android:layout_marginEnd="@dimen/dp_16"-->
-            <!--                app:layout_constraintEnd_toEndOf="parent"-->
-            <!--                app:layout_constraintStart_toStartOf="parent"-->
-            <!--                app:layout_constraintTop_toBottomOf="@+id/room_rl_gift"-->
-            <!--                app:tl_tab_space_equal="true"-->
-            <!--                app:tl_textBold="BOTH"-->
-            <!--                app:tl_textSelectColor="@color/white"-->
-            <!--                app:tl_textUnselectColor="@color/color_FF999999"-->
-            <!--                app:tl_textsize="14sp"-->
-            <!--                />-->
-            <!--                        <include-->
-            <!--                            android:id="@+id/custom_tab_layout"-->
-            <!--                            layout="@layout/custom_tab_layout"-->
-            <!--                            android:layout_width="match_parent"-->
-            <!--                            android:layout_height="wrap_content"-->
-            <!--                            app:layout_constraintEnd_toEndOf="parent"-->
-            <!--                            app:layout_constraintStart_toStartOf="parent"-->
-            <!--                            app:layout_constraintTop_toBottomOf="@+id/room_rl_gift" />-->
-
-            <!--            <androidx.viewpager.widget.ViewPager-->
-            <!--                android:id="@+id/vp_relationship"-->
-            <!--                android:layout_width="match_parent"-->
-            <!--                android:layout_height="@dimen/dp_120"-->
-            <!--                android:layout_marginTop="@dimen/dp_13"-->
-            <!--                app:layout_constraintTop_toBottomOf="@+id/custom_tab_layout" />-->
-
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/custom_tab_layout"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp_16"
                 android:layout_marginTop="@dimen/dp_10"
                 android:layout_marginEnd="@dimen/dp_16"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
+                android:visibility="gone"
+                app:layout_constraintStart_toStartOf="@+id/tv_name"
                 app:layout_constraintTop_toBottomOf="@+id/room_rl_gift">
 
                 <TextView
@@ -322,32 +335,110 @@
             <RelativeLayout
                 android:id="@+id/ll"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_140"
-                android:background="@mipmap/guxi_k"
-                app:layout_constraintStart_toStartOf="parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_15"
+                android:background="@mipmap/icon_dialog_u_cp_bg"
+                app:layout_constraintBottom_toTopOf="@+id/view"
+                app:layout_constraintStart_toStartOf="@+id/tv_name"
                 app:layout_constraintTop_toBottomOf="@+id/custom_tab_layout">
 
-                <com.makeramen.roundedimageview.RoundedImageView
-                    android:id="@+id/user_nav1"
-                    android:layout_width="@dimen/dp_50"
-                    android:layout_height="@dimen/dp_50"
-                    android:layout_alignParentStart="true"
-                    android:layout_marginStart="@dimen/dp_47"
-                    android:layout_marginTop="@dimen/dp_60"
-                    android:src="@mipmap/default_avatar"
-                    app:riv_oval="true" />
-
                 <TextView
-                    android:id="@+id/tv_nickname1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_below="@+id/user_nav1"
-                    android:layout_alignStart="@+id/user_nav1"
-                    android:layout_alignEnd="@+id/user_nav1"
+                    android:background="@mipmap/icon_dialog_u_cp_left_top"
                     android:gravity="center"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/sp_10"
-                    tools:text="用户昵称" />
+                    android:text="CP"
+                    android:textColor="@color/white" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_toStartOf="@+id/ll_middle"
+                    android:orientation="vertical">
+
+                    <com.makeramen.roundedimageview.RoundedImageView
+                        android:id="@+id/user_nav1"
+                        android:layout_width="@dimen/dp_50"
+                        android:layout_height="@dimen/dp_50"
+                        android:background="@drawable/shape_circle"
+                        android:padding="@dimen/dp_2"
+                        android:src="@mipmap/default_avatar"
+                        app:riv_oval="true" />
+
+                    <TextView
+                        android:id="@+id/tv_nickname1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/user_nav1"
+                        android:layout_alignStart="@+id/user_nav1"
+                        android:layout_alignEnd="@+id/user_nav1"
+                        android:layout_gravity="center"
+                        android:textColor="#FF624E79"
+                        android:textSize="@dimen/sp_10"
+                        tools:text="用户昵称" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_middle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:layout_marginHorizontal="@dimen/dp_20"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@mipmap/icon_dialog_u_cp_lv"
+                        android:gravity="center"
+                        android:padding="@dimen/dp_5"
+                        android:textColor="#FFFFEAB9"
+                        android:textSize="@dimen/sp_10"
+                        tools:text="LV8 情缘一定" />
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/dp_8"
+                        android:src="@mipmap/icon_dialog_u_cp_" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:textColor="#FFFF0088"
+                        android:textSize="@dimen/sp_14"
+                        tools:text="100.35w" />
+
+                </LinearLayout>
+
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_toEndOf="@+id/ll_middle"
+                    android:orientation="vertical">
+
+                    <com.makeramen.roundedimageview.RoundedImageView
+                        android:id="@+id/user_nav2"
+                        android:layout_width="@dimen/dp_50"
+                        android:layout_height="@dimen/dp_50"
+                        android:background="@drawable/shape_circle"
+                        android:padding="@dimen/dp_2"
+                        android:src="@mipmap/default_avatar"
+                        app:riv_oval="true" />
+
+                    <TextView
+                        android:id="@+id/tv_nickname2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:text="用户昵称"
+                        android:textColor="#FF624E79"
+                        android:textSize="@dimen/sp_10" />
+                </LinearLayout>
 
                 <RelativeLayout
                     android:id="@+id/rl_reqit"
@@ -355,7 +446,8 @@
                     android:layout_height="wrap_content"
                     android:layout_centerHorizontal="true"
                     android:layout_marginTop="@dimen/dp_50"
-                    android:background="@mipmap/regit_t">
+                    android:background="@mipmap/regit_t"
+                    android:visibility="gone">
 
                     <TextView
                         android:id="@+id/tv_relation"
@@ -371,35 +463,12 @@
 
                 </RelativeLayout>
 
-                <com.makeramen.roundedimageview.RoundedImageView
-                    android:id="@+id/user_nav2"
-                    android:layout_width="@dimen/dp_50"
-                    android:layout_height="@dimen/dp_50"
-                    android:layout_alignParentEnd="true"
-                    android:layout_marginTop="@dimen/dp_60"
-                    android:layout_marginEnd="@dimen/dp_47"
-                    android:src="@mipmap/default_avatar"
-                    app:riv_oval="true" />
-
-                <TextView
-                    android:id="@+id/tv_nickname2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/user_nav2"
-                    android:layout_alignStart="@+id/user_nav2"
-                    android:layout_alignEnd="@+id/user_nav2"
-                    android:gravity="center"
-                    android:text="用户昵称"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/sp_10" />
 
                 <TextView
                     android:id="@+id/tv_time"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
-                    android:layout_marginTop="@dimen/dp_43"
-                    android:layout_marginEnd="@dimen/dp_22"
                     android:background="@drawable/bg_r53_33333"
                     android:gravity="center"
                     android:paddingStart="5dp"
@@ -409,56 +478,62 @@
                     tools:text="5天" />
             </RelativeLayout>
 
-            <com.google.android.flexbox.FlexboxLayout
+            <View
+                android:id="@+id/view"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_25"
+                app:layout_constraintTop_toBottomOf="@+id/ll" />
+
+            <LinearLayout
                 android:id="@+id/room_bo"
                 android:layout_width="match_parent"
+                android:layout_marginStart="@dimen/dp_10"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_29"
-                android:layout_marginBottom="@dimen/dp_46"
-                android:paddingStart="@dimen/dp_16"
-                android:paddingEnd="@dimen/dp_16"
+                android:layout_marginBottom="@dimen/dp_26"
+                android:orientation="horizontal"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/ll">
+                app:layout_constraintStart_toStartOf="@+id/tv_name"
+                app:layout_constraintTop_toBottomOf="@+id/view">
 
-                <ImageView
+                <TextView
                     android:id="@+id/im_room_t"
-                    android:layout_width="@dimen/dp_82"
+                    android:layout_weight="1"
+                    android:layout_width="0dp"
                     android:layout_height="@dimen/dp_30"
-                    android:src="@mipmap/room_t" />
+                    android:background="@drawable/shape_dialog"
+                    android:textColor="@color/white"
+                    android:text="@TA"
+                    android:gravity="center"
+                    android:textSize="@dimen/sp_14"
+                    android:backgroundTint="#33FFFFFF" />
 
-                <ImageView
+                <TextView
                     android:id="@+id/im_room_lt"
-                    android:layout_width="@dimen/dp_82"
-                    android:layout_height="@dimen/dp_30"
+                    android:layout_weight="1"
+                    android:layout_width="0dp"
                     android:layout_marginStart="@dimen/dp_5"
-                    android:src="@mipmap/room_lt" />
+                    android:layout_height="@dimen/dp_30"
+                    android:background="@drawable/shape_dialog"
+                    android:textColor="@color/white"
+                    android:text="发消息"
+                    android:gravity="center"
+                    android:textSize="@dimen/sp_14"
+                    android:backgroundTint="#33FFFFFF" />
 
-                <ImageView
-                    android:id="@+id/im_room_gz"
-                    android:layout_width="@dimen/dp_82"
-                    android:layout_height="@dimen/dp_30"
-                    android:layout_marginStart="@dimen/dp_5"
-                    android:src="@mipmap/room_gz" />
 
                 <ImageView
                     android:id="@+id/im_room_sl"
-                    android:layout_width="@dimen/dp_82"
+                    android:layout_weight="1"
+                    android:layout_width="0dp"
                     android:layout_height="@dimen/dp_30"
+                    android:background="@drawable/shape_dialog"
                     android:layout_marginStart="@dimen/dp_5"
                     android:src="@mipmap/room_sl" />
 
-            </com.google.android.flexbox.FlexboxLayout>
+            </LinearLayout>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <com.xscm.moduleutil.utils.MeHeadView
-            android:id="@+id/iv_avatar"
-            android:layout_width="@dimen/dp_66"
-            android:layout_height="@dimen/dp_66"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:src="@mipmap/default_avatar" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>