userHomePage add cp.

MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java

@@ -1,13 +1,20 @@
 package com.xscm.modulemain.activity.user.fragment;
 
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+
 import android.content.Intent;
+import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -16,6 +23,8 @@ import androidx.recyclerview.widget.GridLayoutManager;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
+import com.google.android.flexbox.FlexboxLayout;
+import com.xscm.modulemain.Application;
 import com.xscm.modulemain.R;
 import com.xscm.modulemain.databinding.FragmentUserHompageBinding;
 import com.tencent.imsdk.v2.V2TIMConversation;
@@ -46,8 +55,6 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
     private List<MyBagBean> list;
     private String userId;
     private UserInfo userInfo;
-    private BaseQuickAdapter<UserTagBean, BaseViewHolder> adapter;
-    private List<UserTagBean> userTagBeans = new ArrayList<>();
     private int type;
 
     @Override
@@ -107,7 +114,7 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
         list.add(new MyBagBean("动态", "1"));
         list.add(new MyBagBean("礼物墙", "2"));
         list.add(new MyBagBean("我的相册", "3"));
-        mBinding.viewPager.setAdapter(new MyFragmentPagerAdapter(getChildFragmentManager(), list, userInfo.getUser_id()+""));
+        mBinding.viewPager.setAdapter(new MyFragmentPagerAdapter(getChildFragmentManager(), list, userInfo.getUser_id() + ""));
         mBinding.slidingTabLayout.setViewPager(mBinding.viewPager);
         if (type == 1) {
             mBinding.slidingTabLayout.setCurrentTab(1);
@@ -115,11 +122,11 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
             mBinding.slidingTabLayout.setCurrentTab(0);
         }
         mBinding.headerInfo.rivUserHead.setData(userInfo.getAvatar(), "", userInfo.getNobility_image());
-        String sex = userInfo.getSex()==1?"男":"女";
-        mBinding.headerInfo.tvUserId.setText(sex+" | ID:"+userInfo.getUser_code());
+        String sex = userInfo.getSex() == 1 ? "男" : "女";
+        mBinding.headerInfo.tvUserId.setText(sex + "|" + userInfo.getAge() + "岁  " + "ID:" + userInfo.getUser_code());
 
         mBinding.headerInfo.tvNickName.setText(userInfo.getNickname());
-        if (!userInfo.getNickname_color().isEmpty()){
+        if (!userInfo.getNickname_color().isEmpty()) {
             mBinding.headerInfo.tvNickName.setStartColor(Color.parseColor(userInfo.getNickname_color()));
             mBinding.headerInfo.tvNickName.setShineColor(Color.parseColor(userInfo.getNickname_color()));
             mBinding.headerInfo.tvNickName.setEndColor(Color.parseColor(userInfo.getNickname_color()));
@@ -128,56 +135,59 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
         }
 //        mBinding.headerInfo.tvNickName.setTextColor( (userInfo.getNickname_color()!=null && !userInfo.getNickname_color().equals(""))?Color.parseColor(userInfo.getNickname_color()):Color.parseColor("#333333"));
 //        mBinding.headerInfo.tvUserId.setText(userInfo.getUser_code());
-        mBinding.headerInfo.tvAge.setText(userInfo.getAge() + "岁");
+//        mBinding.headerInfo.tvAge.setText(userInfo.getAge() + "岁");
         mBinding.headerInfo.tvJj.setText(userInfo.getProfile());
 
 
-        if (userInfo.getIs_use_code()==1){
+        if (userInfo.getIs_use_code() == 1) {
             mBinding.headerInfo.imBeautiful.setVisibility(View.VISIBLE);
-        }else {
+        } else {
             mBinding.headerInfo.imBeautiful.setVisibility(View.GONE);
         }
 
 
-        LinearLayout llContainer = mBinding.headerInfo.llImageContainer;
-        llContainer.removeAllViews(); // 清空旧的 ImageView
-
-        List<String> images = userInfo.getIcon(); // 获取图片列表
-
-        for (String url : images) {
+        if (!userInfo.getIcon().isEmpty()){
+            mBinding.headerInfo.flexEntry.setVisibility(VISIBLE);
+            for (String url : userInfo.getIcon()) {
                 if (url.contains("http")) {
-                ImageView imageView = new ImageView(getContext());
+                    ImageView imageView1 = new ImageView(Application.getInstance());
                     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
-                        getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_57),
-                        getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_15)
+                            LinearLayout.LayoutParams.WRAP_CONTENT,
+                            Application.getInstance().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_20)
                     );
-                params.setMargins(0, 0, getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_5), 0); // 右边距
-                imageView.setLayoutParams(params);
-                imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
+                    params.setMargins(0, 0,Application.getInstance().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_10), 0); // 右边距
+                    imageView1.setLayoutParams(params);
+                    imageView1.setScaleType(ImageView.ScaleType.FIT_START);
 
                     // 使用 Glide 加载图片
