房间用户信息。

BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java

@@ -95,7 +95,7 @@ public class UserInfo extends BaseEvent implements Serializable {
                 "direction": "string",
 
     }*/
-    public static class CpInfo{
+    public static class CpInfo implements Serializable{
           public String name;
           public String level;
           public String exp;
@@ -104,14 +104,14 @@ public class UserInfo extends BaseEvent implements Serializable {
           public UserInfo1 user_info1;
           public UserInfo2 user_info2;
 
-        public static class UserInfo1{
+        public static class UserInfo1 implements Serializable{
             public String user_id;
             public String nickname;
             public String avatar;
             public String dress;
         }
 
-          public static class UserInfo2{
+          public static class UserInfo2 implements Serializable{
               public String user_id;
               public String nickname;
               public String avatar;
@@ -138,13 +138,13 @@ public class UserInfo extends BaseEvent implements Serializable {
 //        private String tag_name;
 //    }
     @Data
-    public static class  GiftWall {
+    public static class  GiftWall implements Serializable{
         private String gift_name;
         private String total;
 
         private List<SendUserInfo> send_user_info;
         @Data
-        public static class  SendUserInfo{
+        public static class  SendUserInfo implements Serializable{
             private String nickname;
             private String avatar;
         }

BaseModule/src/main/java/com/xscm/moduleutil/widget/ShineTextView.kt

@@ -33,7 +33,7 @@ class ShineTextView : AppCompatTextView {
      var shineColor: Int = Color.WHITE
      var endColor: Int = Color.WHITE
     //一次动效时长
-     var shineDuration: Int = 400
+     var shineDuration: Int = 1000
 
      var _count: Int = 0 //自行运行动画次数
 
@@ -77,7 +77,7 @@ class ShineTextView : AppCompatTextView {
                     mLinearGradient = LinearGradient(
                         0f,
                         0f,
-                        (mViewWidth / 4).toFloat(),
+                        (mViewWidth / 1).toFloat(),
                         0f,
                         intArrayOf(currentTextColor, shineColor, currentTextColor),
                         null,

MainModule/src/main/AndroidManifest.xml

@@ -196,15 +196,15 @@
             android:enabled="true"
             android:exported="true" />
 
-        <provider
+<!--        <provider-->
-            android:name="androidx.core.content.FileProvider"
+<!--            android:name="androidx.core.content.FileProvider"-->
-            android:authorities="${applicationId}.fileprovider"
+<!--            android:authorities="${applicationId}.fileprovider"-->
-            android:exported="false"
+<!--            android:exported="false"-->
-            android:grantUriPermissions="true">
+<!--            android:grantUriPermissions="true">-->
-            <meta-data
+<!--            <meta-data-->
-                android:name="android.support.FILE_PROVIDER_PATHS"
+<!--                android:name="android.support.FILE_PROVIDER_PATHS"-->
-                android:resource="@xml/file_paths" />
+<!--                android:resource="@xml/file_paths" />-->
-        </provider>
+<!--        </provider>-->
     </application>
 
 </manifest>

MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java

@@ -117,9 +117,12 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
         roomId = getArguments().getString("roomId");
         jingp = getArguments().getInt("jingp");
         heart_id = getArguments().getString("heart_id");
-        LogUtils.e("RoomGiftDialogFragment_roomInfoResp",roomInfoResp.toString());
+        if (roomInfoResp != null) {
-        LogUtils.e("RoomGiftDialogFragment_userInfo",userInfo.toString());
+            LogUtils.e("RoomGiftDialogFragment_roomInfoResp", roomInfoResp.toString());
-
+        }
+        if (userInfo != null) {
+            LogUtils.e("RoomGiftDialogFragment_userInfo", userInfo.toString());
+        }
     }
 
     @Override

MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java

@@ -6,20 +6,26 @@ import static android.view.View.VISIBLE;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.os.Bundle;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.fragment.app.FragmentManager;
 
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.Window;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.blankj.utilcode.util.LogUtils;
+import com.xscm.modulemain.Application;
 import com.xscm.modulemain.R;
 import com.xscm.modulemain.activity.room.contacts.RoomUserContacts;
 import com.xscm.modulemain.activity.user.activity.GiftWallActivity;
@@ -132,7 +138,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
 
     @Override
     protected void initData() {
-        if (type == 0) {
+        if (user_id.equals(String.valueOf(SpUtil.getUserId()))) {
             mBinding.roomDian.setVisibility(GONE);
         } else {
             mBinding.roomDian.setVisibility(View.VISIBLE);
@@ -230,7 +236,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
             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));
+            intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_REPORT_URL(), SpUtil.getToken(), 1, user_id));
             intent.putExtra("title", "举报");
             startActivity(intent);
         } else if (id == R.id.iv_avatar) {
@@ -303,7 +309,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
 //                    showContent = "点击 Item菜单6";
                     //TODO 举报功能
                     Intent intent = new Intent(getActivity(), WebViewActivity.class);
-                    intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_REPORT_URL(), SpUtil.getToken(),1,user_id));
+                    intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_REPORT_URL(), SpUtil.getToken(), 1, user_id));
                     intent.putExtra("title", "举报");
                     startActivity(intent);
 
@@ -329,18 +335,60 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
         contentView.findViewById(R.id.action_report).setOnClickListener(listener);
         contentView.findViewById(R.id.action_blacklist).setOnClickListener(listener);
 
+        contentView.findViewById(R.id.action_set_manager).setVisibility(VISIBLE);
+        contentView.findViewById(R.id.action_set_host).setVisibility(VISIBLE);
+        contentView.findViewById(R.id.action_mute).setVisibility(VISIBLE);
+        contentView.findViewById(R.id.action_kick_out).setVisibility(VISIBLE);
+        contentView.findViewById(R.id.action_ban).setVisibility(VISIBLE);
+        contentView.findViewById(R.id.action_report).setVisibility(VISIBLE);
+        contentView.findViewById(R.id.action_blacklist).setVisibility(VISIBLE);
+
+
         if (type == 1) {
             contentView.findViewById(R.id.action_set_manager).setVisibility(VISIBLE);
-            contentView.findViewById(R.id.action_kick_out).setVisibility(VISIBLE);
             contentView.findViewById(R.id.action_set_host).setVisibility(VISIBLE);
+            contentView.findViewById(R.id.action_mute).setVisibility(VISIBLE);
+            contentView.findViewById(R.id.action_kick_out).setVisibility(VISIBLE);
+            contentView.findViewById(R.id.action_ban).setVisibility(VISIBLE);
+            contentView.findViewById(R.id.action_report).setVisibility(VISIBLE);
+            contentView.findViewById(R.id.action_blacklist).setVisibility(VISIBLE);
         } else if (type == 2) {
-            contentView.findViewById(R.id.action_set_manager).setVisibility(GONE);
+            switch (close_type) {
-            contentView.findViewById(R.id.action_kick_out).setVisibility(VISIBLE);
+                case 1:
-            contentView.findViewById(R.id.action_set_host).setVisibility(VISIBLE);
-        } else if (type == 3) {
                     contentView.findViewById(R.id.action_set_manager).setVisibility(GONE);
                     contentView.findViewById(R.id.action_set_host).setVisibility(GONE);
-            contentView.findViewById(R.id.action_kick_out).setVisibility(VISIBLE);
+                    contentView.findViewById(R.id.action_mute).setVisibility(GONE);
+                    contentView.findViewById(R.id.action_kick_out).setVisibility(GONE);
+                    contentView.findViewById(R.id.action_ban).setVisibility(GONE);
+                    break;
+                case 2:
+                case 3:
+                case 4:
+                    contentView.findViewById(R.id.action_set_manager).setVisibility(GONE);
+                    break;
+            }
+        } else if (type == 3) {
+            switch (close_type) {
+                case 1:
+                case 2:
+                    contentView.findViewById(R.id.action_set_manager).setVisibility(GONE);
+                    contentView.findViewById(R.id.action_set_host).setVisibility(GONE);
+                    contentView.findViewById(R.id.action_mute).setVisibility(GONE);
+                    contentView.findViewById(R.id.action_kick_out).setVisibility(GONE);
+                    contentView.findViewById(R.id.action_ban).setVisibility(GONE);
+                    break;
+                case 3:
+                case 4:
+                    contentView.findViewById(R.id.action_set_manager).setVisibility(GONE);
+                    contentView.findViewById(R.id.action_set_host).setVisibility(GONE);
+                    break;
+            }
+        } else if (type == 4) {
+            contentView.findViewById(R.id.action_set_manager).setVisibility(GONE);
+            contentView.findViewById(R.id.action_set_host).setVisibility(GONE);
+            contentView.findViewById(R.id.action_mute).setVisibility(GONE);
+            contentView.findViewById(R.id.action_kick_out).setVisibility(GONE);
+            contentView.findViewById(R.id.action_ban).setVisibility(GONE);
         }
     }
 
@@ -383,11 +431,11 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
     public void getRoomUserInfo(UserInfo userInfo1) {
         this.userInfo = userInfo1;
         mBinding.ivAvatar.setData(userInfo.getAvatar(), "", userInfo.getNobility_image() + "");
-        String sex = userInfo.getSex()==1?"男":"女";
+        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()){
+        if (!userInfo.getNickname_color().isEmpty()) {
             mBinding.tvName.setStartColor(Color.parseColor(userInfo.getNickname_color()));
             mBinding.tvName.setShineColor(Color.parseColor(userInfo.getNickname_color()));
             mBinding.tvName.setEndColor(Color.parseColor(userInfo.getNickname_color()));
@@ -424,9 +472,9 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
         if (userInfo != null) {
             mBinding.tvGh.setVisibility(VISIBLE);
             mBinding.tvJoinGuild.setVisibility(GONE);
-            if (userInfo.getGuild().isEmpty()){
+            if (userInfo.getGuild().isEmpty()) {
                 mBinding.tvGh.setText("所属公会：无");
-            }else {
+            } else {
                 if (userInfo.getUser_id() != SpUtil.getUserId()) {
                     mBinding.tvJoinGuild.setVisibility(VISIBLE);
                 }
@@ -440,14 +488,115 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
 
         mBinding.tvJoinGuild.setOnClickListener(v -> {
             //跳转加入公会
-            Intent intent=new Intent(getContext(), WebViewActivity.class);
+            Intent intent = new Intent(getContext(), WebViewActivity.class);
-            intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_GUILD_URL(),SpUtil.getToken()));
+            intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_GUILD_URL(), SpUtil.getToken()));
             intent.putExtra("title", "公会");
             startActivity(intent);
         });
 
         updateUIBasedOnTypeAndUser();
         dianj(1);
+        showCp();
+    }
+
+    private void showCp() {
+        if (userInfo.getCp_info() != null) {
+            mBinding.ll.setVisibility(VISIBLE);
+            ImageUtils.loadHeadCC(userInfo.getCp_info().user_info1.avatar, mBinding.userNav1);
+            ImageUtils.loadHeadCC(userInfo.getCp_info().user_info2.avatar, mBinding.userNav2);
+            mBinding.tvNickname1.setText(userInfo.getCp_info().user_info1.nickname);
+            mBinding.tvNickname2.setText(userInfo.getCp_info().user_info2.nickname);
+            mBinding.tvCpLv.setText("Lv" + userInfo.getCp_info().level + " " + userInfo.getCp_info().name);
+            mBinding.tvCpNum.setText(userInfo.getCp_info().exp);
+
+            mBinding.cpAnim.setSource(userInfo.getCp_info().pendant, 1);
+
+            if (userInfo.getProfile().isEmpty()){
+                mBinding.jianj.setText("");
+                mBinding.jianj.setVisibility(GONE);
+            }else {
+                mBinding.jianj.setText(userInfo.getProfile());
+                mBinding.jianj.setVisibility(VISIBLE);
+            }
+
+            if (!userInfo.getIcon().isEmpty()){
+                mBinding.flexEntry.setVisibility(VISIBLE);
+                for (String url : userInfo.getIcon()) {
+                    if (url.contains("http")) {
+                        ImageView imageView1 = new ImageView(Application.getInstance());
+                        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
+                                LinearLayout.LayoutParams.WRAP_CONTENT,
+                                Application.getInstance().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_20)
+                        );
+                        params.setMargins(0, 0,Application.getInstance().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_5), 0); // 右边距
+                        imageView1.setLayoutParams(params);
+                        imageView1.setScaleType(ImageView.ScaleType.FIT_START);
+
+                        // 使用 Glide 加载图片
+                        ImageUtils.loadHeadCC(url, imageView1,params);
+                        mBinding.flexEntry.addView(imageView1);
+                    }
+                }
+            }else {
+                mBinding.flexEntry.setVisibility(GONE);
+            }
+
+
+
+            ImageUtils.loadHeadCC(userInfo.getCp_info().user_info1.avatar, mBinding.ivCp1);
+            ImageUtils.loadHeadCC(userInfo.getCp_info().user_info2.avatar, mBinding.ivCp2);
+            ConstraintLayout.LayoutParams params = new ConstraintLayout.LayoutParams(ConstraintLayout.LayoutParams.WRAP_CONTENT,
+                    ConstraintLayout.LayoutParams.WRAP_CONTENT);
+            //挂件上的头像位置：0-上，1-右上，2-右，3-右下，4-下，5-左下，6-左，7-左上'
+            switch (Integer.parseInt(userInfo.getCp_info().direction)) {
+                case 0:
+                    params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
+                    params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
+                    mBinding.llCpAnimAvatar.setOrientation(LinearLayout.HORIZONTAL);
+                    mBinding.ivCp2.setPadding(10, 0, 0, 0);
+                    break;
+                case 1:
+                    mBinding.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
+                    params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
+                    params.topToTop = ConstraintLayout.LayoutParams.PARENT_ID;
+                    mBinding.ivCp2.setPadding(0, 10, 0, 0);
+                    break;
+                case 2:
+                    mBinding.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
+                    params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
+                    params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
+                    params.topToTop = ConstraintLayout.LayoutParams.PARENT_ID;
+                    break;
+                case 3:
+                    mBinding.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
+                    params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
+                    params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
+                    break;
+                case 4:
+                    mBinding.llCpAnimAvatar.setOrientation(LinearLayout.HORIZONTAL);
+                    params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
+                    params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
+                    params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
+                    break;
+                case 5:
+                    mBinding.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
+                    params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
+                    params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
+                    break;
+                case 6:
+                    mBinding.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
+                    params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
+                    params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
+                    params.topToTop = ConstraintLayout.LayoutParams.PARENT_ID;
+                    break;
+                case 7:
+                    mBinding.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
+                    params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
+                    params.topToTop = ConstraintLayout.LayoutParams.PARENT_ID;
+                    break;
+            }
+            mBinding.llCpAnimAvatar.setLayoutParams(params);
+        }
     }
 
     public void dianj(int type) {
@@ -517,9 +666,9 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
 
         switch (type) {
             case 1: // 房主
-                mBinding.roomDian.setVisibility(View.VISIBLE);
+//                mBinding.roomDian.setVisibility(View.VISIBLE);
-                mBinding.roomJb.setVisibility(View.GONE);
+//                mBinding.roomJb.setVisibility(View.GONE);
-                mBinding.roomLh.setVisibility(View.GONE);
+//                mBinding.roomLh.setVisibility(View.GONE);
                 mBinding.roomBo.setVisibility(View.VISIBLE);
                 mBinding.imQml.setVisibility(VISIBLE);
                 mBinding.roomMCz.setVisibility(View.VISIBLE);
@@ -529,9 +678,9 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
                     mBinding.roomMCz.setText("抱麦");
                 }
                 if (isSelf) {
-                    mBinding.roomDian.setVisibility(GONE);
+//                    mBinding.roomDian.setVisibility(GONE);
-                    mBinding.roomJb.setVisibility(View.GONE);
+//                    mBinding.roomJb.setVisibility(View.GONE);
-                    mBinding.roomLh.setVisibility(View.GONE);
+//                    mBinding.roomLh.setVisibility(View.GONE);
                     mBinding.roomBo.setVisibility(GONE);
                     mBinding.roomMCz.setVisibility(View.VISIBLE);
                     if (userInfo.getIs_in_pit() == 1) {
@@ -544,16 +693,16 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
                 break;
             case 2://管理员
                 if (close_type == 1) { //管理员查看房主信息
-                    mBinding.roomDian.setVisibility(View.GONE);
+//                    mBinding.roomDian.setVisibility(View.GONE);
-                    mBinding.roomJb.setVisibility(View.VISIBLE);
+//                    mBinding.roomJb.setVisibility(View.VISIBLE);
-                    mBinding.roomLh.setVisibility(View.VISIBLE);
+//                    mBinding.roomLh.setVisibility(View.VISIBLE);
                     mBinding.roomBo.setVisibility(VISIBLE);
                     mBinding.roomMCz.setVisibility(GONE);
 
                 } else {
-                    mBinding.roomDian.setVisibility(View.VISIBLE);
+//                    mBinding.roomDian.setVisibility(View.VISIBLE);
-                    mBinding.roomJb.setVisibility(GONE);
+//                    mBinding.roomJb.setVisibility(GONE);
-                    mBinding.roomLh.setVisibility(GONE);
+//                    mBinding.roomLh.setVisibility(GONE);
                     mBinding.roomBo.setVisibility(View.VISIBLE);
 
                     mBinding.roomMCz.setVisibility(View.VISIBLE);
@@ -564,9 +713,9 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
                     }
                 }
                 if (isSelf) {
-                    mBinding.roomDian.setVisibility(GONE);
+//                    mBinding.roomDian.setVisibility(GONE);
-                    mBinding.roomJb.setVisibility(View.GONE);
+//                    mBinding.roomJb.setVisibility(View.GONE);
-                    mBinding.roomLh.setVisibility(View.GONE);
+//                    mBinding.roomLh.setVisibility(View.GONE);
                     mBinding.roomBo.setVisibility(GONE);
                     mBinding.roomMCz.setVisibility(View.VISIBLE);
                     if (userInfo.getIs_in_pit() == 1) {
@@ -579,15 +728,15 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
                 break;
             case 3:
                 if (close_type == 1 || close_type == 2) { //主持查看房主或者管理员信息
-                    mBinding.roomDian.setVisibility(View.GONE);
+//                    mBinding.roomDian.setVisibility(View.GONE);
-                    mBinding.roomJb.setVisibility(View.VISIBLE);
+//                    mBinding.roomJb.setVisibility(View.VISIBLE);
-                    mBinding.roomLh.setVisibility(View.VISIBLE);
+//                    mBinding.roomLh.setVisibility(View.VISIBLE);
                     mBinding.roomBo.setVisibility(View.VISIBLE);
                     mBinding.roomMCz.setVisibility(GONE);
                 } else {
-                    mBinding.roomDian.setVisibility(View.VISIBLE);
+//                    mBinding.roomDian.setVisibility(View.VISIBLE);
-                    mBinding.roomJb.setVisibility(GONE);
+//                    mBinding.roomJb.setVisibility(GONE);
-                    mBinding.roomLh.setVisibility(GONE);
+//                    mBinding.roomLh.setVisibility(GONE);
                     mBinding.roomBo.setVisibility(View.VISIBLE);
                     mBinding.roomMCz.setVisibility(View.VISIBLE);
                     if (userInfo.getIs_in_pit() == 1) {
@@ -597,9 +746,9 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
                     }
                 }
                 if (isSelf) {
-                    mBinding.roomDian.setVisibility(GONE);
+//                    mBinding.roomDian.setVisibility(GONE);
-                    mBinding.roomJb.setVisibility(View.GONE);
+//                    mBinding.roomJb.setVisibility(View.GONE);
-                    mBinding.roomLh.setVisibility(View.GONE);
+//                    mBinding.roomLh.setVisibility(View.GONE);
                     mBinding.roomBo.setVisibility(GONE);
                     mBinding.roomMCz.setVisibility(View.VISIBLE);
                     if (userInfo.getIs_in_pit() == 1) {
@@ -619,17 +768,17 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
 //                    mBinding.roomBo.setVisibility(View.VISIBLE);
 //                    mBinding.imQml.setVisibility(VISIBLE);
 //                } else {
-                    mBinding.roomDian.setVisibility(GONE);
+//                mBinding.roomDian.setVisibility(GONE);
-                    mBinding.roomJb.setVisibility(View.VISIBLE);
+//                mBinding.roomJb.setVisibility(View.VISIBLE);
-                    mBinding.roomLh.setVisibility(View.VISIBLE);
+//                mBinding.roomLh.setVisibility(View.VISIBLE);
                 mBinding.roomMCz.setVisibility(GONE);
                 mBinding.roomBo.setVisibility(View.VISIBLE);
                 mBinding.imQml.setVisibility(GONE);
 //                }
                 if (isSelf) {
-                    mBinding.roomDian.setVisibility(GONE);
+//                    mBinding.roomDian.setVisibility(GONE);
-                    mBinding.roomJb.setVisibility(View.GONE);
+//                    mBinding.roomJb.setVisibility(View.GONE);
-                    mBinding.roomLh.setVisibility(View.GONE);
+//                    mBinding.roomLh.setVisibility(View.GONE);
                     mBinding.roomBo.setVisibility(GONE);
                     mBinding.roomMCz.setVisibility(View.VISIBLE);
                     if (userInfo.getIs_in_pit() == 1) {
@@ -711,10 +860,12 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
             userInfo.setIs_follow(0);
 //            mBinding.imRoomGz.setImageDrawable(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.room_gz));
             mBinding.imRoomGz.setText("已关注");
+            mBinding.imRoomGz.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#ff999999")));
         } else {
             userInfo.setIs_follow(1);
 //            mBinding.imRoomGz.setImageDrawable(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.room_ygz));
             mBinding.imRoomGz.setText("+ 关注");
+            mBinding.imRoomGz.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#ff52FF96")));
         }
     }
 

MainModule/src/main/res/layout/fragment_room_user_info.xml

@@ -48,7 +48,7 @@
                 android:layout_marginStart="@dimen/dp_10"
                 android:ellipsize="end"
                 android:lines="1"
-                android:maxWidth="@dimen/dp_100"
+                android:maxWidth="@dimen/dp_120"
                 android:text="用户名"
                 android:textColor="#52FF96"
                 android:textSize="@dimen/sp_18"
@@ -74,7 +74,6 @@
                 app:layout_constraintTop_toTopOf="@+id/tv_name" />
 
 
-
             <TextView
                 android:id="@+id/tv_id"
                 android:layout_width="wrap_content"
@@ -82,7 +81,7 @@
                 android:layout_marginTop="@dimen/dp_13"
                 android:text="Lv.1"
                 android:textColor="@color/colorWhite65"
-                android:textSize="@dimen/sp_10"
+                android:textSize="@dimen/sp_12"
                 app:layout_constraintStart_toStartOf="@+id/tv_name"
                 app:layout_constraintTop_toBottomOf="@+id/tv_name" />
 
@@ -90,13 +89,13 @@
                 android:id="@+id/tv_gh"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_5"
                 android:ellipsize="end"
                 android:lines="1"
-                android:maxWidth="@dimen/dp_120"
+                android:maxWidth="@dimen/dp_140"
                 android:text="所属公会:"
                 android:textColor="@color/colorWhite65"
-                android:textSize="@dimen/sp_10"
+                android:textSize="@dimen/sp_12"
-                android:layout_marginTop="@dimen/dp_5"
                 app:layout_constraintStart_toStartOf="@+id/tv_id"
                 app:layout_constraintTop_toBottomOf="@+id/tv_id" />
 
@@ -107,7 +106,7 @@
                 android:layout_marginStart="@dimen/dp_5"
                 android:text="立即加入"
                 android:textColor="#FF52FF96"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/sp_13"
                 app:layout_constraintBottom_toBottomOf="@+id/tv_gh"
                 app:layout_constraintStart_toEndOf="@+id/tv_gh" />
 
@@ -116,11 +115,12 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
+                android:layout_marginStart="@dimen/dp_8"
                 app:alignContent="flex_start"
                 app:alignItems="flex_start"
                 app:flexWrap="wrap"
-                app:layout_constraintStart_toStartOf="@+id/tv_name"
+                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tv_id" />
+                app:layout_constraintTop_toBottomOf="@+id/tv_join_guild" />
 
             <TextView
                 android:id="@+id/jianj"
@@ -163,21 +163,6 @@
                 app:layout_constraintTop_toTopOf="parent" />
 
 
-            <ImageView
-                android:id="@+id/im_gs"
-                android:layout_width="wrap_content"
-                android:layout_height="0dp"
-                android:layout_marginEnd="@dimen/dp_8"
-                android:src="@mipmap/gsui"
-                android:visibility="gone"
-                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" />
-
-
-
-
             <ImageView
                 android:id="@+id/im_qing"
                 android:layout_width="@dimen/dp_66"
@@ -189,6 +174,22 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/kb" />
 
+            <TextView
+                android:id="@+id/tv_placeholder"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_24"
+                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/white"
+                android:textSize="@dimen/sp_12"
+                android:visibility="invisible"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
                 android:id="@+id/room_m_cz"
@@ -212,18 +213,30 @@
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_22"
                 android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginTop="@dimen/dp_13"
                 android:src="@mipmap/qgrml"
-                app:layout_constraintBottom_toBottomOf="@+id/room_m_cz"
+                app:layout_constraintBottom_toBottomOf="@+id/tv_placeholder"
-                app:layout_constraintEnd_toStartOf="@+id/room_m_cz"
+                app:layout_constraintEnd_toStartOf="@+id/tv_placeholder"
-                app:layout_constraintTop_toTopOf="@+id/room_m_cz" />
+                app:layout_constraintTop_toTopOf="@+id/tv_placeholder" />
+
+            <ImageView
+                android:id="@+id/im_gs"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_marginEnd="@dimen/dp_8"
+                android:src="@mipmap/gsui"
+                android:visibility="visible"
+                app:layout_constraintEnd_toStartOf="@+id/tv_placeholder"
+                app:layout_constraintTop_toBottomOf="@+id/tv_placeholder"
+                app:layout_constraintTop_toTopOf="@+id/tv_placeholder"/>
 
 
             <ImageView
                 android:id="@+id/room_dian"
-                android:layout_width="@dimen/dp_16"
+                android:layout_width="wrap_content"
-                android:layout_height="@dimen/dp_16"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_13"
+                android:paddingHorizontal="@dimen/dp_8"
+                android:paddingVertical="@dimen/dp_5"
                 android:src="@mipmap/room_dian"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -232,9 +245,10 @@
                 android:id="@+id/room_jb"
                 android:layout_width="@dimen/dp_44"
                 android:layout_height="@dimen/dp_20"
-                android:layout_marginEnd="@dimen/dp_64"
                 android:layout_marginTop="@dimen/dp_13"
+                android:layout_marginEnd="@dimen/dp_64"
                 android:src="@mipmap/room_jb"
+                android:visibility="gone"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -245,10 +259,62 @@
                 android:layout_marginStart="@dimen/dp_20"
                 android:layout_marginEnd="@dimen/dp_15"
                 android:src="@mipmap/room_lh"
+                android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="@+id/room_jb"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="@+id/room_jb" />
 
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline"
+                android:layout_width="@dimen/dp_1"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.54"
+                android:layout_height="0dp"/>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/rl_cp_anim"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginTop="@dimen/dp_10"
+                app:layout_constraintStart_toEndOf="@+id/guideline"
+                app:layout_constraintBottom_toTopOf="@+id/room_rl_gift"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/iv_avatar">
+
+                <com.xscm.moduleutil.widget.AvatarFrameView
+                    android:id="@+id/cp_anim"
+                    android:layout_width="@dimen/dp_85"
+                    android:layout_height="match_parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintDimensionRatio="1.1:2"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <LinearLayout
+                    android:id="@+id/ll_cp_anim_avatar"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <com.xscm.moduleutil.widget.CircularImage
+                        android:id="@+id/iv_cp_1"
+                        android:layout_margin="1.5dp"
+                        android:layout_width="@dimen/dp_30"
+                        android:layout_height="@dimen/dp_30" />
+
+                    <com.xscm.moduleutil.widget.CircularImage
+                        android:id="@+id/iv_cp_2"
+                        android:layout_margin="1.5dp"
+                        android:layout_width="@dimen/dp_30"
+                        android:layout_height="@dimen/dp_30" />
+                </LinearLayout>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+
             <RelativeLayout
                 android:id="@+id/room_rl_gift"
                 android:layout_width="0dp"
@@ -340,6 +406,7 @@
 
             <RelativeLayout
                 android:id="@+id/ll"
+                android:visibility="gone"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_15"
@@ -380,6 +447,9 @@
                         android:layout_alignStart="@+id/user_nav1"
                         android:layout_alignEnd="@+id/user_nav1"
                         android:layout_gravity="center"
+                        android:ellipsize="end"
+                        android:lines="1"
+                        android:maxWidth="@dimen/dp_70"
                         android:textColor="#FF624E79"
                         android:textSize="@dimen/sp_10"
                         tools:text="用户昵称" />
@@ -394,6 +464,7 @@
                     android:orientation="vertical">
 
                     <TextView
+                        android:id="@+id/tv_cp_lv"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:background="@mipmap/icon_dialog_u_cp_lv"
@@ -406,10 +477,10 @@
                     <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:id="@+id/tv_cp_num"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
@@ -441,6 +512,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
+                        android:ellipsize="end"
+                        android:lines="1"
+                        android:maxWidth="@dimen/dp_70"
                         android:text="用户昵称"
                         android:textColor="#FF624E79"
                         android:textSize="@dimen/sp_10" />
@@ -481,6 +555,7 @@
                     android:paddingEnd="5dp"
                     android:textColor="@color/white"
                     android:textSize="@dimen/sp_9"
+                    android:visibility="gone"
                     tools:text="5天" />
             </RelativeLayout>
 
@@ -493,47 +568,48 @@
             <LinearLayout
                 android:id="@+id/room_bo"
                 android:layout_width="match_parent"
-                android:layout_marginStart="@dimen/dp_10"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_10"
                 android:layout_marginBottom="@dimen/dp_26"
                 android:orientation="horizontal"
+                android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="@+id/tv_name"
                 app:layout_constraintTop_toBottomOf="@+id/view">
 
                 <TextView
                     android:id="@+id/im_room_t"
-                    android:layout_weight="1"
                     android:layout_width="0dp"
                     android:layout_height="@dimen/dp_30"
+                    android:layout_weight="1"
                     android:background="@drawable/shape_dialog"
-                    android:textColor="@color/white"
+                    android:backgroundTint="#33FFFFFF"
-                    android:text="@TA"
                     android:gravity="center"
-                    android:textSize="@dimen/sp_14"
+                    android:text="/@TA"
-                    android:backgroundTint="#33FFFFFF" />
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_14" />
 
                 <TextView
                     android:id="@+id/im_room_lt"
-                    android:layout_weight="1"
                     android:layout_width="0dp"
-                    android:layout_marginStart="@dimen/dp_5"
                     android:layout_height="@dimen/dp_30"
+                    android:layout_marginStart="@dimen/dp_5"
+                    android:layout_weight="1"
                     android:background="@drawable/shape_dialog"
-                    android:textColor="@color/white"
+                    android:backgroundTint="#33FFFFFF"
-                    android:text="发消息"
                     android:gravity="center"
-                    android:textSize="@dimen/sp_14"
+                    android:text="发消息"
-                    android:backgroundTint="#33FFFFFF" />
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_14" />
 
 
                 <ImageView
                     android:id="@+id/im_room_sl"
-                    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:layout_weight="1"
+                    android:background="@drawable/shape_dialog"
                     android:src="@mipmap/room_sl" />
 
             </LinearLayout>

MainModule/src/main/res/layout/pop_menu.xml

@@ -1,97 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="@dimen/dp_88"
     android:layout_height="wrap_content"
-    android:paddingStart="@dimen/dp_8"
+    android:paddingHorizontal="@dimen/dp_8"
-    android:paddingEnd="@dimen/dp_8"
+    android:orientation="vertical"
     android:background="@drawable/bg_r6_fff"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <TextView
         android:id="@+id/action_set_manager"
-        android:layout_width="@dimen/dp_72"
+        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_18"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="@dimen/dp_10"
         android:gravity="center"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/dp_6"
         android:textColor="@color/color_FF999999"
         android:textSize="@dimen/sp_12"
         android:text="设为管理" />
     <TextView
         android:id="@+id/action_set_host"
-        android:layout_width="@dimen/dp_72"
+        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_18"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="@dimen/dp_10"
-        app:layout_constraintTop_toBottomOf="@+id/action_set_manager"
         android:gravity="center"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/dp_6"
         android:textColor="@color/color_FF999999"
         android:textSize="@dimen/sp_12"
         android:text="设为主持" />
     <TextView
         android:id="@+id/action_mute"
-        android:layout_width="@dimen/dp_72"
+        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_18"
-        app:layout_constraintTop_toBottomOf="@+id/action_set_host"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="@dimen/dp_10"
         android:gravity="center"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/dp_6"
         android:textColor="@color/color_FF999999"
         android:textSize="@dimen/sp_12"
-        android:text="闭麦" />
+        android:text="闭 麦" />
     <TextView
         android:id="@+id/action_kick_out"
-        android:layout_width="@dimen/dp_72"
+        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_18"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/action_mute"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="@dimen/dp_10"
         android:gravity="center"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/dp_6"
         android:textColor="@color/color_FF999999"
         android:textSize="@dimen/sp_12"
         android:text="踢出房间" />
     <TextView
         android:id="@+id/action_ban"
-        android:layout_width="@dimen/dp_72"
+        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_18"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/action_kick_out"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="@dimen/dp_10"
         android:gravity="center"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/dp_6"
         android:textColor="@color/color_FF999999"
         android:textSize="@dimen/sp_12"
-        android:text="禁言" />
+        android:text="禁 言" />
     <TextView
         android:id="@+id/action_report"
-        android:layout_width="@dimen/dp_72"
+        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_18"
+        android:minWidth="@dimen/dp_80"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/action_ban"
-        android:layout_marginTop="@dimen/dp_10"
         android:gravity="center"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/dp_6"
         android:textColor="@color/color_FF999999"
         android:textSize="@dimen/sp_12"
-        android:text="举报" />
+        android:text="举 报" />
     <TextView
         android:id="@+id/action_blacklist"
-        android:layout_width="@dimen/dp_72"
+        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_18"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/action_report"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginBottom="@dimen/dp_10"
-        android:layout_marginTop="@dimen/dp_10"
         android:gravity="center"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/dp_6"
         android:textColor="@color/color_FF999999"
         android:textSize="@dimen/sp_12"
         android:text="拉黑" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>

app/src/main/AndroidManifest.xml

@@ -202,15 +202,15 @@
             android:exported="true"
             />
 
-        <provider
+<!--        <provider-->
-            android:name="androidx.core.content.FileProvider"
+<!--            android:name="androidx.core.content.FileProvider"-->
-            android:authorities="${applicationId}.fileprovider"
+<!--            android:authorities="${applicationId}.fileprovider"-->
-            android:exported="false"
+<!--            android:exported="false"-->
-            android:grantUriPermissions="true">
+<!--            android:grantUriPermissions="true">-->
-            <meta-data
+<!--            <meta-data-->
-                android:name="android.support.FILE_PROVIDER_PATHS"
+<!--                android:name="android.support.FILE_PROVIDER_PATHS"-->
-                android:resource="@xml/file_paths" />
+<!--                android:resource="@xml/file_paths" />-->
-        </provider>
+<!--        </provider>-->
 
     </application>
 <!--    <queries>-->

gradle.properties

@@ -28,8 +28,8 @@ isBuildModule=false
 #org.gradle.deamon=false
 android.injected.testOnly=false
 
-APP_VERSION_NAME=1.0.6.3
+APP_VERSION_NAME=1.0.6.4
-APP_VERSION_CODE=53
+APP_VERSION_CODE=54
 
 org.gradle.jvm.toolchain.useLegacyAdapters=false
 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15