-                ImageUtils.loadHeadCC(url, imageView);
-
-                llContainer.addView(imageView);
+                    ImageUtils.loadHeadCC(url, imageView1,params);
+                    mBinding.headerInfo.flexEntry.addView(imageView1);
                 }
             }
-        mBinding.headerInfo.recycleView2.setLayoutManager(new GridLayoutManager(getContext(), 3));
-
-        adapter = new BaseQuickAdapter<UserTagBean, BaseViewHolder>(R.layout.item_tag, userTagBeans) {
-
-
-            @Override
-            protected void convert(BaseViewHolder helper, UserTagBean item) {
-                helper.setText(R.id.tv, item.getTag_name());
-
+        }else {
+            mBinding.headerInfo.flexEntry.setVisibility(GONE);
         }
 
-        };
-        mBinding.headerInfo.recycleView2.setAdapter(adapter);
         if (userInfo != null) {
-
             if (userInfo.getTag_list() != null && !userInfo.getTag_list().isEmpty()) {
-                adapter.setNewData(userInfo.getTag_list());
+                for (UserTagBean tagBean : userInfo.getTag_list()) {
+                    TextView textView = new TextView(Application.getInstance());
+                    textView.setBackground(getResources().getDrawable(R.drawable.shape_15));
+                    textView.setTextSize(12);
+                    textView.setPadding(30, 10, 30, 10);
+                    textView.setText(tagBean.getTag_name());
+                    textView.setTextColor(Color.parseColor("#FF3ABC6D"));
+                    textView.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#1A3ABC6D")));
+
+                    FlexboxLayout.LayoutParams params = new FlexboxLayout.LayoutParams(
+                            ViewGroup.LayoutParams.WRAP_CONTENT,
+                            ViewGroup.LayoutParams.WRAP_CONTENT
+                    );
+
+                    params.setMargins(0, 15, 15, 0);
+                    textView.setLayoutParams( params);
+                    mBinding.headerInfo.flexText.addView(textView);
+                }
             }
         }
 
@@ -185,19 +195,91 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
         mBinding.headerInfo.tvGz.setOnClickListener(this::onClick);
         mBinding.headerInfo.tvGsSx.setOnClickListener(this::onClick);
         refreshView();
-        try {
-            if (userInfo.getGuild()==null || userInfo.getGuild().isEmpty()){
-                mBinding.headerInfo.tvGH.setText("所属公会：无");
-            }else {
-                mBinding.headerInfo.tvGH.setText("所属公会："+userInfo.getGuild());
-            }
-        } catch (Exception ignored) {
-            mBinding.headerInfo.tvGH.setText("所属公会：无");
+        if (userInfo.getGuild() == null || userInfo.getGuild().isEmpty()) {
+            mBinding.headerInfo.tvGH.setVisibility(View.GONE);
+        } else {
+            mBinding.headerInfo.tvGH.setVisibility(View.VISIBLE);
+            mBinding.headerInfo.tvGH.setText(userInfo.getGuild());
         }
 
+        showCp();
+    }
+    private void showCp() {
+        if (userInfo.getCp_info() != null) {
+            mBinding.headerInfo.llCp.setVisibility(VISIBLE);
+            mBinding.headerInfo.rlCpAnim.setVisibility(VISIBLE);
+            ImageUtils.loadHeadCC(userInfo.getCp_info().user_info1.avatar, mBinding.headerInfo.userNav1);
+            ImageUtils.loadHeadCC(userInfo.getCp_info().user_info2.avatar, mBinding.headerInfo.userNav2);
+            mBinding.headerInfo.tvNickname1.setText(userInfo.getCp_info().user_info1.nickname);
+            mBinding.headerInfo.tvNickname2.setText(userInfo.getCp_info().user_info2.nickname);
+            mBinding.headerInfo.tvCpLv.setText("LV" + userInfo.getCp_info().level + " " + userInfo.getCp_info().name);
 
+            long xd = Long.parseLong(userInfo.getCp_info().exp);
+
+            if (xd >= 10000) {
+                mBinding.headerInfo.tvCpNum.setText(String.format("%.2fw", xd / 10000.0f));
+            } else {
+                mBinding.headerInfo.tvCpNum.setText(String.valueOf(xd));
             }
 
+            mBinding.headerInfo.cpAnim.setSource(userInfo.getCp_info().pendant, 1);
+
+
+            ImageUtils.loadHeadCC(userInfo.getCp_info().user_info1.avatar, mBinding.headerInfo.ivCp1);
+            ImageUtils.loadHeadCC(userInfo.getCp_info().user_info2.avatar, mBinding.headerInfo.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;
+                    params.bottomToTop = mBinding.headerInfo.topGuideline.getId();
+                    mBinding.headerInfo.llCpAnimAvatar.setOrientation(LinearLayout.HORIZONTAL);
+                    break;
+                case 1:
+                    mBinding.headerInfo.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
+                    params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
+                    params.topToTop = ConstraintLayout.LayoutParams.PARENT_ID;
+                    break;
+                case 2:
+                    mBinding.headerInfo.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.headerInfo.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
+                    params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
+                    params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
+                    break;
+                case 4:
+                    mBinding.headerInfo.llCpAnimAvatar.setOrientation(LinearLayout.HORIZONTAL);
+                    params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
+                    params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
+                    params.topToBottom = mBinding.headerInfo.bottomGuideline.getId();
+                    params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
+                    break;
+                case 5:
+                    mBinding.headerInfo.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
+                    params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
+                    params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID;
+                    break;
+                case 6:
+                    mBinding.headerInfo.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.headerInfo.llCpAnimAvatar.setOrientation(LinearLayout.VERTICAL);
+                    params.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
+                    params.topToTop = ConstraintLayout.LayoutParams.PARENT_ID;
+                    break;
+            }
+            mBinding.headerInfo.llCpAnimAvatar.setLayoutParams(params);
+        }
+    }
     private void refreshView() {
         if (SpUtil.getUserId() == userInfo.getUser_id()) {
             mBinding.headerInfo.tvGsSx.setVisibility(View.GONE);
@@ -207,19 +289,18 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
             mBinding.headerInfo.tvGz.setVisibility(View.VISIBLE);
             if (userInfo.getIs_follow() == 1) {
 //                mBinding.headerInfo.tvGz.setBackground(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.yigz));
-                ThemeableDrawableUtils.setThemeableRoundedBackground( mBinding.headerInfo.tvGz, ContextCompat.getColor(getContext(),  com.xscm.moduleutil.R.color.EFF2F8), 34);
-                mBinding.headerInfo.tvGz.setTextColor(Color.BLACK);
+                ThemeableDrawableUtils.setThemeableRoundedBackground(mBinding.headerInfo.tvGz, ContextCompat.getColor(getContext(), com.xscm.moduleutil.R.color.EFF2F8), 34);
                 mBinding.headerInfo.tvGz.setText("已关注");
+                mBinding.headerInfo.tvGz.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#ff999999")));
             } else {
 //                mBinding.headerInfo.tvGz.setBackground(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.gz));
 
-                ThemeableDrawableUtils.setThemeableRoundedBackground( mBinding.headerInfo.tvGz, ColorManager.getInstance().getPrimaryColorInt(), 34);
-                mBinding.headerInfo.tvGz.setTextColor(ColorManager.getInstance().getButtonColorInt());
-                mBinding.headerInfo.tvGz.setText("关注");
+                ThemeableDrawableUtils.setThemeableRoundedBackground(mBinding.headerInfo.tvGz, ColorManager.getInstance().getPrimaryColorInt(), 34);
+                mBinding.headerInfo.tvGz.setText("+ 关注");
+                mBinding.headerInfo.tvGz.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#ff52FF96")));
             }
 
 
-
             if (userInfo.getRoom_id() == null || userInfo.getRoom_id().equals("0")) {
                 mBinding.headerInfo.tvGsSx.setBackground(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.six));
             } else {
@@ -239,7 +320,7 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
                 intent.putExtra(TUIConstants.TUIChat.CHAT_TYPE, V2TIMConversation.V2TIM_C2C);
                 startActivity(intent);
             } else {
-                RoomManager.getInstance().fetchRoomDataAndEnter(getActivity(), userInfo.getRoom_id(),"",null);
+                RoomManager.getInstance().fetchRoomDataAndEnter(getActivity(), userInfo.getRoom_id(), "", null);
 
 //                ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("roomId", userInfo.getRoom_id()).navigation();
             }

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

@@ -254,10 +254,10 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
         } else if (id == R.id.more_button) {
             RelationshipFragment.show(user_id, guanType, getParentFragmentManager());
             dismiss();
-        } else if (id == R.id.textView1) {
-            dianj(1);
-        } else if (id == R.id.textView2) {
-            dianj(2);
+//        } else if (id == R.id.textView1) {
+//            dianj(1);
+//        } else if (id == R.id.textView2) {
+//            dianj(2);
         } else if (id == R.id.im_qml) {
             MvpPre.clearUserCharm(room_id, user_id);
         } else if (id == R.id.im_gs) {
@@ -475,9 +475,10 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
             if (userInfo.getGuild().isEmpty()) {
                 mBinding.tvGh.setText("所属公会：无");
             } else {
-                if (userInfo.getUser_id() != SpUtil.getUserId()) {
+                if (userInfo.getUser_id() != SpUtil.getUserId() && !userInfo.getGuild().equals(SpUtil.getUserInfo().getGuild())){
                     mBinding.tvJoinGuild.setVisibility(VISIBLE);
                 }
+
                 mBinding.tvGh.setText("所属公会：" + userInfo.getGuild());
             }
         } else {
@@ -495,7 +496,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
         });
 
         updateUIBasedOnTypeAndUser();
-        dianj(1);
+//        dianj(1);
         showCp();
     }
 
@@ -506,8 +507,15 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
             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.tvCpLv.setText("LV" + userInfo.getCp_info().level + " " + userInfo.getCp_info().name);
+
+            long xd = Long.parseLong(userInfo.getCp_info().exp);
+
+            if (xd >= 10000) {
+                mBinding.tvCpNum.setText(String.format("%.2fw", xd / 10000.0f));
+            } else {
+                mBinding.tvCpNum.setText(String.valueOf(xd));
+            }
 
             mBinding.cpAnim.setSource(userInfo.getCp_info().pendant, 1);
 

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

@@ -295,7 +295,7 @@
                     android:id="@+id/bottom_guideline"
                     android:layout_width="@dimen/dp_1"
                     android:orientation="horizontal"
-                    app:layout_constraintGuide_percent="0.65"
+                    app:layout_constraintGuide_percent="0.62"
                     android:layout_height="0dp"/>
 
                 <com.xscm.moduleutil.widget.AvatarFrameView
@@ -304,7 +304,7 @@
                     android:layout_height="match_parent"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintDimensionRatio="1.1:2"
+                    app:layout_constraintDimensionRatio="115:210"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 

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

@@ -10,7 +10,6 @@
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-
         android:layout_marginTop="@dimen/dp_64">
 
         <com.google.android.material.appbar.AppBarLayout
@@ -62,7 +61,6 @@
             android:id="@+id/view_pager"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/bg_r16_f6f6f6"
             android:layout_marginStart="@dimen/dp_15"
             android:layout_marginEnd="@dimen/dp_15"
             app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />

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

@@ -7,65 +7,102 @@
 
     </data>
 
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:clipChildren="false">
+        android:clipChildren="false"
+        android:orientation="vertical">
 
-
-        <RelativeLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_177"
-            android:layout_marginStart="@dimen/dp_16"
+            android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_60"
-            android:layout_marginEnd="@dimen/dp_16"
-            android:background="@drawable/bg_r16_fff">
+            android:background="@drawable/bg_r16_fff"
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            android:paddingHorizontal="@dimen/dp_15"
+            android:paddingBottom="@dimen/dp_10">
 
             <com.xscm.moduleutil.utils.MeHeadView
                 android:id="@+id/riv_user_head"
                 android:layout_width="@dimen/dp_70"
-                android:layout_height="@dimen/dp_70"
-                android:layout_marginTop="-20dp" />
+                android:layout_height="@dimen/dp_74"
+                android:layout_marginTop="-20dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-            <TextView
-                android:id="@+id/tv_gz"
-                android:layout_width="@dimen/dp_91"
-                android:layout_height="@dimen/dp_29"
-                android:layout_marginTop="@dimen/dp_19"
-                android:layout_marginEnd="@dimen/dp_6"
-                android:layout_toStartOf="@+id/tv_gs_sx"
-                android:gravity="center"
-                android:text="关注" />
+            <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:layout_marginTop="-20dp"
+                android:visibility="gone"
+                app:layout_constraintStart_toEndOf="@+id/riv_user_head"
+                app:layout_constraintTop_toTopOf="@+id/riv_user_head" />
 
-            <TextView
-                android:id="@+id/tv_gs_sx"
-                android:layout_width="@dimen/dp_91"
-                android:layout_height="@dimen/dp_29"
-                android:layout_alignParentEnd="true"
-                android:layout_marginTop="@dimen/dp_19"
-                android:layout_marginEnd="@dimen/dp_12"
-                android:background="@mipmap/gsui" />
 
             <com.xscm.moduleutil.widget.ShineTextView
                 android:id="@+id/tv_nick_name"
                 android:layout_width="wrap_content"
-                app:isShine="false"
-                android:layout_height="@dimen/dp_24"
-                android:layout_below="@+id/riv_user_head"
-                android:layout_marginStart="@dimen/dp_15"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_4"
                 android:textColor="@color/color_FF333333"
                 android:textSize="@dimen/sp_16"
-                tools:text="备注名" />
+                app:isShine="false"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/riv_user_head"
+                tools:text="User Name" />
 
-            <LinearLayout
+            <TextView
+                android:id="@+id/tv_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_nick_name"
+                app:layout_constraintStart_toEndOf="@+id/tv_nick_name"
+                app:layout_constraintTop_toTopOf="@+id/tv_nick_name" />
+
+            <TextView
+                android:id="@+id/tv_gs_sx"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_6"
+                android:layout_marginEnd="@dimen/dp_10"
+                android:background="@mipmap/gsui"
+                app:layout_constraintEnd_toStartOf="@id/tv_g_h"
+                app:layout_constraintTop_toTopOf="parent" />
+
+
+            <TextView
+                android:id="@+id/tv_age"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/tv_nick_name"
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_8"
+                android:text="25岁"
+                android:textColor="@color/color_FF999999"
+                android:textSize="@dimen/sp_12"
+                android:visibility="gone"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <LinearLayout
+                android:id="@+id/ll_id"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignTop="@+id/tv_nick_name"
-                android:layout_marginStart="@dimen/dp_12"
                 android:layout_marginTop="@dimen/dp_4"
-                android:layout_toEndOf="@id/tv_nick_name"
-                android:gravity="center">
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_nick_name"
+                app:layout_goneMarginTop="@dimen/dp_5">
 
                 <TextView
                     android:layout_width="@dimen/dp_20"
@@ -73,7 +110,7 @@
                     android:text="ID:"
                     android:textColor="@color/color_FF999999"
                     android:textSize="@dimen/sp_12"
-                    android:visibility="gone"/>
+                    android:visibility="gone" />
 
                 <TextView
                     android:id="@+id/tv_user_id"
@@ -88,77 +125,288 @@
                     android:layout_width="wrap_content"
                     android:layout_height="@dimen/dp_11"
                     android:layout_marginLeft="5dp"
-                    app:layout_constraintStart_toEndOf="@+id/tv_copy"
-                    app:layout_constraintTop_toTopOf="@+id/tv_copy"
                     android:scaleType="fitCenter"
-                    android:src="@mipmap/beautiful"/>
+                    android:src="@mipmap/beautiful"
+                    app:layout_constraintStart_toEndOf="@+id/tv_copy"
+                    app:layout_constraintTop_toTopOf="@+id/tv_copy" />
 
             </LinearLayout>
 
-            <TextView
-                android:id="@+id/tv_age"
-                android:layout_width="wrap_content"
+
+            <com.google.android.flexbox.FlexboxLayout
+                android:id="@+id/flex_entry"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/tv_nick_name"
-                android:layout_marginStart="@dimen/dp_16"
-                android:layout_marginTop="@dimen/dp_8"
-                android:text="25岁"
-                android:textColor="@color/color_FF999999"
-                android:textSize="@dimen/sp_12" />
-
-            <!--            <androidx.recyclerview.widget.RecyclerView-->
-
-            <!--                android:id="@+id/recycle_view1"-->
-            <!--                android:layout_width="wrap_content"-->
-            <!--                android:layout_height="@dimen/dp_16"-->
-            <!--                android:layout_toRightOf="@+id/tv_age"-->
-            <!--                android:layout_marginStart="@dimen/dp_8"-->
-            <!--                android:layout_alignTop="@+id/tv_age"/>-->
-
-            <LinearLayout
-                android:id="@+id/ll_image_container"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/dp_16"
-                android:layout_alignTop="@+id/tv_age"
-                android:layout_marginStart="@dimen/dp_8"
-                android:layout_toRightOf="@+id/tv_age"
-                android:orientation="horizontal" />
+                app:alignContent="flex_start"
+                app:alignItems="flex_start"
+                app:flexWrap="wrap"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/ll_id" />
 
             <TextView
                 android:id="@+id/tv_g_h"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/tv_age"
-                android:layout_marginStart="@dimen/dp_16"
-                android:layout_marginTop="@dimen/dp_8"
-                android:textColor="@color/color_FF999999"
-                android:textSize="@dimen/sp_12"
+                android:layout_marginTop="@dimen/dp_6"
+                android:background="@mipmap/icon_guild_bg"
+                android:paddingStart="@dimen/dp_11"
+                android:paddingTop="@dimen/dp_4"
+                android:paddingEnd="@dimen/dp_10"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_10"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
                 tools:text="所属公会：" />
 
             <TextView
                 android:id="@+id/tv_jj"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_22"
-                android:layout_below="@id/tv_g_h"
-                android:layout_marginStart="@dimen/dp_16"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/flex_entry"
                 android:layout_marginTop="@dimen/dp_8"
-                android:layout_marginEnd="@dimen/dp_16"
                 android:ellipsize="end"
-                android:gravity="left|center"
                 android:singleLine="true"
-                android:textColor="@color/color_FF333333"
-                android:textSize="@dimen/sp_14"
+                android:textColor="#A6000000"
+                android:textSize="@dimen/sp_12"
+                app:layout_constraintEnd_toStartOf="@+id/rl_cp_anim"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/flex_entry"
                 tools:text="时光会教会你所有的过去，但你只能看到现在，所以好好" />
 
-            <androidx.recyclerview.widget.RecyclerView
+            <com.google.android.flexbox.FlexboxLayout
+                android:id="@+id/flex_text"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_10"
+                app:alignContent="flex_start"
+                app:alignItems="flex_start"
+                app:flexWrap="wrap"
+                app:layout_constraintEnd_toStartOf="@+id/rl_cp_anim"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_jj" />
 
-                android:id="@+id/recycle_view2"
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline"
+                android:layout_width="@dimen/dp_1"
+                android:layout_height="0dp"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.54" />
+
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/rl_cp_anim"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/guideline"
+                app:layout_constraintTop_toBottomOf="@+id/tv_g_h">
+
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/top_guideline"
+                    android:layout_width="@dimen/dp_1"
+                    android:layout_height="0dp"
+                    android:orientation="horizontal"
+                    app:layout_constraintGuide_percent="0.22" />
+
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/bottom_guideline"
+                    android:layout_width="@dimen/dp_1"
+                    android:layout_height="0dp"
+                    android:orientation="horizontal"
+                    app:layout_constraintGuide_percent="0.62" />
+
+                <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_constraintDimensionRatio="1:2"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    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="@dimen/dp_24"
-                android:layout_below="@+id/tv_jj"
-                android:layout_marginStart="@dimen/dp_16"
-                android:layout_marginTop="@dimen/dp_8" />
-        </RelativeLayout>
+                    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_width="@dimen/dp_30"
+                        android:layout_height="@dimen/dp_30"
+                        android:layout_margin="1.5dp" />
+
+                    <com.xscm.moduleutil.widget.CircularImage
+                        android:id="@+id/iv_cp_2"
+                        android:layout_width="@dimen/dp_30"
+                        android:layout_height="@dimen/dp_30"
+                        android:layout_margin="1.5dp" />
+                </LinearLayout>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+        <RelativeLayout
+            android:id="@+id/ll_cp"
+            android:visibility="gone"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/dp_16"
+            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">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@mipmap/icon_dialog_u_cp_left_top"
+                android:gravity="center"
+                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:ellipsize="end"
+                    android:lines="1"
+                    android:maxWidth="@dimen/dp_70"
+                    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:id="@+id/tv_cp_lv"
+                    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: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"
+                    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:ellipsize="end"
+                    android:lines="1"
+                    android:maxWidth="@dimen/dp_70"
+                    android:text="用户昵称"
+                    android:textColor="#FF624E79"
+                    android:textSize="@dimen/sp_10" />
+            </LinearLayout>
+
+            <RelativeLayout
+                android:id="@+id/rl_reqit"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="@dimen/dp_50"
+                android:background="@mipmap/regit_t"
+                android:visibility="gone">
+
+                <TextView
+                    android:id="@+id/tv_relation"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="@dimen/dp_40"
+                    android:gravity="center"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_12"
+                    android:textStyle="bold"
+                    tools:text="开始使用" />
 
             </RelativeLayout>
+
+
+            <TextView
+                android:id="@+id/tv_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:background="@drawable/bg_r53_33333"
+                android:gravity="center"
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_9"
+                android:visibility="gone"
+                tools:text="5天" />
+        </RelativeLayout>
+
+    </LinearLayout>
 </layout>