个人展示页

app/src/main/AndroidManifest.xml

@@ -272,6 +272,9 @@
         <activity
             android:name=".view.main.GiftReceivedActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".view.main.GiftReceived2Activity"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".view.dynamics.activity.ImageDisplayActivity"
             android:screenOrientation="portrait" />
@@ -281,6 +284,9 @@
         <activity
             android:name=".view.main.MainPageActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".view.main.MainPageCommentActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".view.main.AllChannelActivity"
             android:screenOrientation="portrait" />
@@ -425,6 +431,10 @@
         <activity
             android:name=".view.main.VideoFinishActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".view.main.VideoFinish2Activity"
+            android:screenOrientation="portrait"
+            android:theme="@style/activity_dialog"/>
         <activity android:name=".view.news.activity.FakeActivity" />
         <activity
             android:name=".view.news.activity.Fake2Activity"

app/src/main/java/com/xuebiping/bolizhuzi/controller/constant/ConstUrl.java

@@ -83,6 +83,7 @@ public class ConstUrl {
     public final static String FREEANCHOR = getUrl(BASE_URL, MAIN_FIELD, "freeAnchor");
     public final static String CHANNEL_DATA = getUrl(BASE_URL, CHANNEL_FIELD, "anchors");
     public final static String MAIN_PAGE_DATA = getUrl(BASE_URL, USER_FIELD, "info");
+    public final static String WECHAT_INTIMACY = getUrl(BASE_URL, USER_FIELD, "getWechatIntimacy");
     public final static String GET_ALL_CHANNELS = getUrl(BASE_URL, CHANNEL_FIELD, "lists");
     public final static String BE_ANCHOR_STATUS = getUrl(BASE_URL, ANCHOR_FIELD, "join");
     public final static String GET_SELFIE_EXAMPLE = getUrl(BASE_URL, ANCHOR_FIELD, "camera_audit");
@@ -159,6 +160,7 @@ public class ConstUrl {
     public final static String DO_COMPLAINT = getUrl(BASE_URL, USER_FIELD, "report");
     public final static String DO_BLACK = getUrl(BASE_URL, USER_FIELD, "black");
     public final static String GET_USER_DYNAMIC_LIST = getUrl(BASE_URL, USER_FIELD, "dynamic_list");
+    public final static String MAIN_COMMENT_LIST = getUrl(BASE_URL, USER_FIELD, "comment_list");
     public final static String GET_WITHDRAW_INFO = getUrl(BASE_URL, WALLET_FIELD, "withdraw");
     public final static String BIND_ACCOUNT = getUrl(BASE_URL, WALLET_FIELD, "bind_alipay");
     public final static String GET_BIND_ACCOUNT = getUrl(BASE_URL, WALLET_FIELD, "alipay");

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/GiftReceived2Adapter.java

@@ -0,0 +1,35 @@
+package com.xuebiping.bolizhuzi.controller.main.adapter;
+
+import android.content.Context;
+import android.widget.TextView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.viewholder.BaseViewHolder;
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.xuebiping.bolizhuzi.R;
+import com.xuebiping.bolizhuzi.model.main.GiftReceivedItemBean;
+import com.xuebiping.bolizhuzi.utils.StrU;
+
+import org.jetbrains.annotations.NotNull;
+
+public class GiftReceived2Adapter extends BaseQuickAdapter<GiftReceivedItemBean, BaseViewHolder> {
+
+    private Context mContext;
+
+    public GiftReceived2Adapter(int layoutResId, Context context) {
+        super(layoutResId);
+        this.mContext = context;
+    }
+
+    @Override
+    protected void convert(@NotNull BaseViewHolder baseViewHolder, GiftReceivedItemBean bean) {
+
+        SimpleDraweeView gift_received_logo = baseViewHolder.getView(R.id.gift_received_logo);
+        TextView gift_received_name = baseViewHolder.getView(R.id.gift_received_name);
+        TextView gift_received_number = baseViewHolder.getView(R.id.gift_received_number);
+
+        gift_received_logo.setImageURI(StrU.getResourcePath(bean.getImg(), mContext));
+        gift_received_name.setText(bean.getName());
+        gift_received_number.setText("x" + bean.getTotal());
+    }
+}

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/MainPageCommentAdapter.java

@@ -0,0 +1,110 @@
+package com.xuebiping.bolizhuzi.controller.main.adapter;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.TextView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.viewholder.BaseViewHolder;
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.xuebiping.bolizhuzi.R;
+import com.xuebiping.bolizhuzi.model.main.MainPageCommentInfoBean;
+import com.xuebiping.bolizhuzi.utils.StrU;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class MainPageCommentAdapter extends BaseQuickAdapter<MainPageCommentInfoBean, BaseViewHolder> {
+
+    private Context mContext;
+    private int[] mImage_bg = new int[]{R.drawable.shape_comment1_bg, R.drawable.shape_comment2_bg, R.drawable.shape_comment3_bg, R.drawable.shape_comment4_bg, R.drawable.shape_comment5_bg};
+
+    public MainPageCommentAdapter(int layoutResId, Context context) {
+        super(layoutResId);
+        this.mContext = context;
+    }
+
+    @Override
+    protected void convert(@NotNull BaseViewHolder baseViewHolder, MainPageCommentInfoBean bean) {
+        SimpleDraweeView list_photo = baseViewHolder.getView(R.id.list_photo);
+        TextView tv_name = baseViewHolder.getView(R.id.tv_name);
+        TextView tv_level = baseViewHolder.getView(R.id.tv_level);
+        TextView tv_comment1 = baseViewHolder.getView(R.id.tv_comment1);
+        TextView tv_comment2 = baseViewHolder.getView(R.id.tv_comment2);
+        TextView tv_comment3 = baseViewHolder.getView(R.id.tv_comment3);
+
+        list_photo.setImageURI(StrU.getResourcePath(bean.getAvatar(), mContext));
+        tv_name.setText(bean.getNickname());
+        tv_level.setText("LV." + bean.getLevel());
+
+        int level = bean.getLevel();
+        if (level > 0 && level <= 20) {
+            tv_level.setBackgroundResource(R.drawable.shape_level_1_20_bg);
+        } else if (level > 20 && level <= 40) {
+            tv_level.setBackgroundResource(R.drawable.shape_level_21_40_bg);
+        } else if (level > 40 && level <= 60) {
+            tv_level.setBackgroundResource(R.drawable.shape_level_41_60_bg);
+        } else if (level > 60 && level <= 80) {
+            tv_level.setBackgroundResource(R.drawable.shape_level_61_80_bg);
+        } else if (level > 80) {
+            tv_level.setBackgroundResource(R.drawable.shape_level_81_100_bg);
+        }
+
+        List<String> labels = bean.getLabels();
+        if (labels != null && labels.size() > 0) {
+            if (labels.size() == 1) {
+                tv_comment1.setVisibility(View.VISIBLE);
+                tv_comment2.setVisibility(View.GONE);
+                tv_comment3.setVisibility(View.GONE);
+
+                tv_comment1.setText(labels.get(0));
+
+                if (bean.getAttitude() == 1) {  //喜欢
+                    int x = (int) (Math.random() * 5);
+                    tv_comment1.setBackgroundResource(mImage_bg[x]);
+                }else {
+                    tv_comment1.setBackgroundResource(R.drawable.shape_comment_dislike_bg);
+                }
+            }else if (labels.size() == 2) {
+                tv_comment1.setVisibility(View.VISIBLE);
+                tv_comment2.setVisibility(View.VISIBLE);
+                tv_comment3.setVisibility(View.GONE);
+
+                tv_comment1.setText(labels.get(0));
+                tv_comment2.setText(labels.get(1));
+
+                if (bean.getAttitude() == 1) {  //喜欢
+                    int x = (int) (Math.random() * 5);
+                    tv_comment1.setBackgroundResource(mImage_bg[x]);
+                    int x2 = (int) (Math.random() * 5);
+                    tv_comment2.setBackgroundResource(mImage_bg[x2]);
+                }else {
+                    tv_comment1.setBackgroundResource(R.drawable.shape_comment_dislike_bg);
+                    tv_comment2.setBackgroundResource(R.drawable.shape_comment_dislike_bg);
+                }
+            }else {
+                tv_comment1.setVisibility(View.VISIBLE);
+                tv_comment2.setVisibility(View.VISIBLE);
+                tv_comment3.setVisibility(View.VISIBLE);
+
+                tv_comment1.setText(labels.get(0));
+                tv_comment2.setText(labels.get(1));
+                tv_comment3.setText(labels.get(2));
+
+                if (bean.getAttitude() == 1) {  //喜欢
+                    int x = (int) (Math.random() * 5);
+                    tv_comment1.setBackgroundResource(mImage_bg[x]);
+                    int x2 = (int) (Math.random() * 5);
+                    tv_comment2.setBackgroundResource(mImage_bg[x2]);
+                    int x3 = (int) (Math.random() * 5);
+                    tv_comment2.setBackgroundResource(mImage_bg[x3]);
+                }else {
+                    tv_comment1.setBackgroundResource(R.drawable.shape_comment_dislike_bg);
+                    tv_comment2.setBackgroundResource(R.drawable.shape_comment_dislike_bg);
+                    tv_comment3.setBackgroundResource(R.drawable.shape_comment_dislike_bg);
+                }
+            }
+        }
+    }
+}

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/MainRecommendAdapter.java

@@ -1,6 +1,7 @@
 package com.xuebiping.bolizhuzi.controller.main.adapter;
 
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Color;
 import android.view.View;
 import android.view.ViewGroup;
@@ -19,6 +20,7 @@ import com.xuebiping.bolizhuzi.model.main.AnchorBean;
 import com.xuebiping.bolizhuzi.model.main.LookMeBean;
 import com.xuebiping.bolizhuzi.utils.SPUtils;
 import com.xuebiping.bolizhuzi.utils.StrU;
+import com.xuebiping.bolizhuzi.view.main.MainPageActivity;
 import com.xuebiping.bolizhuzi.view.main.utils.UiUtils;
 
 import net.lucode.hackware.magicindicator.buildins.UIUtil;
@@ -200,7 +202,6 @@ public class MainRecommendAdapter extends BaseQuickAdapter<AnchorBean, BaseViewH
         list_photo.setImageURI(StrU.getResourcePath(bean.getCover(), mContext));
         tv_name.setText(bean.getNickname());
         tv_signature.setText(bean.getSignature());
-        tv_signature.setText("我说心动之上 哈哈哈哈");
 
         if (bean.getOnline_status() == 0) {
             view_online_status.setBackgroundResource(R.drawable.shape_999999_oval_bg);
@@ -213,6 +214,15 @@ public class MainRecommendAdapter extends BaseQuickAdapter<AnchorBean, BaseViewH
             tv_online_status.setText("活跃");
         }
 
+        card_view.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(mContext, MainPageActivity.class);
+                intent.putExtra("userId", bean.getUserid());
+                mContext.startActivity(intent);
+            }
+        });
+
     }
 
     private void setStarLevel(AnchorBean bean, ImageView ivStar1, ImageView ivStar2, ImageView ivStar3, ImageView ivStar4, ImageView ivStar5) {

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/manager/MainManager.java

@@ -26,9 +26,11 @@ import com.xuebiping.bolizhuzi.model.main.GlobalConfigBean;
 import com.xuebiping.bolizhuzi.model.main.GroupCallBean;
 import com.xuebiping.bolizhuzi.model.main.GuardListBean;
 import com.xuebiping.bolizhuzi.model.main.IsKidModelBean;
+import com.xuebiping.bolizhuzi.model.main.LookWechatBean;
 import com.xuebiping.bolizhuzi.model.main.MainBean;
 import com.xuebiping.bolizhuzi.model.main.MainPageAnchorBean;
 import com.xuebiping.bolizhuzi.model.main.MainPageBean;
+import com.xuebiping.bolizhuzi.model.main.MainPageCommentListBean;
 import com.xuebiping.bolizhuzi.model.main.MainPageSwitchSwerviceNumBean;
 import com.xuebiping.bolizhuzi.model.main.PrizeBean;
 import com.xuebiping.bolizhuzi.model.main.RedEnvelopesBean;
@@ -389,6 +391,27 @@ public class MainManager {
         task.start();
     }
 
+    public static void getWechatIntimacy(BaseActivity activity,
+                                       final int to_uid, HttpUiCallBack<LookWechatBean> httpUiCallBack) {
+        HttpWithUiTask<LookWechatBean> task = new HttpWithUiTask<LookWechatBean>(activity, httpUiCallBack) {
+            @Override
+            protected HttpResult<LookWechatBean> run() throws Exception {
+                final String url = ConstUrl.WECHAT_INTIMACY;
+                HttpRequest.Builder builder = new HttpRequest.Builder()
+                        .setResultType(new TType<HttpResult<LookWechatBean>>() {
+
+                        }).setHttpMethod(HttpMethod.POST)
+                        .addParam("to_uid", to_uid + "")
+                        .setUrl(url);
+
+                HttpRequest request = builder.build();
+                return request.request();
+            }
+        };
+
+        task.start();
+    }
+
     public static void getAllChannels(BaseActivity activity,
                                       HttpUiCallBack<List<SkillAnchorBean>> httpUiCallBack) {
         HttpWithUiTask<List<SkillAnchorBean>> task = new HttpWithUiTask<List<SkillAnchorBean>>(activity, httpUiCallBack) {
@@ -951,6 +974,30 @@ public class MainManager {
         task.start();
     }
 
+    public static void getMainCommentList(BaseActivity activity,
+                                          final String uid,
+                                         final int page,
+                                         HttpUiCallBack<MainPageCommentListBean> httpUiCallBack) {
+        HttpWithUiTask<MainPageCommentListBean> task = new HttpWithUiTask<MainPageCommentListBean>(activity, httpUiCallBack) {
+            @Override
+            protected HttpResult<MainPageCommentListBean> run() throws Exception {
+                String url = ConstUrl.MAIN_COMMENT_LIST;
+                HttpRequest.Builder builder = new HttpRequest.Builder()
+                        .setResultType(new TType<HttpResult<MainPageCommentListBean>>() {
+
+                        }).setHttpMethod(HttpMethod.POST)
+                        .addParam("user_id", uid)
+                        .addParam("page", page + "")
+                        .setUrl(url);
+
+                HttpRequest request = builder.build();
+                return request.request();
+            }
+        };
+
+        task.start(false);
+    }
+
     public static void getGenderActiveList(BaseActivity activity,
                                          final int gender,
                                          final int page,
@@ -1062,6 +1109,35 @@ public class MainManager {
         task.start();
     }
 
+    public static void evaluateVideo2(BaseActivity activity,
+                                     final String roomId,
+                                     final int score,
+                                     int attitude,
+                                     String label_names,
+                                     HttpUiCallBack<Object> httpUiCallBack) {
+        HttpWithUiTask<Object> task = new HttpWithUiTask<Object>(activity, httpUiCallBack) {
+            @Override
+            protected HttpResult<Object> run() throws Exception {
+                String url = ConstUrl.EVALUATE_VIDEO;
+
+                HttpRequest.Builder builder = new HttpRequest.Builder()
+                        .setResultType(new TType<HttpResult<Object>>() {
+
+                        }).setHttpMethod(HttpMethod.POST)
+                        .addParam("room_id", roomId)
+                        .addParam("score", score + "")
+                        .addParam("attitude", attitude + "")
+                        .addParam("label_names", label_names + "")
+                        .setUrl(url);
+
+                HttpRequest request = builder.build();
+                return request.request();
+            }
+        };
+
+        task.start();
+    }
+
     /**
      * 用户活跃更新
      *

app/src/main/java/com/xuebiping/bolizhuzi/model/main/LookWechatBean.java

@@ -0,0 +1,95 @@
+package com.xuebiping.bolizhuzi.model.main;
+
+public class LookWechatBean {
+
+    private String my_avatar;
+    private String to_avatar;
+    private String wechat;
+    private int intimacy;
+    private int intimacy_percent;
+    private int unlock_coin;
+    private int svip_unlock_coin;
+    private int member_type;
+    private String risk_tips;
+    private String footer_tips;
+
+    public String getMy_avatar() {
+        return my_avatar;
+    }
+
+    public void setMy_avatar(String my_avatar) {
+        this.my_avatar = my_avatar;
+    }
+
+    public String getTo_avatar() {
+        return to_avatar;
+    }
+
+    public void setTo_avatar(String to_avatar) {
+        this.to_avatar = to_avatar;
+    }
+
+    public String getWechat() {
+        return wechat;
+    }
+
+    public void setWechat(String wechat) {
+        this.wechat = wechat;
+    }
+
+    public int getIntimacy() {
+        return intimacy;
+    }
+
+    public void setIntimacy(int intimacy) {
+        this.intimacy = intimacy;
+    }
+
+    public int getIntimacy_percent() {
+        return intimacy_percent;
+    }
+
+    public void setIntimacy_percent(int intimacy_percent) {
+        this.intimacy_percent = intimacy_percent;
+    }
+
+    public int getUnlock_coin() {
+        return unlock_coin;
+    }
+
+    public void setUnlock_coin(int unlock_coin) {
+        this.unlock_coin = unlock_coin;
+    }
+
+    public int getSvip_unlock_coin() {
+        return svip_unlock_coin;
+    }
+
+    public void setSvip_unlock_coin(int svip_unlock_coin) {
+        this.svip_unlock_coin = svip_unlock_coin;
+    }
+
+    public int getMember_type() {
+        return member_type;
+    }
+
+    public void setMember_type(int member_type) {
+        this.member_type = member_type;
+    }
+
+    public String getRisk_tips() {
+        return risk_tips;
+    }
+
+    public void setRisk_tips(String risk_tips) {
+        this.risk_tips = risk_tips;
+    }
+
+    public String getFooter_tips() {
+        return footer_tips;
+    }
+
+    public void setFooter_tips(String footer_tips) {
+        this.footer_tips = footer_tips;
+    }
+}

app/src/main/java/com/xuebiping/bolizhuzi/model/main/MainCommentStatusBean.java

@@ -0,0 +1,32 @@
+package com.xuebiping.bolizhuzi.model.main;
+
+public class MainCommentStatusBean {
+
+    private int total;
+    private int like_count;
+    private int dislike_count;
+
+    public int getTotal() {
+        return total;
+    }
+
+    public void setTotal(int total) {
+        this.total = total;
+    }
+
+    public int getLike_count() {
+        return like_count;
+    }
+
+    public void setLike_count(int like_count) {
+        this.like_count = like_count;
+    }
+
+    public int getDislike_count() {
+        return dislike_count;
+    }
+
+    public void setDislike_count(int dislike_count) {
+        this.dislike_count = dislike_count;
+    }
+}

app/src/main/java/com/xuebiping/bolizhuzi/model/main/MainPageBean.java

@@ -26,6 +26,33 @@ public class MainPageBean {
     private String is_interactive;
     //  是否给对方发过消息：1 = 是、0 = 否
     private String is_sent;
+    private List<String> personal_info;
+    private String qrcode;
+    private MainPageCommentListBean comment;
+
+    public MainPageCommentListBean getComment() {
+        return comment;
+    }
+
+    public void setComment(MainPageCommentListBean comment) {
+        this.comment = comment;
+    }
+
+    public String getQrcode() {
+        return qrcode;
+    }
+
+    public void setQrcode(String qrcode) {
+        this.qrcode = qrcode;
+    }
+
+    public List<String> getPersonal_info() {
+        return personal_info;
+    }
+
+    public void setPersonal_info(List<String> personal_info) {
+        this.personal_info = personal_info;
+    }
 
     public ContactBean getContact() {
         return contact;

app/src/main/java/com/xuebiping/bolizhuzi/model/main/MainPageCommentInfoBean.java

@@ -0,0 +1,61 @@
+package com.xuebiping.bolizhuzi.model.main;
+
+import java.util.List;
+
+public class MainPageCommentInfoBean {
+
+    private int from_uid;
+    private String nickname;
+    private String avatar;
+    private int level;
+    private int attitude;
+    private List<String> labels;
+
+    public int getFrom_uid() {
+        return from_uid;
+    }
+
+    public void setFrom_uid(int from_uid) {
+        this.from_uid = from_uid;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
+
+    public int getAttitude() {
+        return attitude;
+    }
+
+    public void setAttitude(int attitude) {
+        this.attitude = attitude;
+    }
+
+    public List<String> getLabels() {
+        return labels;
+    }
+
+    public void setLabels(List<String> labels) {
+        this.labels = labels;
+    }
+}

app/src/main/java/com/xuebiping/bolizhuzi/model/main/MainPageCommentListBean.java

@@ -0,0 +1,43 @@
+package com.xuebiping.bolizhuzi.model.main;
+
+import java.util.List;
+
+public class MainPageCommentListBean {
+
+    private int page;
+    private int total_page;
+    private MainCommentStatusBean stats;
+    private List<MainPageCommentInfoBean> list;
+
+    public int getPage() {
+        return page;
+    }
+
+    public void setPage(int page) {
+        this.page = page;
+    }
+
+    public int getTotal_page() {
+        return total_page;
+    }
+
+    public void setTotal_page(int total_page) {
+        this.total_page = total_page;
+    }
+
+    public MainCommentStatusBean getStats() {
+        return stats;
+    }
+
+    public void setStats(MainCommentStatusBean stats) {
+        this.stats = stats;
+    }
+
+    public List<MainPageCommentInfoBean> getList() {
+        return list;
+    }
+
+    public void setList(List<MainPageCommentInfoBean> list) {
+        this.list = list;
+    }
+}

app/src/main/java/com/xuebiping/bolizhuzi/model/main/MainPageInfoBean.java

@@ -23,6 +23,34 @@ public class MainPageInfoBean {
     private int online_status;//1.在线，2.离线
     private UserFrameBean user_frame;
     private int anchor_tag;
+    private int mobile_mark;
+    private int real_name_mark;
+    private int real_person_mark;
+    private int has_wechat;
+
+    public int getHas_wechat() {
+        return has_wechat;
+    }
+
+    public void setHas_wechat(int has_wechat) {
+        this.has_wechat = has_wechat;
+    }
+
+    public int getReal_name_mark() {
+        return real_name_mark;
+    }
+
+    public void setReal_name_mark(int real_name_mark) {
+        this.real_name_mark = real_name_mark;
+    }
+
+    public int getReal_person_mark() {
+        return real_person_mark;
+    }
+
+    public void setReal_person_mark(int real_person_mark) {
+        this.real_person_mark = real_person_mark;
+    }
 
     public int getMobile_mark() {
         return mobile_mark;
@@ -32,8 +60,6 @@ public class MainPageInfoBean {
         this.mobile_mark = mobile_mark;
     }
 
-    private int mobile_mark;
-
     public int getMark() {
         return mark;
     }

app/src/main/java/com/xuebiping/bolizhuzi/model/main/VideoFeeBean.java

@@ -1,5 +1,7 @@
 package com.xuebiping.bolizhuzi.model.main;
 
+import java.util.List;
+
 public class VideoFeeBean {
     private String room_id;
     private int from_uid;
@@ -14,6 +16,24 @@ public class VideoFeeBean {
     private String pay_money;
     private double income_money;
     private String remark;
+    private List<VideoLabelListBean> label_list_like;
+    private List<VideoLabelListBean> label_list_dislike;
+
+    public List<VideoLabelListBean> getLabel_list_like() {
+        return label_list_like;
+    }
+
+    public void setLabel_list_like(List<VideoLabelListBean> label_list_like) {
+        this.label_list_like = label_list_like;
+    }
+
+    public List<VideoLabelListBean> getLabel_list_dislike() {
+        return label_list_dislike;
+    }
+
+    public void setLabel_list_dislike(List<VideoLabelListBean> label_list_dislike) {
+        this.label_list_dislike = label_list_dislike;
+    }
 
     public String getRoom_id() {
         return room_id;

app/src/main/java/com/xuebiping/bolizhuzi/model/main/VideoLabelListBean.java

@@ -0,0 +1,32 @@
+package com.xuebiping.bolizhuzi.model.main;
+
+public class VideoLabelListBean {
+
+    private int id;
+    private String name;
+    private int selected;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getSelected() {
+        return selected;
+    }
+
+    public void setSelected(int selected) {
+        this.selected = selected;
+    }
+}

app/src/main/java/com/xuebiping/bolizhuzi/utils/SaveImageUtil.java

@@ -41,9 +41,9 @@ public class SaveImageUtil {
         @Override
         protected void onPostExecute(Boolean result) {
             if (result) {
-                MaleToast.showMessage(context, "二维码保存成功");
+                MaleToast.showMessage(context, "已保存到相册，快去分享吧~");
             } else {
-                MaleToast.showMessage(context, "二维码保存失败");
+                MaleToast.showMessage(context, "保存失败");
             }
 
         }

app/src/main/java/com/xuebiping/bolizhuzi/view/login/LoginActivity.java

@@ -308,9 +308,9 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener,
             }
         } else if (view == tv_login_sms) {
             loginType = 0;
-            tv_login_pw.setBackgroundResource(0);
+//            tv_login_pw.setBackgroundResource(0);
             tv_login_pw.setTextColor(ContextCompat.getColor(this, R.color.three_text));
-            tv_login_sms.setBackgroundResource(R.drawable.white_bg_40);
+//            tv_login_sms.setBackgroundResource(R.drawable.white_bg_40);
             tv_login_sms.setTextColor(ContextCompat.getColor(this, R.color.one_text));
             tv_login_sms_line.setVisibility(View.VISIBLE);
             tv_login_pw_line.setVisibility(View.INVISIBLE);
@@ -319,9 +319,9 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener,
             initLoginBtnEnabled();
         } else if (view == tv_login_pw) {
             loginType = 1;
-            tv_login_sms.setBackgroundResource(0);
+//            tv_login_sms.setBackgroundResource(0);
             tv_login_sms.setTextColor(ContextCompat.getColor(this, R.color.three_text));
-            tv_login_pw.setBackgroundResource(R.drawable.white_bg_40);
+//            tv_login_pw.setBackgroundResource(R.drawable.white_bg_40);
             tv_login_pw.setTextColor(ContextCompat.getColor(this, R.color.one_text));
             tv_login_sms_line.setVisibility(View.INVISIBLE);
             tv_login_pw_line.setVisibility(View.VISIBLE);

app/src/main/java/com/xuebiping/bolizhuzi/view/main/AgoraWithFUVideoActivity.java

@@ -1784,22 +1784,25 @@ public class AgoraWithFUVideoActivity extends BaseActivity implements View.OnCli
      */
     private void toVideoFinish() {
         //3期 男用户通话结束页面修改
-        if (UserManager.getUserInfo().getGender() == 2) {
+//        if (UserManager.getUserInfo().getGender() == 2) {
-            Intent intent = new Intent(AgoraWithFUVideoActivity.this, ManVideoFinishActivity.class);
+//            Intent intent = new Intent(AgoraWithFUVideoActivity.this, ManVideoFinishActivity.class);
+//            intent.putExtra("roomId", mRoomId);
+//            intent.putExtra("nickName", mNickName);
+//            intent.putExtra("avatar", mAvatar);
+//            intent.putExtra("uid", mToUid);
+//            intent.putExtra("callType", callType);
+//            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+//            startActivity(intent);
+//        } else {
+//            Intent intent = new Intent(AgoraWithFUVideoActivity.this, VideoFinishActivity.class);
+//            intent.putExtra("roomId", mRoomId);
+//            intent.putExtra("isCaller", false);
+//            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+//            startActivity(intent);
+//        }
+        Intent intent = new Intent(AgoraWithFUVideoActivity.this, VideoFinish2Activity.class);
         intent.putExtra("roomId", mRoomId);
-            intent.putExtra("nickName", mNickName);
-            intent.putExtra("avatar", mAvatar);
-            intent.putExtra("uid", mToUid);
-            intent.putExtra("callType", callType);
-            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         startActivity(intent);
-        } else {
-            Intent intent = new Intent(AgoraWithFUVideoActivity.this, VideoFinishActivity.class);
-            intent.putExtra("roomId", mRoomId);
-            intent.putExtra("isCaller", false);
-            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-            startActivity(intent);
-        }
         finishActivity();
     }
 

app/src/main/java/com/xuebiping/bolizhuzi/view/main/GiftReceived2Activity.java

@@ -0,0 +1,89 @@
+package com.xuebiping.bolizhuzi.view.main;
+
+import android.os.Bundle;
+import android.widget.TextView;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.fengliyan.uikit.toast.MaleToast;
+import com.xuebiping.bolizhuzi.R;
+import com.xuebiping.bolizhuzi.controller.main.adapter.GiftReceived2Adapter;
+import com.xuebiping.bolizhuzi.controller.main.manager.MainManager;
+import com.xuebiping.bolizhuzi.model.main.GiftReceivedBean;
+import com.xuebiping.bolizhuzi.model.main.GiftReceivedItemBean;
+import com.xuebiping.bolizhuzi.view.base.BaseActivity;
+import com.xuebiping.bolizhuzi.view.base.utils.HttpUiCallBack;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+public class GiftReceived2Activity extends BaseActivity {
+
+    private TextView mTotalTextView;
+    private RecyclerView mRv_recommend_list;
+    private GiftReceived2Adapter mAdapter;
+    private List<GiftReceivedItemBean> mData = new ArrayList<>();
+
+    private int mUserId;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_gift_received2);
+        setTitleName("收到的礼物");
+        mUserId = getIntent().getIntExtra("userId", 0);
+        initView();
+        getReceivedGifts();
+    }
+
+    private void initView() {
+        mTotalTextView = findViewById(R.id.gift_received_header_info);
+        mRv_recommend_list = findViewById(R.id.rv_recommend_list);
+
+        mRv_recommend_list.setLayoutManager(new GridLayoutManager(this, 5));
+        mAdapter = new GiftReceived2Adapter(R.layout.item_gift_received2, this);
+        mRv_recommend_list.setAdapter(mAdapter);
+    }
+
+    public void getReceivedGifts(){
+        MainManager.receivedGiftList(this, mUserId, new HttpUiCallBack<GiftReceivedBean>() {
+            @Override
+            public void onSuccess(BaseActivity activity, GiftReceivedBean result, String message) {
+
+                if (result.getList() != null) {
+                        mData.clear();
+
+                    List<GiftReceivedItemBean> list = result.getList();
+                    if (list != null && list.size() > 0) {
+                        mData.addAll(list);
+                    }
+
+                    Iterator<GiftReceivedItemBean> iterator = result.getList().iterator();
+                    int total = 0;
+                    while (iterator.hasNext()){
+                        GiftReceivedItemBean bean = iterator.next();
+                        total += Integer.parseInt(bean.getTotal());
+                    }
+
+                    mTotalTextView.setText(total + "");
+                }
+                if (mData != null && mData.size() > 0) {
+                    mAdapter.setList(mData);
+                }
+            }
+
+            @Override
+            public void onFailure(BaseActivity activity, String tip) {
+                MaleToast.showMessage(activity, tip);
+            }
+
+            @Override
+            public void onException(BaseActivity activity, Throwable e) {
+                MaleToast.showFailureMsg(activity, "请重试");
+            }
+        });
+    }
+}

app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainDynamicActivity.java

@@ -2,21 +2,33 @@ package com.xuebiping.bolizhuzi.view.main;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.AbsListView;
 
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
+import com.fengliyan.uikit.dialog.BottomGiftDialog;
+import com.fengliyan.uikit.dialog.DialogGiftBean;
+import com.fengliyan.uikit.dialog.GiftListBean;
 import com.xuebiping.bolizhuzi.R;
 import com.xuebiping.bolizhuzi.controller.dynamics.adapter.DynamicsAdapter;
+import com.xuebiping.bolizhuzi.controller.dynamics.adapter.DynamicsAdapter1;
 import com.xuebiping.bolizhuzi.controller.dynamics.manager.DynamicsManager;
 import com.xuebiping.bolizhuzi.controller.eventBus.DynamicEvent;
+import com.xuebiping.bolizhuzi.controller.eventBus.DynamicLikeEvent;
+import com.xuebiping.bolizhuzi.controller.main.manager.MainManager;
 import com.xuebiping.bolizhuzi.model.dynamics.DynamicsItemBean;
 import com.xuebiping.bolizhuzi.model.dynamics.DynamicsListBean;
+import com.xuebiping.bolizhuzi.model.main.FollowResultBean;
 import com.xuebiping.bolizhuzi.view.base.BaseActivity;
 import com.xuebiping.bolizhuzi.view.base.utils.HttpUiCallBack;
 import com.xuebiping.bolizhuzi.view.base.utils.view.HangUpDialog;
 import com.fengliyan.uikit.dialog.BottomSelectiveDialog;
 import com.fengliyan.uikit.refresh.LoadMoreListView;
 import com.fengliyan.uikit.toast.MaleToast;
+import com.xuebiping.bolizhuzi.view.dynamics.activity.DynamicDetailActivity;
+import com.xuebiping.bolizhuzi.view.settings.CaibeiRechargeActivity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,15 +46,17 @@ public class MainDynamicActivity extends BaseActivity implements View.OnClickLis
     private List<DynamicsItemBean> mImageList = new ArrayList<>();
     private int mPage = 1;
     private boolean mPageLoad;
-    private DynamicsAdapter mAdapter;
+    private DynamicsAdapter1 mAdapter;
     private int mUserId;
     private String mNickName;
     private BottomSelectiveDialog mSelectiveDialog;
     private BottomSelectiveDialog mDeleteBottomDialog;
+    private int detailPosition;
 
     @Override
     public void onCreate(Bundle onSavedInstance) {
         super.onCreate(onSavedInstance);
+        EventBus.getDefault().register(this);
         setContentView(R.layout.fragment_dynamics);
         mUserId = getIntent().getIntExtra("userId", 0);
         mNickName = getIntent().getStringExtra("nickName");
@@ -53,7 +67,7 @@ public class MainDynamicActivity extends BaseActivity implements View.OnClickLis
 
     private void initView() {
         mListView = findViewById(R.id.dynamics_list);
-        mAdapter = new DynamicsAdapter(this);
+        mAdapter = new DynamicsAdapter1(this);
         mAdapter.setList(mImageList);
         mListView.setAdapter(mAdapter);
 //        mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@@ -89,23 +103,42 @@ public class MainDynamicActivity extends BaseActivity implements View.OnClickLis
             }
         });
 
-        mAdapter.setOnThumbupClickedListener(new DynamicsAdapter.OnThumbupClickedListener() {
+        mAdapter.likeDynamicCallback = new DynamicsAdapter1.DynamicLikeCallback() {
+            @Override
+            public void likeDynamic(DynamicsItemBean bean) {
+                likeFeed(bean);
+            }
+        };
+
+        mAdapter.setOnThumbupClickedListener(new DynamicsAdapter1.OnThumbupClickedListener() {
             @Override
             public void onClick(View v, String uid) {
                 thumbup(uid);
             }
         });
-        mAdapter.setOnGiftSendListener(new DynamicsAdapter.OnGiftSendListener() {
+
+        mAdapter.setOnGiftSendListener(new DynamicsAdapter1.OnGiftSendListener() {
             @Override
             public void onSend(DynamicsItemBean bean, int quantity) {
-                sendGift(bean.getId(), quantity, bean);
+//                sendGift(bean.getId(), quantity, bean);
+
+                getGiftData(bean.getUser_id());
             }
         });
 
-        mAdapter.setOnMenuClickListener(new DynamicsAdapter.OnMenuClickListener() {
+        mAdapter.setOnMenuClickListener(new DynamicsAdapter1.OnMenuClickListener() {
             @Override
             public void onMenuClicked(final int dynamicIndex) {
                 mSelectiveDialog = new BottomSelectiveDialog(MainDynamicActivity.this, R.style.SelectiveDialog);
+                if (0 == mImageList.get(dynamicIndex).getIs_follow()) {
+                    mSelectiveDialog.addSelectButton("关注", new BottomSelectiveDialog.OnButtonSelectListener() {
+                        @Override
+                        public void onClicked(View view, int index) {
+                            mSelectiveDialog.dismiss();
+                            focus(mImageList.get(dynamicIndex).getUser_id());
+                        }
+                    });
+                }
 
                 mSelectiveDialog.addSelectButton("举报", new BottomSelectiveDialog.OnButtonSelectListener() {
                     @Override
@@ -121,32 +154,88 @@ public class MainDynamicActivity extends BaseActivity implements View.OnClickLis
                 mSelectiveDialog.show();
             }
         });
-        mAdapter.likeDynamicCallback = new DynamicsAdapter.DynamicLikeCallback() {
+
-            @Override
-            public void likeDynamic(DynamicsItemBean bean) {
-                likeFeed(bean);
-            }
-        };
         //删除动态
-        mAdapter.setOnMenuDeleteClickListener(new DynamicsAdapter.OnMenuDeleteClickListener() {
+        mAdapter.setOnMenuDeleteClickListener(new DynamicsAdapter1.OnMenuDeleteClickListener() {
             @Override
             public void onMenuDelete(final int position, final List<DynamicsItemBean> mDynamicsItemList) {
-                HangUpDialog hangUpDialog = new HangUpDialog(MainDynamicActivity.this, new HangUpDialog.OnHangUpListener() {
+                mDeleteBottomDialog = new BottomSelectiveDialog(MainDynamicActivity.this, R.style.SelectiveDialog);
+                mDeleteBottomDialog.addSelectButton("删除", new BottomSelectiveDialog.OnButtonSelectListener() {
                     @Override
-                    public void onHangUp() {
+                    public void onClicked(View view, int index) {
+                        mDeleteBottomDialog.dismiss();
                         deleteDynamics(mDynamicsItemList.get(position).getId(), position);
                     }
-                },"您确定要删除吗？", "确定", "取消");
+                });
-                hangUpDialog.show();
+
-//                mDeleteBottomDialog = new BottomSelectiveDialog(MainDynamicActivity.this, R.style.SelectiveDialog);
+                mDeleteBottomDialog.show();
-//                mDeleteBottomDialog.addSelectButton("删除", new BottomSelectiveDialog.OnButtonSelectListener() {
+            }
-//                    @Override
+        });
-//                    public void onClicked(View view, int index) {
+
-//                        mDeleteBottomDialog.dismiss();
+        mAdapter.setOnDetailClicked(new DynamicsAdapter1.OnDetailClickListener() {
-//                        deleteDynamics(mDynamicsItemList.get(position).getId(), position);
+            @Override
-//                    }
+            public void onDetailClicked(int position, String id) {
-//                });
+                detailPosition = position;
-//                mDeleteBottomDialog.show();
+                Intent intent = new Intent(MainDynamicActivity.this, DynamicDetailActivity.class);
+                intent.putExtra("dynamic_id", id);
+                intent.putExtra("dynamic_from", 0);
+                startActivity(intent);
+
+//                DynamicsItemBean itemBean = mAdapter.getmDynamicsItemList().get(position);
+//                Intent intent = new Intent(getContext(), DynamicDetailTwoActivity.class);
+//                intent.putExtra("bean", itemBean);
+//                startActivity(intent);
+            }
+        });
+
+        mAdapter.dynamicCommentCallback = new DynamicsAdapter1.DynamicCommentCallback() {
+            @Override
+            public void commentDynamic(DynamicsItemBean bean) {
+                Intent intent = new Intent(MainDynamicActivity.this, DynamicDetailActivity.class);
+                intent.putExtra("dynamic_id", bean.getId());
+                startActivity(intent);
+            }
+        };
+    }
+
+    private BottomGiftDialog mGiftDialog;
+
+    /**
+     * 礼物列表数据
+     */
+    private void getGiftData(String user_id) {
+        MainManager.getGiftBeans(this, new HttpUiCallBack<GiftListBean>() {
+            @Override
+            public void onSuccess(BaseActivity activity, GiftListBean result, String message) {
+                mGiftDialog = new BottomGiftDialog(MainDynamicActivity.this,
+                        R.style.SelectiveDialog);
+
+                mGiftDialog.setGiftListBean(result);
+                mGiftDialog.setOnGiftItemClickedListener(new BottomGiftDialog.OnGiftItemClickedListener() {
+                    @Override
+                    public void onGiftClicked(final DialogGiftBean bean) {
+                        if (!TextUtils.isEmpty(user_id)) {
+                            sendGift(Integer.parseInt(user_id), bean.getId());
+                        }
+                    }
+
+                    @Override
+                    public void onWalletClicked() {
+                        Intent intent = new Intent(MainDynamicActivity.this, CaibeiRechargeActivity.class);
+                        startActivity(intent);
+                    }
+                });
+                mGiftDialog.show();
+            }
+
+            @Override
+            public void onFailure(BaseActivity activity, String tip) {
+                MaleToast.showMessage(activity, tip);
+            }
+
+            @Override
+            public void onException(BaseActivity activity, Throwable e) {
+                MaleToast.showMessage(activity, "请重试");
             }
         });
     }
@@ -251,25 +340,53 @@ public class MainDynamicActivity extends BaseActivity implements View.OnClickLis
         });
     }
 
-    public void sendGift(String dynamicId, final int number, final DynamicsItemBean bean) {
+    /**
-        DynamicsManager.sendGifts(MainDynamicActivity.this, dynamicId, number, new HttpUiCallBack<Object>() {
+     * 赠送礼物
+     *
+     * @param toUid
+     * @param giftId
+     */
+    private void sendGift(int toUid, int giftId) {
+        MainManager.sendGift(this, 1, toUid, giftId, 1, new HttpUiCallBack<GiftListBean>() {
             @Override
-            public void onSuccess(BaseActivity activity, Object result, String message) {
+            public void onSuccess(BaseActivity activity, GiftListBean result, String message) {
-                MaleToast.showMessage(MainDynamicActivity.this, "礼物赠送成功");
+                if (null != mGiftDialog) {
-                if (null != mAdapter) {
+                    mGiftDialog.setCoin(result.getCoin() + "");
-                    mAdapter.setGiftCount(number + bean.getReward_count(), bean.getId());
+                    mGiftDialog.dismiss();
-                    mAdapter.notifyDataSetChanged();
                 }
+                MaleToast.showMessage(activity, "赠送成功");
+//                mSvgaDialog.show(giftUrl);
             }
 
             @Override
             public void onFailure(BaseActivity activity, String tip) {
-                MaleToast.showMessage(MainDynamicActivity.this, tip);
+                MaleToast.showMessage(activity, tip);
             }
 
             @Override
             public void onException(BaseActivity activity, Throwable e) {
-                MaleToast.showMessage(MainDynamicActivity.this, "赠送失败，请重试");
+                MaleToast.showMessage(activity, "赠送失败");
+            }
+        });
+    }
+
+    private void focus(String userId) {
+        DynamicsManager.follow(this,
+                userId,
+                new HttpUiCallBack<FollowResultBean>() {
+                    @Override
+                    public void onSuccess(BaseActivity activity, FollowResultBean result, String message) {
+                        MaleToast.showMessage(activity, "关注成功");
+                    }
+
+                    @Override
+                    public void onFailure(BaseActivity activity, String tip) {
+                        MaleToast.showMessage(activity, tip);
+                    }
+
+                    @Override
+                    public void onException(BaseActivity activity, Throwable e) {
+                        MaleToast.showMessage(activity, "关注失败");
                     }
                 });
     }
@@ -279,9 +396,21 @@ public class MainDynamicActivity extends BaseActivity implements View.OnClickLis
 
     }
 
+    public void onEventMainThread(DynamicLikeEvent event) {
+        int isLike = event.isLike();
+        int likeNum = event.getLikeNum();
+        int from = event.getFrom();
+        if (from == 0) {
+            mAdapter.getmDynamicsItemList().get(detailPosition).setIs_like(isLike);
+            mAdapter.getmDynamicsItemList().get(detailPosition).setLike_count(likeNum);
+            mAdapter.notifyDataSetChanged();
+        }
+    }
+
     @Override
     public void onDestroy() {
         super.onDestroy();
+        EventBus.getDefault().unregister(this);
         if (null != mSelectiveDialog && mSelectiveDialog.isShowing()) {
             mSelectiveDialog.dismiss();
         }

app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainPageActivity.java

@@ -27,12 +27,14 @@ import com.xuebiping.bolizhuzi.controller.user.manager.UserManager;
 import com.xuebiping.bolizhuzi.im.uikit.api.NimUIKit;
 import com.xuebiping.bolizhuzi.model.main.CallBean;
 import com.xuebiping.bolizhuzi.model.main.FollowResultBean;
+import com.xuebiping.bolizhuzi.model.main.LookWechatBean;
 import com.xuebiping.bolizhuzi.model.main.MainPageBean;
 import com.xuebiping.bolizhuzi.utils.SPUtils;
 import com.xuebiping.bolizhuzi.utils.StrU;
 import com.xuebiping.bolizhuzi.view.base.BaseActivity;
 import com.xuebiping.bolizhuzi.view.base.utils.HttpUiCallBack;
 import com.xuebiping.bolizhuzi.view.base.utils.view.WechatDialog;
+import com.xuebiping.bolizhuzi.view.main.dialog.LookWechatDialog;
 import com.xuebiping.bolizhuzi.view.news.im.ImUtils;
 import com.xuebiping.bolizhuzi.view.settings.CaibeiRechargeActivity;
 import com.xuebiping.bolizhuzi.view.settings.dialog.SelectTypeDialog;
@@ -66,6 +68,8 @@ public class MainPageActivity extends BaseActivity implements View.OnClickListen
     private TextView tv_follow1;
     //    private BaseMessageDialog mConfirmDialog;
     private LottieAnimationView animation_view;
+    private RelativeLayout mRl_love_layout;
+    private TextView mTv_love_count;
 
     @Override
     public void onCreate(Bundle onSavedInstance) {
@@ -120,6 +124,11 @@ public class MainPageActivity extends BaseActivity implements View.OnClickListen
         animation_view.setAnimation("page_call_video.json");
         animation_view.playAnimation();
         animation_view.setOnClickListener(this);
+
+        mRl_love_layout = findViewById(R.id.rl_love_layout);
+        mTv_love_count = findViewById(R.id.tv_love_count);
+
+        mRl_love_layout.setOnClickListener(this);
     }
 
     private final int MIN_DELAY_TIME = 5000; // 两次点击间隔不能少于1000ms
@@ -241,6 +250,13 @@ public class MainPageActivity extends BaseActivity implements View.OnClickListen
                     }
                 }
 //                mVideo.setEnabled(result.getAnchor().getOpen_video_status() == 1 ? true : false);
+
+                if (mMainPageBean.getInfo().getHas_wechat() == 1) {
+                    mRl_love_layout.setVisibility(View.VISIBLE);
+                    getIntimacy2(mMainPageBean.getInfo().getUserId());
+                }else {
+                    mRl_love_layout.setVisibility(View.GONE);
+                }
             }
 
             @Override
@@ -257,6 +273,54 @@ public class MainPageActivity extends BaseActivity implements View.OnClickListen
         });
     }
 
+    private void getIntimacy2(int to_uid) {
+        MainManager.getWechatIntimacy(this, to_uid, new HttpUiCallBack<LookWechatBean>() {
+            @Override
+            public void onSuccess(BaseActivity activity, LookWechatBean result, String tips) {
+                mTv_love_count.setText(result.getIntimacy_percent() + "%");
+            }
+
+            @Override
+            public void onFailure(BaseActivity activity, String tip) {
+                MaleToast.showMessage(activity, tip);
+            }
+
+            @Override
+            public void onException(BaseActivity activity, Throwable e) {
+                MaleToast.showMessage(activity, "请重试");
+            }
+        });
+    }
+
+    private LookWechatDialog mLookWechatDialog2;
+
+    private void getIntimacy(int to_uid) {
+        MainManager.getWechatIntimacy(this, to_uid, new HttpUiCallBack<LookWechatBean>() {
+            @Override
+            public void onSuccess(BaseActivity activity, LookWechatBean result, String tips) {
+
+                if (mLookWechatDialog2 != null) {
+                    mLookWechatDialog2.dismiss();
+                    mLookWechatDialog2 = null;
+                }
+
+                mLookWechatDialog2 = new LookWechatDialog(MainPageActivity.this, R.style.SelectiveDialog);
+                mLookWechatDialog2.show();
+                mLookWechatDialog2.setData(result);
+            }
+
+            @Override
+            public void onFailure(BaseActivity activity, String tip) {
+                MaleToast.showMessage(activity, tip);
+            }
+
+            @Override
+            public void onException(BaseActivity activity, Throwable e) {
+                MaleToast.showMessage(activity, "请重试");
+            }
+        });
+    }
+
     private void setFragment(Fragment fragment) {
         FragmentActivity fragmentActivity = (FragmentActivity) this;
         try {
@@ -397,6 +461,8 @@ public class MainPageActivity extends BaseActivity implements View.OnClickListen
         } else if (view == main_personal_page_wechat) {
             WechatDialog dialog = new WechatDialog(this, mMainPageBean);
             dialog.show();
+        } else if (view == mRl_love_layout) {
+            getIntimacy(mMainPageBean.getInfo().getUserId());
         }
     }
 

app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainPageCommentActivity.java

@@ -0,0 +1,116 @@
+package com.xuebiping.bolizhuzi.view.main;
+
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.fengliyan.uikit.toast.MaleToast;
+import com.scwang.smartrefresh.layout.SmartRefreshLayout;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
+import com.xuebiping.bolizhuzi.R;
+import com.xuebiping.bolizhuzi.controller.main.adapter.MainPageCommentAdapter;
+import com.xuebiping.bolizhuzi.controller.main.manager.MainManager;
+import com.xuebiping.bolizhuzi.model.main.MainPageCommentInfoBean;
+import com.xuebiping.bolizhuzi.model.main.MainPageCommentListBean;
+import com.xuebiping.bolizhuzi.view.base.BaseActivity;
+import com.xuebiping.bolizhuzi.view.base.utils.HttpUiCallBack;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MainPageCommentActivity extends BaseActivity implements OnRefreshLoadMoreListener {
+
+    private int mUser_id;
+
+    private int mPage = 1;
+    private int mTotalPage;
+
+    private SmartRefreshLayout mSmart_refresh;
+    private RecyclerView mRv_recommend_list;
+
+    private List<MainPageCommentInfoBean> mData = new ArrayList<>();
+    private MainPageCommentAdapter mMainPageCommentAdapter;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setTitleName("用户评价");
+        setContentView(R.layout.activity_main_comment);
+        mUser_id = getIntent().getIntExtra("userId", 0);
+        initView();
+        getList(mPage);
+    }
+
+    private void initView() {
+
+        mSmart_refresh = findViewById(R.id.smart_refresh);
+        mRv_recommend_list = findViewById(R.id.rv_recommend_list);
+
+        mRv_recommend_list.setLayoutManager(new LinearLayoutManager(this));
+        mMainPageCommentAdapter = new MainPageCommentAdapter(R.layout.item_main_page_comment, this);
+        mRv_recommend_list.setAdapter(mMainPageCommentAdapter);
+
+        mSmart_refresh.setOnRefreshLoadMoreListener(this);
+    }
+
+    private void getList(int page){
+        MainManager.getMainCommentList(this, mUser_id + "", page, new HttpUiCallBack<MainPageCommentListBean>() {
+            @Override
+            public void onSuccess(BaseActivity activity, MainPageCommentListBean result, String message) {
+                finishFresh();
+                if (result != null) {
+                    mTotalPage = result.getTotal_page();
+                    if (mPage == 1) {
+                        mData.clear();
+                    }
+                    List<MainPageCommentInfoBean> list = result.getList();
+                    if (list != null && list.size() > 0) {
+                        mData.addAll(list);
+                    }
+                }
+                if (mData != null && mData.size() > 0) {
+                    mMainPageCommentAdapter.setList(mData);
+                }
+            }
+
+            @Override
+            public void onFailure(BaseActivity activity, String tip) {
+                finishFresh();
+                MaleToast.showFailureMsg(activity, tip);
+            }
+
+            @Override
+            public void onException(BaseActivity activity, Throwable e) {
+                finishFresh();
+                MaleToast.showFailureMsg(activity, "请重试");
+            }
+        });
+    }
+
+    public void finishFresh() {
+        mSmart_refresh.finishLoadMore();
+        mSmart_refresh.finishRefresh();
+    }
+
+    @Override
+    public void onLoadMore(@NonNull @NotNull RefreshLayout refreshLayout) {
+        mPage++;
+        if (mPage > mTotalPage) {
+            mSmart_refresh.finishLoadMore();
+            mSmart_refresh.setNoMoreData(true);
+        } else {
+            getList(mPage);
+        }
+    }
+
+    @Override
+    public void onRefresh(@NonNull @NotNull RefreshLayout refreshLayout) {
+        mPage = 1;
+        getList(mPage);
+    }
+}

app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainPageFragment.java

@@ -1,5 +1,6 @@
 package com.xuebiping.bolizhuzi.view.main;
 
+import android.Manifest;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
@@ -22,10 +23,14 @@ import android.widget.TextView;
 import androidx.cardview.widget.CardView;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager.widget.ViewPager;
 
 import com.airbnb.lottie.LottieAnimationView;
 import com.facebook.drawee.view.SimpleDraweeView;
+import com.fengliyan.base.base.permission.AbsPermissionResultCallBack;
+import com.fengliyan.base.base.permission.PermissionHelper;
 import com.google.android.exoplayer2.DefaultRenderersFactory;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Player;
@@ -34,23 +39,31 @@ import com.google.android.exoplayer2.ui.PlayerView;
 import com.fengliyan.device.DeviceManager;
 import com.fengliyan.messaging.ChatManager;
 import com.fengliyan.messaging.EventBusGiftMessage;
+import com.luck.picture.lib.utils.ToastUtils;
 import com.xuebiping.bolizhuzi.R;
 import com.xuebiping.bolizhuzi.controller.constant.ConsUser;
 import com.xuebiping.bolizhuzi.controller.constant.ConstUrl;
 import com.xuebiping.bolizhuzi.controller.constant.Constant;
 import com.xuebiping.bolizhuzi.controller.dynamics.manager.DynamicsManager;
+import com.xuebiping.bolizhuzi.controller.main.adapter.MainPageCommentAdapter;
 import com.xuebiping.bolizhuzi.controller.main.manager.MainManager;
 import com.xuebiping.bolizhuzi.controller.settings.manager.SettingManager;
 import com.xuebiping.bolizhuzi.controller.user.manager.UserManager;
+import com.xuebiping.bolizhuzi.im.uikit.api.NimUIKit;
 import com.xuebiping.bolizhuzi.model.main.BlackBean;
 import com.xuebiping.bolizhuzi.model.main.CallBean;
 import com.xuebiping.bolizhuzi.model.main.ContactBean;
 import com.xuebiping.bolizhuzi.model.main.FollowResultBean;
 import com.xuebiping.bolizhuzi.model.main.GiftBean;
+import com.xuebiping.bolizhuzi.model.main.LookWechatBean;
+import com.xuebiping.bolizhuzi.model.main.MainCommentStatusBean;
 import com.xuebiping.bolizhuzi.model.main.MainPageBean;
+import com.xuebiping.bolizhuzi.model.main.MainPageCommentInfoBean;
 import com.xuebiping.bolizhuzi.utils.AnimUtils;
+import com.xuebiping.bolizhuzi.utils.FlowLayout;
 import com.xuebiping.bolizhuzi.utils.FrameAnimation;
 import com.xuebiping.bolizhuzi.utils.SPUtils;
+import com.xuebiping.bolizhuzi.utils.SaveImageUtil;
 import com.xuebiping.bolizhuzi.utils.StrU;
 import com.xuebiping.bolizhuzi.view.base.BaseActivity;
 import com.xuebiping.bolizhuzi.view.base.BaseApplication;
@@ -62,6 +75,8 @@ import com.xuebiping.bolizhuzi.view.diooto.Diooto;
 import com.xuebiping.bolizhuzi.view.diooto.config.DiootoConfig;
 import com.xuebiping.bolizhuzi.view.dynamics.activity.PageVideoPlayActivity;
 import com.xuebiping.bolizhuzi.view.main.dialog.ConfirmWXAccountDialog;
+import com.xuebiping.bolizhuzi.view.main.dialog.LookWechatDialog;
+import com.xuebiping.bolizhuzi.view.main.dialog.MainShareDialog;
 import com.xuebiping.bolizhuzi.view.main.utils.DefaultExoConfig;
 import com.xuebiping.bolizhuzi.view.news.fragment.NewFragment;
 import com.xuebiping.bolizhuzi.view.settings.InfoEditActivity;
@@ -86,17 +101,17 @@ public class MainPageFragment extends Fragment implements View.OnClickListener {
     private SimpleDraweeView mPhoto;
     private SimpleDraweeView mOtherPhoto;
     private TextView mName;
-    private TextView mAge;
+
     private TextView mSubInfo;
-    private TextView personal_main_page_ip_province;
+
     private TextView mSubInfoTime;
-    private TextView mFanNumber;
+
     private TextView mFocusButton;
     private ImageView mStatus;
     private TextView mSkillScore;
     private TextView mSkillSuccessRate;
-    private TextView mSkillCost;
+
-    private TextView tv_signer;
+
     private View mDynamicLayout;
     private SimpleDraweeView[] mDynamicImages = new SimpleDraweeView[4];
     private View mGiftLayout;
@@ -142,7 +157,22 @@ public class MainPageFragment extends Fragment implements View.OnClickListener {
 
     private TextView tv_follow_num;
     private TextView tv_fans_num;
-    private TextView tv_scan_num;
+
+    private TextView mTv_signature;
+    private ImageView mIv_look_wechat;
+    private ImageView mIv_main_share;
+    private FlowLayout mine_mine_tag;
+    private RelativeLayout mRl_personal_info;
+    private LinearLayout mLl_auto;
+    private LinearLayout mLl_mobile_auto;
+    private LinearLayout mLl_real_name_auto;
+    private LinearLayout mLl_real_person_auto;
+    private LookWechatDialog mLookWechatDialog;
+    private LinearLayout mLl_share;
+    private MainShareDialog mMainShareDialog;
+    private int mFollow_count;
+    private LinearLayout mLl_comment_title;
+    private MainPageCommentAdapter mMainPageCommentAdapter;
 
     private void addBanner() {
         mBanners.addAll(mMainPageBean.getAlbum());
@@ -383,20 +413,23 @@ public class MainPageFragment extends Fragment implements View.OnClickListener {
         mPhoto = v.findViewById(R.id.personal_main_page_photo);
         mOtherPhoto = v.findViewById(R.id.personal_main_other_photo);
         mName = v.findViewById(R.id.personal_main_page_name);
-        mAge = v.findViewById(R.id.personal_main_page_age);
+        mTv_signature = v.findViewById(R.id.tv_signature);
+        mIv_look_wechat = v.findViewById(R.id.iv_look_wechat);
+        mIv_main_share = v.findViewById(R.id.iv_main_share);
+
         mSubInfo = v.findViewById(R.id.personal_main_page_sub_info);
-        personal_main_page_ip_province = v.findViewById(R.id.personal_main_page_ip_province);
+
         mSubInfoTime = v.findViewById(R.id.personal_main_page_sub_info_time);
         mFocusButton = v.findViewById(R.id.personal_main_page_focus_button);
-        mFanNumber = v.findViewById(R.id.personal_main_page_fans_number);
+
         mStatus = v.findViewById(R.id.personal_main_page_status);
         mSkillSuccessRate = v.findViewById(R.id.personal_main_page_skill_success);
         mSkillScore = v.findViewById(R.id.personal_main_page_skill_rate);
-        mSkillCost = v.findViewById(R.id.personal_main_page_skill_cost);
+
         mDynamicLayout = v.findViewById(R.id.personal_main_page_dynamic_photo_layout);
         mGiftLayout = v.findViewById(R.id.personal_main_page_gift_layout);
         mSkillLayout = v.findViewById(R.id.ll_skill_layout);
-        tv_signer = v.findViewById(R.id.tv_signer);
+
         mGuardLayout = v.findViewById(R.id.personal_main_page_guard_photo_layout);
         mDynamicImages[0] = v.findViewById(R.id.personal_main_page_dynamic_photo_1);
         mDynamicImages[1] = v.findViewById(R.id.personal_main_page_dynamic_photo_2);
@@ -435,12 +468,38 @@ public class MainPageFragment extends Fragment implements View.OnClickListener {
 
         tv_follow_num = v.findViewById(R.id.tv_follow_num);
         tv_fans_num = v.findViewById(R.id.tv_fans_num);
-        tv_scan_num = v.findViewById(R.id.tv_scan_num);
+
+        mLl_auto = v.findViewById(R.id.ll_auto);
+        mLl_mobile_auto = v.findViewById(R.id.ll_mobile_auto);
+        mLl_real_name_auto = v.findViewById(R.id.ll_real_name_auto);
+        mLl_real_person_auto = v.findViewById(R.id.ll_real_person_auto);
+
+        mRl_personal_info = v.findViewById(R.id.rl_personal_info);
+        mine_mine_tag = v.findViewById(R.id.mine_mine_tag);
+        mine_mine_tag.setSelectType(FlowLayout.SelectType.SINGLE_IRREVOCABLY);
+
+        mLl_share = v.findViewById(R.id.ll_share);
+        SimpleDraweeView user_head = v.findViewById(R.id.user_head);
+        TextView tv_name = v.findViewById(R.id.tv_name);
+        TextView tv_code = v.findViewById(R.id.tv_code);
+        SimpleDraweeView sv_er = v.findViewById(R.id.sv_er);
+
+        user_head.setImageURI(StrU.getResourcePath(mMainPageBean.getInfo().getAvatar(), getActivity()));
+        tv_name.setText(mMainPageBean.getInfo().getNickname());
+        tv_code.setText("ID:" + mMainPageBean.getInfo().getUsercode());
+        sv_er.setImageURI(StrU.getResourcePath(mMainPageBean.getQrcode(), getActivity()));
 
         iv_video_call.setImageAssetsFolder("images/");
         iv_video_call.setAnimation("video_call_btn.json");
         iv_video_call.playAnimation();
 
+        RelativeLayout rl_comment = v.findViewById(R.id.rl_comment);
+        mLl_comment_title = v.findViewById(R.id.ll_comment_title);
+        TextView tv_comment_count = v.findViewById(R.id.tv_comment_count);
+        TextView tv_like_count = v.findViewById(R.id.tv_like_count);
+        TextView tv_dislike_count = v.findViewById(R.id.tv_dislike_count);
+        RecyclerView rv_main_info_comment = v.findViewById(R.id.rv_main_info_comment);
+
         mBack.setOnClickListener(this);
         mFocusButton.setOnClickListener(this);
         mGiftLayout.setOnClickListener(this);
@@ -453,8 +512,40 @@ public class MainPageFragment extends Fragment implements View.OnClickListener {
         iv_video_call.setOnClickListener(this);
         personal_player.setOnClickListener(this);
         cv_video.setOnClickListener(this);
+        mIv_look_wechat.setOnClickListener(this);
+        mIv_main_share.setOnClickListener(this);
+        mLl_mobile_auto.setOnClickListener(this);
+        mLl_real_name_auto.setOnClickListener(this);
+        mLl_real_person_auto.setOnClickListener(this);
+        mLl_comment_title.setOnClickListener(this);
+
+        if (mMainPageBean.getComment() == null) {
+            rl_comment.setVisibility(View.GONE);
+        }else {
+            List<MainPageCommentInfoBean> list = mMainPageBean.getComment().getList();
+            if (null != list && list.size() > 0) {
+                rl_comment.setVisibility(View.VISIBLE);
+                MainCommentStatusBean stats = mMainPageBean.getComment().getStats();
+                tv_comment_count.setText("用户评价(" + stats.getTotal() + ")");
+                tv_like_count.setText("喜欢 " + stats.getLike_count());
+                tv_dislike_count.setText("无感 " + stats.getDislike_count());
+
+                rv_main_info_comment.setLayoutManager(new LinearLayoutManager(getActivity()));
+                mMainPageCommentAdapter = new MainPageCommentAdapter(R.layout.item_main_page_comment, getActivity());
+                rv_main_info_comment.setAdapter(mMainPageCommentAdapter);
+                mMainPageCommentAdapter.setList(list);
+            }else {
+                rl_comment.setVisibility(View.GONE);
+            }
+        }
+
         mPhoto.setImageURI(StrU.getResourcePath(mMainPageBean.getInfo().getAvatar(), getActivity()));
         mName.setText(mMainPageBean.getInfo().getNickname());
+        if (TextUtils.isEmpty(mMainPageBean.getInfo().getSignature())) {
+            mTv_signature.setText("心动至上");
+        }else {
+            mTv_signature.setText(mMainPageBean.getInfo().getSignature());
+        }
 
 //        GSYVideoType.setShowType(GSYVideoType.SCREEN_TYPE_DEFAULT);
         String videoUrl = mMainPageBean.getVideo_url();
@@ -482,19 +573,7 @@ public class MainPageFragment extends Fragment implements View.OnClickListener {
             });
         }
 
-        if (mMainPageBean.getInfo().getGender() == 1) {
+
-            Drawable drawableLeft = ContextCompat.getDrawable(getActivity(), R.mipmap.sex_girl1);
-            drawableLeft.setBounds(0, 0, drawableLeft.getMinimumWidth(), drawableLeft.getMinimumHeight());
-            mAge.setBackgroundResource(R.drawable.shape_stroke_age_women);
-            mAge.setTextColor(Color.parseColor("#FF4F73"));
-            mAge.setCompoundDrawables(drawableLeft, null, null, null);
-        } else {
-            mAge.setBackgroundResource(R.drawable.shape_stroke_age);
-            Drawable drawableLeft = ContextCompat.getDrawable(getActivity(), R.mipmap.sex_men1);
-            drawableLeft.setBounds(0, 0, drawableLeft.getMinimumWidth(), drawableLeft.getMinimumHeight());
-            mAge.setTextColor(Color.parseColor("#002E9F"));
-            mAge.setCompoundDrawables(drawableLeft, null, null, null);
-        }
         //男用户不显示真人
         if (0 == mMainPageBean.getInfo().getVip()) {
             tagVipImageView.setVisibility(View.VISIBLE);
@@ -511,14 +590,6 @@ public class MainPageFragment extends Fragment implements View.OnClickListener {
             tagPhoneImageView.setVisibility(View.VISIBLE);
         }
 
-        if (!StrU.isEmpty(mMainPageBean.getInfo().getSignature())) {
-            tv_signer.setVisibility(View.VISIBLE);
-            tv_signer.setText(mMainPageBean.getInfo().getSignature());
-        } else {
-            tv_signer.setVisibility(View.GONE);
-        }
-
-        mAge.setText(mMainPageBean.getInfo().getAge() + "");
         mSubInfo.setText(mMainPageBean.getInfo().getCity() + " | 用户号:" + mMainPageBean.getInfo().getUsercode());
         mSubInfo.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -529,37 +600,15 @@ public class MainPageFragment extends Fragment implements View.OnClickListener {
             }
         });
 
-        if (mMainPageBean.getInfo().getFollow_count() > 0) {
+        mFollow_count = mMainPageBean.getInfo().getFollow_count();
-            tv_follow_num.setVisibility(View.VISIBLE);
+
-            String s = "关注 " + mMainPageBean.getInfo().getFollow_count();
+        String follows = "关注 " + mMainPageBean.getInfo().getFollow_count();
-            StrU.setSpanTextColorSizeBold(s, 2, s.length(), tv_follow_num, R.color.color_2d2d2d, 20, true, getContext());
+        StrU.setSpanTextColorSizeBold(follows, 2, follows.length(), tv_follow_num, R.color.color_2d2d2d, 20, true, getContext());
-        } else {
+
-            tv_follow_num.setVisibility(View.GONE);
+        String fans = "粉丝 " + mMainPageBean.getInfo().getFans_count();
-        }
+        StrU.setSpanTextColorSizeBold(fans, 2, fans.length(), tv_fans_num, R.color.color_2d2d2d, 20, true, getContext());
-        if (mMainPageBean.getInfo().getFans_count() > 0) {
+
-            tv_fans_num.setVisibility(View.VISIBLE);
+
-            String s = "粉丝 " + mMainPageBean.getInfo().getFans_count();
-            StrU.setSpanTextColorSizeBold(s, 2, s.length(), tv_fans_num, R.color.color_2d2d2d, 20, true, getContext());
-//            mFanNumber.setVisibility(View.VISIBLE);
-//            mFanNumber.setText(mMainPageBean.getInfo().getFans_count() + "粉丝");
-        } else {
-            mFanNumber.setVisibility(View.GONE);
-            tv_fans_num.setVisibility(View.GONE);
-        }
-        if (mMainPageBean.getInfo().getVisitor_count() > 0) {
-            tv_scan_num.setVisibility(View.VISIBLE);
-            String s = "访客 " + mMainPageBean.getInfo().getVisitor_count();
-            StrU.setSpanTextColorSizeBold(s, 2, s.length(), tv_scan_num, R.color.color_2d2d2d, 20, true, getContext());
-        } else {
-            tv_scan_num.setVisibility(View.GONE);
-        }
-        if (!TextUtils.isEmpty(mMainPageBean.getInfo().getIp_province())) {
-            personal_main_page_ip_province.setVisibility(View.VISIBLE);
-            String s = "IP " + mMainPageBean.getInfo().getIp_province();
-            StrU.setSpanTextColorSizeBold(s, 2, s.length(), personal_main_page_ip_province, R.color.color_2d2d2d, 20, true, getContext());
-        } else {
-            personal_main_page_ip_province.setVisibility(View.GONE);
-        }
 //        mStatus.setText(mMainPageBean.getAnchor().getVideo_status() == 0? "空闲中" : "繁忙");
 
         int online_status = mMainPageBean.getInfo().getOnline_status();  //在线 1 休息中 2 离线
@@ -583,14 +632,14 @@ public class MainPageFragment extends Fragment implements View.OnClickListener {
 
 //        mFocusButton.setEnabled(mMainPageBean.getInfo().getIs_follow() == 0);
         if (null != mMainPageBean.getSkill() && 0 != mMainPageBean.getSkill().size()) {
-            if (mMainPageBean.getInfo().getGender() == 1) {
+//            if (mMainPageBean.getInfo().getGender() == 1) {
-                //女生
+//                //女生
-                mSkillLayout.setVisibility(View.VISIBLE);
+//                mSkillLayout.setVisibility(View.VISIBLE);
-            } else {
+//            } else {
-                mSkillLayout.setVisibility(View.VISIBLE);
+//                mSkillLayout.setVisibility(View.VISIBLE);
-                mSkillCost.setVisibility(View.GONE);
+//
-                mSkillScore.setVisibility(View.GONE);
+//                mSkillScore.setVisibility(View.GONE);
-            }
+//            }
             mSkillScore.setText("评分：" + mMainPageBean.getSkill().get(0).getScore() + "分");
             if (mMainPageBean.getSkill().get(0).getService_count() > 0) {
                 mSkillSuccessRate.setVisibility(View.VISIBLE);
@@ -598,7 +647,7 @@ public class MainPageFragment extends Fragment implements View.OnClickListener {
             } else {
                 mSkillSuccessRate.setVisibility(View.GONE);
             }
-            mSkillCost.setText("视频通话：" + mMainPageBean.getSkill().get(0).getPrice() + "币/分钟\n语音通话：" + mMainPageBean.getSkill().get(0).getVoice_price() + "币/分钟");
+
 
             if (ConstUrl.LOGDEBUG) Log.i("TAG", "initView: online_status------------->" + online_status);
             if (online_status == 1) {
@@ -659,7 +708,6 @@ public class MainPageFragment extends Fragment implements View.OnClickListener {
             mOtherPhoto.setVisibility(View.GONE);
         }
         if (mMainPageBean.getInfo().getGender() != 1) {
-            mSkillCost.setVisibility(View.GONE);
             mSkillScore.setVisibility(View.GONE);
         }
         mSubInfoTime.setText("最近活跃时间:   " + mMainPageBean.getInfo().getUpdate_time());
@@ -711,11 +759,6 @@ public class MainPageFragment extends Fragment implements View.OnClickListener {
 
         if (null != mMainPageBean.getDynamic() && mMainPageBean.getDynamic().size() != 0) {
             mDynamicLayout.setVisibility(View.VISIBLE);
-//            for(int i = 0; i < mMainPageBean.getDynamic().size(); i++){
-//                String url = mMainPageBean.getDynamic().get(i);
-//                mDynamicImages[i].setImageURI(ConstUrl.IMAGE_URL + url);
-//            }
-
             for (int i = 0; i < mMainPageBean.getDynamic().size(); i++) {
                 if (i < 4) {
                     String url = mMainPageBean.getDynamic().get(i);
@@ -782,10 +825,12 @@ public class MainPageFragment extends Fragment implements View.OnClickListener {
                         @Override
                         public void onClicked(View view, int index) {
                             mSelectDialog.dismiss();
-                            Intent intent = new Intent(getActivity(), ComplaintActivity.class);
+//                            Intent intent = new Intent(getActivity(), ComplaintActivity.class);
-                            intent.putExtra("uid", mMainPageBean.getInfo().getUserId() + "");
+//                            intent.putExtra("uid", mMainPageBean.getInfo().getUserId() + "");
-                            intent.putExtra("type", 1);
+//                            intent.putExtra("type", 1);
-                            startActivity(intent);
+//                            startActivity(intent);
+                            NimUIKit.startP2PSession(getActivity(), "4");
+
                         }
                     });
 
@@ -841,6 +886,53 @@ public class MainPageFragment extends Fragment implements View.OnClickListener {
                         });
             }
         }
+
+        Log.d("nail", "initView: ");
+
+        List<String> personal_info = mMainPageBean.getPersonal_info();
+        if (null != personal_info && personal_info.size() > 0) {
+            mRl_personal_info.setVisibility(View.VISIBLE);
+            mine_mine_tag.setLabels(personal_info, new FlowLayout.LabelTextProvider<String>() {
+                @Override
+                public CharSequence getLabelText(TextView label, int position, String data) {
+                    label.setText(data);
+                    if(position == (personal_info.size() - 1)) {
+                        mine_mine_tag.setDefault(position);
+                    }
+                    return data;
+                }
+            });
+        }else {
+            mRl_personal_info.setVisibility(View.GONE);
+        }
+
+        int mobile_mark = mMainPageBean.getInfo().getMobile_mark();
+        int real_name_mark = mMainPageBean.getInfo().getReal_name_mark();
+        int real_person_mark = mMainPageBean.getInfo().getReal_person_mark();
+
+        if (mobile_mark != 1 && real_name_mark != 1 && real_person_mark != 1) {
+            mLl_auto.setVisibility(View.GONE);
+        }else {
+            mLl_auto.setVisibility(View.VISIBLE);
+            if (mobile_mark == 1) {
+                mLl_mobile_auto.setVisibility(View.VISIBLE);
+            }else {
+                mLl_mobile_auto.setVisibility(View.GONE);
+            }
+
+            if (real_name_mark == 1) {
+                mLl_real_name_auto.setVisibility(View.VISIBLE);
+            }else {
+                mLl_real_name_auto.setVisibility(View.GONE);
+            }
+
+            if (real_person_mark == 1) {
+                mLl_real_person_auto.setVisibility(View.VISIBLE);
+            }else {
+                mLl_real_person_auto.setVisibility(View.GONE);
+            }
+        }
+
 //        //'用户类型:0普通用户1内部用户2 审核人员账号'
 //        if (UserManager.getUserInfo().getType() == 2) {
 //            mSkillCost.setVisibility(View.GONE);
@@ -1013,7 +1105,12 @@ public class MainPageFragment extends Fragment implements View.OnClickListener {
                     @Override
                     public void onSuccess(BaseActivity activity, FollowResultBean result, String message) {
                         if (result != null) {
+
                             if (StrU.equals("add", result.getAction())) {
+                                mFollow_count = mFollow_count + 1;
+                                String follows = "关注 " + mFollow_count;
+                                StrU.setSpanTextColorSizeBold(follows, 2, follows.length(), tv_follow_num, R.color.color_2d2d2d, 20, true, getContext());
+
 //                        mFocusButton.setEnabled(false);  //不能取消关注
                                 //mFocusButton.setCompoundDrawablesWithIntrinsicBounds(null, ContextCompat.getDrawable(getContext(), R.mipmap.userhome_follow1), null, null);
                                // mFocusButton.setTextColor(Color.parseColor("#925BF7"));
@@ -1022,6 +1119,11 @@ public class MainPageFragment extends Fragment implements View.OnClickListener {
 //                                mFocusButton.setText("已关注");
                                 MaleToast.showMessage(getActivity(), "关注成功");
                             } else {
+                                if (mFollow_count > 0) {
+                                    mFollow_count = mFollow_count - 1;
+                                    String follows = "关注 " + mFollow_count;
+                                    StrU.setSpanTextColorSizeBold(follows, 2, follows.length(), tv_follow_num, R.color.color_2d2d2d, 20, true, getContext());
+                                }
                                // mFocusButton.setCompoundDrawablesWithIntrinsicBounds(null, ContextCompat.getDrawable(getContext(), R.mipmap.userhome_follow), null, null);
                                // mFocusButton.setTextColor(Color.parseColor("#666666"));
                                 mFocusButton.setText("关注");
@@ -1092,7 +1194,7 @@ public class MainPageFragment extends Fragment implements View.OnClickListener {
         } else if (view == mFocusButton) {
             focus();
         } else if (view == mGiftLayout) {
-            Intent intent = new Intent(getActivity(), GiftReceivedActivity.class);
+            Intent intent = new Intent(getActivity(), GiftReceived2Activity.class);
             intent.putExtra("userId", mMainPageBean.getInfo().getUserId());
             startActivity(intent);
         } else if (view == mMore) {
@@ -1128,7 +1230,80 @@ public class MainPageFragment extends Fragment implements View.OnClickListener {
             intent.putExtra("avatar_url", mMainPageBean.getInfo().getAvatar());
             intent.putExtra("is_follow", mMainPageBean.getInfo().getIs_follow());
             startActivity(intent);
+        } else if (view == mIv_look_wechat) {
+            if (mMainPageBean.getInfo().getHas_wechat() == 1) {
+                getIntimacy(mMainPageBean.getInfo().getUserId());
+            }else {
+                MaleToast.showMessage(getActivity(), "对方还未填写微信号，暂无法查看");
             }
+
+        } else if (view == mIv_main_share) {
+
+            if (null != mMainShareDialog) {
+                mMainShareDialog.dismiss();
+                mMainShareDialog = null;
+            }
+
+            mMainShareDialog = new MainShareDialog(getActivity(), R.style.SelectiveDialog);
+            mMainShareDialog.show();
+            mMainShareDialog.setData(mMainPageBean.getInfo().getAvatar(), mMainPageBean.getInfo().getNickname(), mMainPageBean.getInfo().getUsercode(), mMainPageBean.getQrcode());
+
+            mMainShareDialog.setOnSavaClick(new MainShareDialog.OnSavaClick() {
+                @Override
+                public void save() {
+                    PermissionHelper.request(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE},
+                            new AbsPermissionResultCallBack() {
+                                @Override
+                                public void onPermissionGranted() {
+                                    new SaveImageUtil(mLl_share, getActivity()).start();
+                                }
+
+                                @Override
+                                public void onPermissionDenied(String... permissions) {
+                                    super.onPermissionDenied(permissions);
+                                    MaleToast.showMessage(getActivity(), "没有授予存储权限");
+                                }
+                            });
+                }
+            });
+        } else if (view == mLl_mobile_auto) {
+            MaleToast.showMessage(getActivity(), "对方已通过手机号认证，请放心交友~");
+        } else if (view == mLl_real_name_auto) {
+            MaleToast.showMessage(getActivity(), "对方已通过身份证认证，请放心交友~");
+        } else if (view == mLl_real_person_auto) {
+            MaleToast.showMessage(getActivity(), "对方已通过人脸认证，请放心交友~");
+        } else if (view == mLl_comment_title) {
+            Intent intent = new Intent(getActivity(), MainPageCommentActivity.class);
+            intent.putExtra("userId", mMainPageBean.getInfo().getUserId());
+            startActivity(intent);
+        }
+    }
+
+    private void getIntimacy(int to_uid) {
+        MainManager.getWechatIntimacy((BaseActivity) getActivity(), to_uid, new HttpUiCallBack<LookWechatBean>() {
+            @Override
+            public void onSuccess(BaseActivity activity, LookWechatBean result, String tips) {
+
+                if (mLookWechatDialog != null) {
+                    mLookWechatDialog.dismiss();
+                    mLookWechatDialog = null;
+                }
+
+                mLookWechatDialog = new LookWechatDialog(getActivity(), R.style.SelectiveDialog);
+                mLookWechatDialog.show();
+                mLookWechatDialog.setData(result);
+            }
+
+            @Override
+            public void onFailure(BaseActivity activity, String tip) {
+                MaleToast.showMessage(activity, tip);
+            }
+
+            @Override
+            public void onException(BaseActivity activity, Throwable e) {
+                MaleToast.showMessage(activity, "请重试");
+            }
+        });
     }
 
     @Override

app/src/main/java/com/xuebiping/bolizhuzi/view/main/VideoFinish2Activity.java

@@ -0,0 +1,276 @@
+package com.xuebiping.bolizhuzi.view.main;
+
+import android.graphics.Color;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.fengliyan.uikit.toast.MaleToast;
+import com.huawei.hms.framework.common.StringUtils;
+import com.xuebiping.bolizhuzi.R;
+import com.xuebiping.bolizhuzi.agora.utils.ToastUtil;
+import com.xuebiping.bolizhuzi.controller.main.manager.MainManager;
+import com.xuebiping.bolizhuzi.controller.user.manager.UserManager;
+import com.xuebiping.bolizhuzi.model.main.VideoFeeBean;
+import com.xuebiping.bolizhuzi.model.main.VideoLabelListBean;
+import com.xuebiping.bolizhuzi.utils.FlowLayout;
+import com.xuebiping.bolizhuzi.utils.StrU;
+import com.xuebiping.bolizhuzi.view.base.BaseActivity;
+import com.xuebiping.bolizhuzi.view.base.utils.HttpUiCallBack;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class VideoFinish2Activity extends BaseActivity implements View.OnClickListener {
+
+    private SimpleDraweeView mMy_user_head;
+    private SimpleDraweeView mOther_user_head;
+    private TextView mTv_chat;
+    private TextView mTv_duration;
+    private TextView mTv_cost;
+
+    private int mAttitude = 1;
+    private TextView mTv_dislike;
+    private TextView mTv_like;
+    private FlowLayout mFl_like;
+    private List<String> mNames = new ArrayList<>();
+    private List<String> mNamesDislike = new ArrayList<>();
+    private Button mBt_commit;
+    private int mRoomId;
+    private String mLabelNames;
+    private FlowLayout mFl_dislike;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_video_finish2);
+        mRoomId = getIntent().getIntExtra("roomId", 0);
+        hideTitleBar();
+        initView();
+        getVideoFee();
+    }
+
+    private void initView() {
+        mMy_user_head = findViewById(R.id.my_user_head);
+        mOther_user_head = findViewById(R.id.other_user_head);
+        mTv_chat = findViewById(R.id.tv_chat);
+        mTv_duration = findViewById(R.id.tv_time);
+        mTv_cost = findViewById(R.id.tv_cost);
+        mTv_dislike = findViewById(R.id.tv_dislike);
+        mTv_like = findViewById(R.id.tv_like);
+        mFl_like = findViewById(R.id.fl_like);
+        mFl_dislike = findViewById(R.id.fl_dislike);
+        mBt_commit = findViewById(R.id.bt_commit);
+
+        mFl_like.setSelectType(FlowLayout.SelectType.MULTI);
+        mFl_like.setOnLabelClickListener(new FlowLayout.OnLabelClickListener() {
+            @Override
+            public void onLabelClick(TextView label, Object data, int position) {
+                mFl_like.setLabelSelect(label, !label.isSelected());
+            }
+        });
+
+        mFl_like.setOnLabelSelectChangeListener(new FlowLayout.OnLabelSelectChangeListener() {
+            @Override
+            public void onLabelSelectChange(TextView label, Object data, boolean isSelect,
+                                            int position) {
+                VideoLabelListBean tagBean = (VideoLabelListBean) data;
+                if (isSelect) {
+                    label.setTextColor(Color.parseColor("#EB6DD2"));
+                    label.setBackgroundResource(R.drawable.label_shape_feed_back_bt_selected);
+                    mNames.add(tagBean.getName());
+                } else {
+                    label.setTextColor(Color.parseColor("#ff9ea7b6"));
+                    label.setBackgroundResource(R.drawable.label_shape_feed_back_bt_no_selected);
+                    mNames.remove(tagBean.getName());
+                }
+            }
+        });
+
+        mFl_dislike.setSelectType(FlowLayout.SelectType.MULTI);
+        mFl_dislike.setOnLabelClickListener(new FlowLayout.OnLabelClickListener() {
+            @Override
+            public void onLabelClick(TextView label, Object data, int position) {
+                mFl_dislike.setLabelSelect(label, !label.isSelected());
+            }
+        });
+
+        mFl_dislike.setOnLabelSelectChangeListener(new FlowLayout.OnLabelSelectChangeListener() {
+            @Override
+            public void onLabelSelectChange(TextView label, Object data, boolean isSelect,
+                                            int position) {
+                VideoLabelListBean tagBean = (VideoLabelListBean) data;
+                if (isSelect) {
+                    label.setTextColor(Color.WHITE);
+                    label.setBackgroundResource(R.drawable.shape_button_disable);
+                    mNamesDislike.add(tagBean.getName());
+                } else {
+                    label.setTextColor(Color.parseColor("#ff9ea7b6"));
+                    label.setBackgroundResource(R.drawable.label_shape_feed_back_bt_no_selected);
+                    mNamesDislike.remove(tagBean.getName());
+                }
+            }
+        });
+
+        mTv_dislike.setOnClickListener(this);
+        mTv_like.setOnClickListener(this);
+        mBt_commit.setOnClickListener(this);
+    }
+
+    private void getVideoFee() {
+        MainManager.getVideoFee(this, mRoomId + "", new HttpUiCallBack<VideoFeeBean>() {
+            @Override
+            public void onSuccess(BaseActivity activity, VideoFeeBean result, String message) {
+
+                mMy_user_head.setImageURI(StrU.getResourcePath(result.getFrom_avatar(),VideoFinish2Activity.this));
+                mOther_user_head.setImageURI(StrU.getResourcePath(result.getTo_avatar(),VideoFinish2Activity.this));
+                mTv_chat.setText("与" + result.getTo_nickname() + "的聊天");
+                mTv_duration.setText("通话:" + secondToTime(result.getCall_time()));
+
+                String pay_money = result.getPay_money();
+                if (UserManager.getUserInfo().getGender() == 2) {
+                    if (!TextUtils.isEmpty(pay_money)) {
+                        double d = Double.parseDouble(pay_money);
+                        int money = (int) d;
+                        mTv_cost.setText("消费:" + money + "金币");
+
+                    }
+                } else {
+                    int income_money = (int) result.getIncome_money();
+                    mTv_cost.setText("收益:" + income_money + "金币");
+                }
+
+                List<VideoLabelListBean> list = result.getLabel_list_like();
+                if (list != null && list.size() > 0) {
+                    mFl_like.setLabels(list, new FlowLayout.LabelTextProvider<VideoLabelListBean>() {
+                        @Override
+                        public CharSequence getLabelText(TextView label, int position, VideoLabelListBean data) {
+                            label.setText(data.getName());
+                            mFl_like.setLabelSelect(label,
+                                    data.getSelected() == 1 ? true : false);
+                            return data.getName();
+                        }
+                    });
+                }
+
+                List<VideoLabelListBean> list_dislike = result.getLabel_list_dislike();
+                if (list_dislike != null && list_dislike.size() > 0) {
+                    mFl_dislike.setLabels(list_dislike, new FlowLayout.LabelTextProvider<VideoLabelListBean>() {
+                        @Override
+                        public CharSequence getLabelText(TextView label, int position, VideoLabelListBean data) {
+                            label.setText(data.getName());
+                            mFl_dislike.setLabelSelect(label,
+                                    data.getSelected() == 1 ? true : false);
+                            return data.getName();
+                        }
+                    });
+                }
+            }
+
+            @Override
+            public void onFailure(BaseActivity activity, String tip) {
+                MaleToast.showMessage(activity, tip);
+            }
+
+            @Override
+            public void onException(BaseActivity activity, Throwable e) {
+                MaleToast.showMessage(activity, "请重试");
+            }
+        });
+    }
+
+    private String secondToTime(long second) {
+        long days = second / 86400;
+        second = second % 86400;
+        long hours = second / 3600;
+        second = second % 3600;
+        long minutes = second / 60;
+        second = second % 60;
+        if (days > 0) {
+            return days + "天" + hours + "小时" + minutes + "分" + second + "秒";
+        } else {
+            if (hours > 0) {
+                return hours + "小时" + minutes + "分" + second + "秒";
+            }else {
+                return minutes + "分" + second + "秒";
+            }
+        }
+    }
+
+    private void evaluate() {
+        MainManager.evaluateVideo2(this,
+                mRoomId + "", 5, mAttitude, mLabelNames, new HttpUiCallBack<Object>() {
+                    @Override
+                    public void onSuccess(BaseActivity activity, Object result, String message) {
+                        finish();
+                    }
+
+                    @Override
+                    public void onFailure(BaseActivity activity, String tip) {
+//                        MaleToast.showMessage(activity, tip);
+                        finish();
+                    }
+
+                    @Override
+                    public void onException(BaseActivity activity, Throwable e) {
+//                        MaleToast.showMessage(activity, "未知异常");
+                        finish();
+                    }
+                });
+    }
+
+    private String submitUpdate(List<String> list) {
+        StringBuffer buffer = new StringBuffer();
+        if (list != null && list.size() > 0) {
+            for (int i = 0; i < list.size(); i++) {
+                if (i == list.size() - 1) {
+                    buffer.append(list.get(i));
+                } else {
+                    buffer.append(list.get(i)).append(",");
+                }
+            }
+        }
+
+        return buffer.toString();
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (view == mTv_dislike) {
+            mTv_dislike.setBackgroundResource(R.drawable.shape_dislike_bg);
+            mTv_dislike.setTextColor(Color.WHITE);
+
+            mTv_like.setBackground(null);
+            mTv_like.setTextColor(getResources().getColor(R.color.two_text));
+
+            mAttitude = 0;
+
+            mFl_like.setVisibility(View.GONE);
+            mFl_dislike.setVisibility(View.VISIBLE);
+        } else if (view == mTv_like) {
+            mTv_like.setBackgroundResource(R.drawable.shape_like_bg);
+            mTv_like.setTextColor(Color.WHITE);
+
+            mTv_dislike.setBackground(null);
+            mTv_dislike.setTextColor(getResources().getColor(R.color.two_text));
+
+            mAttitude = 1;
+
+            mFl_like.setVisibility(View.VISIBLE);
+            mFl_dislike.setVisibility(View.GONE);
+        } else if (view == mBt_commit) {
+
+            if (mAttitude == 1) {
+                mLabelNames = submitUpdate(mNames);
+            }else {
+                mLabelNames = submitUpdate(mNamesDislike);
+            }
+
+            evaluate();
+        }
+    }
+}

app/src/main/java/com/xuebiping/bolizhuzi/view/main/dialog/LookWechatDialog.java

@@ -0,0 +1,128 @@
+package com.xuebiping.bolizhuzi.view.main.dialog;
+
+import android.app.Dialog;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.os.Bundle;
+import android.text.Html;
+import android.view.Gravity;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.fengliyan.uikit.toast.MaleToast;
+import com.xuebiping.bolizhuzi.R;
+import com.xuebiping.bolizhuzi.model.main.LookWechatBean;
+import com.xuebiping.bolizhuzi.utils.StrU;
+
+public class LookWechatDialog extends Dialog {
+
+    private Context mContext;
+    private String mText;
+    private SimpleDraweeView mOther_user_head;
+    private SimpleDraweeView mMy_user_head;
+    private TextView mTv_percent_intimacy;
+    private ProgressBar mPb_intimacy;
+    private TextView mTv_no_vip_intimacy;
+    private TextView mTv_vip_intimacy;
+    private TextView mTv_all_intimacy_intro;
+    private TextView mTv_risk;
+    private TextView mTv_risk_footer;
+    private Button mBt_look_wechat;
+    private String mWechat;
+
+    public LookWechatDialog(@NonNull Context context) {
+        super(context);
+        mContext = context;
+    }
+
+    public LookWechatDialog(@NonNull Context context, int themeResId) {
+        super(context, themeResId);
+        mContext = context;
+    }
+
+    protected LookWechatDialog(@NonNull Context context, boolean cancelable, @Nullable OnCancelListener cancelListener) {
+        super(context, cancelable, cancelListener);
+        mContext = context;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.dialog_look_wechat);
+
+        Window window = this.getWindow();
+        window.setGravity(Gravity.CENTER);
+        WindowManager.LayoutParams params = window.getAttributes();
+        params.width = WindowManager.LayoutParams.MATCH_PARENT;
+        params.height = WindowManager.LayoutParams.WRAP_CONTENT;
+//        window.setWindowAnimations(R.style.share_animation);
+        window.setAttributes(params);
+
+        initView();
+    }
+
+    private void initView() {
+
+        mOther_user_head = findViewById(R.id.other_user_head);
+        mMy_user_head = findViewById(R.id.my_user_head);
+        mTv_percent_intimacy = findViewById(R.id.tv_percent_intimacy);
+        mPb_intimacy = findViewById(R.id.pb_intimacy);
+        mTv_no_vip_intimacy = findViewById(R.id.tv_no_vip_intimacy);
+        mTv_vip_intimacy = findViewById(R.id.tv_vip_intimacy);
+        mTv_all_intimacy_intro = findViewById(R.id.tv_all_intimacy_intro);
+        mTv_risk = findViewById(R.id.tv_risk);
+        mTv_risk_footer = findViewById(R.id.tv_risk_footer);
+
+        mBt_look_wechat = findViewById(R.id.bt_look_wechat);
+
+        mBt_look_wechat.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                ClipboardManager cm = (ClipboardManager)
+                        mContext.getSystemService(Context.CLIPBOARD_SERVICE);
+                cm.setPrimaryClip(ClipData.newPlainText(null, mWechat));
+                MaleToast.showMessage(mContext, "微信号复制成功，请前往微信添加该微信号");
+            }
+        });
+    }
+
+    public void setData(LookWechatBean bean) {
+        if (null != bean) {
+            mOther_user_head.setImageURI(StrU.getResourcePath(bean.getTo_avatar(), mContext));
+            mMy_user_head.setImageURI(StrU.getResourcePath(bean.getMy_avatar(), mContext));
+            mTv_percent_intimacy.setText(bean.getIntimacy_percent() + "%");
+            mPb_intimacy.setProgress(bean.getIntimacy_percent());
+            mTv_no_vip_intimacy.setText(bean.getIntimacy() + "/" + bean.getUnlock_coin() + " 亲密值");
+            mTv_vip_intimacy.setText(bean.getIntimacy() + "/" + bean.getSvip_unlock_coin() + " 亲密值");
+            mTv_risk.setText(bean.getRisk_tips());
+            mTv_risk_footer.setText(bean.getFooter_tips());
+
+            if (bean.getMember_type() == 1) {
+                mText = bean.getSvip_unlock_coin() + "";
+            }else {
+                mText = bean.getUnlock_coin() + "";
+            }
+
+            String text = "亲密值累计 <font color='#EB6DD2'>" + mText + "</font> 可成为私密好友并免费解锁微信每与她消费1金币，可增加1亲密值";
+            mTv_all_intimacy_intro.setText(Html.fromHtml(text, 0));
+
+            if (bean.getIntimacy_percent() >= 100) {
+                mBt_look_wechat.setEnabled(true);
+            }else {
+                mBt_look_wechat.setEnabled(false);
+            }
+
+            mWechat = bean.getWechat();
+        }
+    }
+}

app/src/main/java/com/xuebiping/bolizhuzi/view/main/dialog/MainShareDialog.java

@@ -0,0 +1,101 @@
+package com.xuebiping.bolizhuzi.view.main.dialog;
+
+import android.Manifest;
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.fengliyan.base.base.permission.AbsPermissionResultCallBack;
+import com.fengliyan.base.base.permission.PermissionHelper;
+import com.fengliyan.uikit.toast.MaleToast;
+import com.xuebiping.bolizhuzi.R;
+import com.xuebiping.bolizhuzi.utils.SaveImageUtil;
+import com.xuebiping.bolizhuzi.utils.StrU;
+import com.xuebiping.bolizhuzi.view.settings.InvitationActivity;
+
+public class MainShareDialog extends Dialog {
+
+    private Context mContext;
+    private SimpleDraweeView mUser_head;
+    private TextView mTv_name;
+    private TextView mTv_code;
+    private SimpleDraweeView mSv_er;
+    private LinearLayout mLl_share;
+
+    public MainShareDialog(@NonNull Context context) {
+        super(context);
+        mContext = context;
+    }
+
+    public MainShareDialog(@NonNull Context context, int themeResId) {
+        super(context, themeResId);
+        mContext = context;
+    }
+
+    protected MainShareDialog(@NonNull Context context, boolean cancelable, @Nullable OnCancelListener cancelListener) {
+        super(context, cancelable, cancelListener);
+        mContext = context;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.dialog_main_share);
+
+        Window window = this.getWindow();
+        window.setGravity(Gravity.CENTER);
+        WindowManager.LayoutParams params = window.getAttributes();
+        params.width = WindowManager.LayoutParams.MATCH_PARENT;
+        params.height = WindowManager.LayoutParams.WRAP_CONTENT;
+//        window.setWindowAnimations(R.style.share_animation);
+        window.setAttributes(params);
+
+        initView();
+    }
+
+    private void initView() {
+        mLl_share = findViewById(R.id.ll_share);
+        mUser_head = findViewById(R.id.user_head);
+        mTv_name = findViewById(R.id.tv_name);
+        mTv_code = findViewById(R.id.tv_code);
+        mSv_er = findViewById(R.id.sv_er);
+
+        findViewById(R.id.bt_save).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                dismiss();
+                if (mOnSavaClick != null) {
+                    mOnSavaClick.save();
+                }
+            }
+        });
+    }
+
+    public void setData(String avatar, String name, String code, String qrcode) {
+        mUser_head.setImageURI(StrU.getResourcePath(avatar, mContext));
+        mTv_name.setText(name);
+        mTv_code.setText("ID:" + code);
+        mSv_er.setImageURI(StrU.getResourcePath(qrcode, mContext));
+    }
+
+    private OnSavaClick mOnSavaClick;
+
+    public interface OnSavaClick {
+        void save();
+    }
+
+    public void setOnSavaClick(OnSavaClick onSavaClick) {
+        this.mOnSavaClick = onSavaClick;
+    }
+}

app/src/main/res/drawable/label_shape_feed_back_bt_no_selected.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke android:color="#f5f6fa" android:width="@dimen/dp1" />
+    <corners android:radius="@dimen/dp20" />
+</shape>

app/src/main/res/drawable/label_shape_feed_back_bt_selected.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#1AE472ED" />
+    <corners android:radius="@dimen/dp20" />
+</shape>

app/src/main/res/drawable/progressbar_voice.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 背景 -->
+    <item
+        android:id="@android:id/background"
+        android:drawable="@drawable/shape_efecec_r45_bg"></item>
+    <!-- 第二进度条样式，用不怎么到直接设置成了和背景色一样的颜色，隐藏起来 -->
+    <item android:id="@android:id/secondaryProgress" android:drawable="@drawable/shape_efecec_r45_bg">
+    </item>
+    <!-- 第一进度条样式，我想修改的，修改成简单的灰色 -->
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <!-- 圆角设置 -->
+                <corners android:radius="@dimen/dp16" />
+                <!-- <gradient
+                     android:angle="270"
+                     android:centerY="0.75"
+                     android:endColor="#1AB62EFF"
+                     android:startColor="#1AB62EFF" />-->
+                <solid android:color="@color/yellow_ffd33e" />
+            </shape>
+        </clip>
+    </item>
+</layer-list>

app/src/main/res/drawable/shape_button_disable.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <stroke android:color="@color/titleLine"
+    <stroke android:color="#D2D2D2"
         android:width="2px"/>
-    <solid android:color="@color/titleLine"/>
+    <solid android:color="#D2D2D2"/>
     <corners android:radius="45dp"/>
 
 </shape>

app/src/main/res/drawable/shape_comment1_bg.xml

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

app/src/main/res/drawable/shape_comment2_bg.xml

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

app/src/main/res/drawable/shape_comment3_bg.xml

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

app/src/main/res/drawable/shape_comment4_bg.xml

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

app/src/main/res/drawable/shape_comment5_bg.xml

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

app/src/main/res/drawable/shape_comment_dislike_bg.xml

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

app/src/main/res/drawable/shape_dislike_bg.xml

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

app/src/main/res/drawable/shape_efecec_r45_bg.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="@dimen/dp45" />
+    <solid android:color="#EFECEC"/>
+</shape>

app/src/main/res/drawable/shape_level_1_20_bg.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <gradient android:angle="0"
+        android:startColor="#E685A6"
+        android:endColor="#DA5281"/>
+
+    <corners android:radius="45dp"/>
+
+</shape>

app/src/main/res/drawable/shape_level_21_40_bg.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <gradient android:angle="0"
+        android:startColor="#E236B5"
+        android:endColor="#AA3CE9"/>
+
+    <corners android:radius="45dp"/>
+
+</shape>

app/src/main/res/drawable/shape_level_41_60_bg.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <gradient android:angle="0"
+        android:startColor="#BA9F4F"
+        android:endColor="#FFC107"/>
+
+    <corners android:radius="45dp"/>
+
+</shape>

app/src/main/res/drawable/shape_level_61_80_bg.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <gradient android:angle="0"
+        android:startColor="#4FA3E6"
+        android:endColor="#06CAE3"/>
+
+    <corners android:radius="45dp"/>
+
+</shape>

app/src/main/res/drawable/shape_level_81_100_bg.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <gradient android:angle="0"
+        android:startColor="#7D89CC"
+        android:endColor="#5403E4"/>
+
+    <corners android:radius="45dp"/>
+
+</shape>

app/src/main/res/drawable/shape_like_bg.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <gradient android:angle="0"
+        android:startColor="#EA6FEE"
+        android:endColor="#EB6969"/>
+    <corners android:bottomRightRadius="45dp" android:topRightRadius="45dp"/>
+
+</shape>

app/src/main/res/layout/activity_gift_received2.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:viewBindingIgnore="true"
+    android:background="@color/white">
+
+    <LinearLayout
+        android:layout_marginLeft="16dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="14sp"
+            android:text="礼物总数"
+            android:textColor="@color/three_text"/>
+
+        <TextView
+            android:id="@+id/gift_received_header_info"
+            android:layout_marginLeft="12dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="14sp"
+            android:text="0"
+            android:textColor="@color/one_text"/>
+    </LinearLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:layout_marginLeft="12dp"
+        android:layout_marginRight="12dp"
+        android:layout_marginTop="16dp"
+        android:id="@+id/rv_recommend_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>

app/src/main/res/layout/activity_login.xml

@@ -10,11 +10,11 @@
 
     <ImageView
         android:id="@+id/login_logo"
-        android:layout_width="wrap_content"
+        android:layout_width="56dp"
-        android:layout_height="wrap_content"
+        android:layout_height="56dp"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="80dp"
-        android:src="@mipmap/login_logo" />
+        android:src="@mipmap/ic_launcher" />
 
     <ImageView
         android:id="@+id/backBtn"
@@ -34,7 +34,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/login_logo"
         android:layout_marginStart="@dimen/dp20"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="40dp"
         android:orientation="horizontal">
 
 
@@ -216,11 +216,10 @@
 
                     <TextView
                         android:id="@+id/tv_send_code"
-                        android:layout_width="wrap_content"
+                        android:layout_width="80dp"
                         android:layout_height="@dimen/dp25"
                         android:background="@drawable/shape_button_enable"
                         android:gravity="center"
-                        android:paddingHorizontal="@dimen/dp8"
                         android:text="获取验证码"
                         android:textColor="@color/white"
                         android:textSize="12dp" />
@@ -349,6 +348,7 @@
     </LinearLayout>
 
     <RelativeLayout
+        android:visibility="gone"
         android:id="@+id/rl_fast_login_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -387,6 +387,7 @@
     </RelativeLayout>
 
     <LinearLayout
+        android:visibility="gone"
         android:id="@+id/thirdCotainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -424,7 +425,7 @@
         android:id="@+id/login_contract_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/lin_login_help"
+        android:layout_alignParentBottom="true"
         android:layout_marginBottom="22dp"
         android:gravity="center"
         android:orientation="horizontal">
@@ -474,6 +475,7 @@
     </LinearLayout>
 
     <LinearLayout
+        android:visibility="gone"
         android:id="@+id/lin_login_help"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

app/src/main/res/layout/activity_main_comment.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/white"
+    tools:viewBindingIgnore="true">
+
+    <LinearLayout
+        android:id="@+id/ll_content_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+            android:id="@+id/smart_refresh"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="visible">
+
+            <com.scwang.smartrefresh.layout.header.ClassicsHeader
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:srlEnableLastTime="false" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical">
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/rv_recommend_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginTop="@dimen/dp_10" />
+                </LinearLayout>
+
+            <com.scwang.smartrefresh.layout.footer.ClassicsFooter
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+    </LinearLayout>
+
+</LinearLayout>

app/src/main/res/layout/activity_main_personal_page.xml

@@ -110,6 +110,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:visibility="gone"
                 android:id="@+id/main_personal_page_wechat"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
@@ -244,6 +245,7 @@
     </RelativeLayout>
 
     <TextView
+        android:visibility="gone"
         android:id="@+id/tv_personal_free"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -258,5 +260,31 @@
         android:textColor="#FFFF365E"
         android:textSize="15dp"
         android:textStyle="bold"
-        android:visibility="gone" />
+      />
+
+    <RelativeLayout
+        android:visibility="gone"
+        android:layout_marginBottom="120dp"
+        android:layout_marginEnd="20dp"
+        android:id="@+id/rl_love_layout"
+        android:layout_width="@dimen/dp55"
+        android:layout_height="@dimen/dp55"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:background="@mipmap/ic_love_ssss">
+
+        <TextView
+            android:id="@+id/tv_love_count"
+            android:layout_width="@dimen/dp35"
+            android:layout_height="@dimen/dp15"
+            android:layout_centerHorizontal="true"
+            android:background="@drawable/bg_focus"
+            android:layout_alignParentBottom="true"
+            android:textColor="@color/white"
+            android:gravity="center"
+            android:textSize="9dp"
+            android:text="0%"
+            />
+
+    </RelativeLayout>
 </RelativeLayout>

app/src/main/res/layout/activity_register.xml

@@ -139,12 +139,12 @@
         <Button
             android:id="@+id/register_send_code_button"
             style="@style/caiButtonStyleV2"
-            android:layout_width="90dp"
+            android:layout_width="80dp"
-            android:layout_height="28dp"
+            android:layout_height="@dimen/dp25"
             android:layout_weight="0.5"
             android:text="获取验证码"
             android:textColor="@color/white"
-            android:textSize="14sp" />
+            android:textSize="12dp" />
     </LinearLayout>
 
     <View

app/src/main/res/layout/activity_video_finish2.xml

@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/transparent">
+
+    <RelativeLayout
+        android:layout_centerInParent="true"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:gravity="center_horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="24dp"
+            android:layout_marginTop="28dp"
+            android:layout_marginRight="24dp"
+            android:background="@drawable/shape_white_bg_r14"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_chat"
+                android:textColor="@color/one_text"
+                android:layout_marginTop="44dp"
+                android:textSize="16sp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="与希尔的聊天"/>
+
+            <TextView
+                android:id="@+id/tv_time"
+                android:textColor="@color/three_text"
+                android:layout_marginTop="16dp"
+                android:textSize="14sp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="通话:"/>
+
+            <TextView
+                android:id="@+id/tv_cost"
+                android:textColor="@color/three_text"
+                android:textSize="14sp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="消费:"/>
+
+            <LinearLayout
+                android:layout_marginLeft="44dp"
+                android:layout_marginRight="44dp"
+                android:layout_marginTop="16dp"
+                android:background="@drawable/shape_dddddd_line_oval_bg"
+                android:layout_width="match_parent"
+                android:layout_height="32dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/tv_dislike"
+                    android:gravity="center"
+                    android:layout_weight="1"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="无感"
+                    android:textColor="@color/two_text"
+                    android:textSize="16sp"/>
+
+                <TextView
+                    android:id="@+id/tv_like"
+                    android:background="@drawable/shape_like_bg"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="喜欢"
+                    android:textColor="@color/white"
+                    android:textSize="16sp"/>
+            </LinearLayout>
+
+            <RelativeLayout
+                android:layout_marginLeft="16dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.xuebiping.bolizhuzi.utils.FlowLayout
+                    android:id="@+id/fl_like"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:isIndicator="true"
+                    app:labelBackground="@drawable/label_shape_feed_back_bt_no_selected"
+                    app:labelTextColor="#ff9ea7b6"
+                    app:labelTextSize="14dp"
+                    app:lineMargin="10dp"
+                    app:selectlabelBackground="@drawable/label_shape_feed_back_bt_selected"
+                    app:selectlabelTextColor="@color/yellow_ffd33e" />
+
+                <com.xuebiping.bolizhuzi.utils.FlowLayout
+                    android:visibility="gone"
+                    android:id="@+id/fl_dislike"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:isIndicator="true"
+                    app:labelBackground="@drawable/label_shape_feed_back_bt_no_selected"
+                    app:labelTextColor="#ff9ea7b6"
+                    app:labelTextSize="14dp"
+                    app:lineMargin="10dp"
+                    app:selectlabelBackground="@drawable/shape_button_disable"
+                    app:selectlabelTextColor="@color/white" />
+            </RelativeLayout>
+
+            <Button
+                android:layout_marginBottom="20dp"
+                android:id="@+id/bt_commit"
+                style="@style/caiButtonStyle"
+                android:layout_marginLeft="44dp"
+                android:layout_marginRight="44dp"
+                android:text="提交评价"
+                android:layout_width="match_parent"
+                android:layout_height="44dp"
+                android:layout_marginTop="100dp"/>
+
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_centerHorizontal="true"
+            android:layout_width="112dp"
+            android:layout_height="56dp">
+
+            <com.facebook.drawee.view.SimpleDraweeView
+                android:id="@+id/my_user_head"
+                android:layout_width="56dp"
+                android:layout_height="56dp"
+                android:scaleType="fitXY"
+                app:roundAsCircle="true"
+                app:roundingBorderColor="@color/white"
+                app:roundingBorderWidth="2dp" />
+
+            <com.facebook.drawee.view.SimpleDraweeView
+                android:layout_alignParentRight="true"
+                android:id="@+id/other_user_head"
+                android:layout_width="56dp"
+                android:layout_height="56dp"
+                android:scaleType="fitXY"
+                app:roundAsCircle="true"
+                app:roundingBorderColor="@color/white"
+                app:roundingBorderWidth="2dp" />
+
+            <ImageView
+                android:layout_width="22dp"
+                android:layout_height="22dp"
+                android:layout_centerInParent="true"
+                android:src="@mipmap/ic_look_wechat_love" />
+        </RelativeLayout>
+    </RelativeLayout>
+</RelativeLayout>

app/src/main/res/layout/dialog_look_wechat.xml

@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:background="@color/transparent"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="24dp"
+            android:layout_marginTop="28dp"
+            android:layout_marginRight="24dp"
+            android:background="@drawable/shape_white_bg_r14"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:layout_marginTop="36dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="当前与TA的亲密度为："
+                    android:textColor="#ff000000"
+                    android:textSize="15sp" />
+
+                <TextView
+                    android:id="@+id/tv_percent_intimacy"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="56%"
+                    android:textColor="@color/yellow_ffd33e"
+                    android:textSize="25sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+            <ProgressBar
+                android:id="@+id/pb_intimacy"
+                style="@style/progressBar_voice"
+                android:layout_width="match_parent"
+                android:layout_height="4dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginRight="20dp"
+                android:max="100"
+                android:progress="50" />
+
+            <TextView
+                android:id="@+id/tv_no_vip_intimacy"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:layout_marginTop="16dp"
+                android:text="0/13140"
+                android:textColor="@color/yellow_ffd33e"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/tv_vip_intimacy"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:layout_marginTop="4dp"
+                android:drawableEnd="@mipmap/ic_svip"
+                android:drawablePadding="8dp"
+                android:text="0/13140"
+                android:textColor="@color/yellow_ffd33e"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/tv_all_intimacy_intro"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginRight="20dp"
+                android:text="亲密值累计 13140 可成为私密好友并免费解锁微信每与她消费1金币，可增加1亲密值"
+                android:textColor="#ff000000"
+                android:textSize="12sp" />
+
+            <Button
+                android:id="@+id/bt_look_wechat"
+                style="@style/caiButtonStyle"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:enabled="false"
+                android:text="查看TA的微信"
+                android:layout_width="match_parent"
+                android:layout_height="44dp"
+                android:layout_marginTop="24dp"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:layout_marginTop="16dp"
+                android:drawableStart="@mipmap/ic_risk_tip"
+                android:drawablePadding="6dp"
+                android:text="风险提示"
+                android:textColor="#ffeb838c"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/tv_risk"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="8dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="1、亲密度代表了熟悉程度,循序渐进的积累更有助于稳固彼此的亲密关系哦!
+                \n2、平台禁止一切诈骗、涉黄等违法行为
+                \n3、如主播在直播任何场合以陪玩、送礼等方式进行诱导用户添加个人联系方式、打赏、私下交易，进行违法行为，一经发现永久封禁，请谨慎判断，以防人身或财产损失。请用户注意财产安全，谨防网络诈骗。此外，用户在第三方平台与主播产生的任何风险与财产损失与平台无关。"
+                android:textColor="#ffeb838c"
+                android:textSize="12sp"
+                />
+
+            <TextView
+                android:id="@+id/tv_risk_footer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginBottom="20dp"
+                android:text="解锁主播亲密度24小时内未添加成功及时联系官方客服如果您遇到主播有此违规行为欢迎您联系客服进行举报"
+                android:textColor="#ffff0016"
+                android:textSize="12sp"
+                android:textStyle="bold" />
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="112dp"
+            android:layout_height="56dp"
+            android:layout_marginLeft="44dp">
+
+            <com.facebook.drawee.view.SimpleDraweeView
+                android:id="@+id/other_user_head"
+                android:layout_width="56dp"
+                android:layout_height="56dp"
+                android:scaleType="fitXY"
+                app:roundAsCircle="true"
+                app:roundingBorderColor="@color/white"
+                app:roundingBorderWidth="2dp" />
+
+            <com.facebook.drawee.view.SimpleDraweeView
+                android:id="@+id/my_user_head"
+                android:layout_width="56dp"
+                android:layout_height="56dp"
+                android:layout_alignParentRight="true"
+                android:scaleType="fitXY"
+                app:roundAsCircle="true"
+                app:roundingBorderColor="@color/white"
+                app:roundingBorderWidth="2dp" />
+
+            <ImageView
+                android:layout_width="22dp"
+                android:layout_height="22dp"
+                android:layout_centerInParent="true"
+                android:src="@mipmap/ic_look_wechat_love" />
+        </RelativeLayout>
+    </RelativeLayout>
+
+</LinearLayout>

app/src/main/res/layout/dialog_main_share.xml

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:background="@color/transparent"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_marginLeft="32dp"
+        android:layout_marginRight="32dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:id="@+id/ll_share"
+            android:background="#151515"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <com.facebook.drawee.view.SimpleDraweeView
+                android:id="@+id/user_head"
+                android:layout_width="match_parent"
+                android:layout_height="300dp"
+                android:scaleType="fitXY"/>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="160dp">
+
+                <LinearLayout
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="20dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="恋爱不是KPI\n在芊颜慢慢种花自然开"
+                        android:textColor="#ffefdfcf"
+                        android:textSize="15sp"
+                        />
+
+                    <TextView
+                        android:id="@+id/tv_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="16dp"
+                        android:text="软软i"
+                        android:textColor="@color/white"
+                        android:textSize="15sp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/tv_code"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="ID:611139"
+                        android:textColor="@color/white"
+                        android:textSize="13sp"
+                        android:textStyle="bold" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_centerVertical="true"
+                    android:gravity="center_horizontal"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginRight="10dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="保存图片扫码下载"
+                        android:textColor="@color/white"
+                        android:textSize="12sp"
+                        />
+
+                    <com.facebook.drawee.view.SimpleDraweeView
+                        android:layout_marginTop="4dp"
+                        android:id="@+id/sv_er"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:scaleType="fitXY"/>
+                </LinearLayout>
+            </RelativeLayout>
+        </LinearLayout>
+
+        <Button
+            android:layout_below="@+id/ll_share"
+            android:id="@+id/bt_save"
+            style="@style/caiButtonStyle"
+            android:text="保存图片"
+            android:layout_width="match_parent"
+            android:layout_height="44dp"
+            android:layout_marginTop="24dp"/>
+    </RelativeLayout>
+
+</LinearLayout>

app/src/main/res/layout/fragment_dynamics.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/dynamics_fresh"
     android:layout_width="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:viewBindingIgnore="true"
     android:layout_height="match_parent"
+    android:background="@color/background"
     android:orientation="vertical"
-    android:background="@color/background">
+    tools:viewBindingIgnore="true">
+
     <com.fengliyan.uikit.refresh.LoadMoreListView
         android:id="@+id/dynamics_list"
         android:layout_width="match_parent"

app/src/main/res/layout/item_gift_received2.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <com.facebook.drawee.view.SimpleDraweeView
+            android:id="@+id/gift_received_logo"
+            android:layout_width="44dp"
+            android:layout_height="44dp" />
+
+        <TextView
+            android:maxLines="1"
+            android:maxEms="4"
+            android:ellipsize="middle"
+            android:id="@+id/gift_received_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:text="玫瑰花"
+            android:textColor="@color/one_text"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/gift_received_number"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:gravity="center"
+            android:text="x2"
+            android:textColor="@color/three_text"
+            android:textSize="12sp" />
+    </LinearLayout>
+
+</RelativeLayout>

app/src/main/res/layout/item_main_page_comment.xml

@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:fresco="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    tools:viewBindingIgnore="true">
+
+    <RelativeLayout
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:id="@+id/rl_item"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:gravity="center_vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <com.facebook.drawee.view.SimpleDraweeView
+                android:id="@+id/list_photo"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                fresco:roundAsCircle="true" />
+
+            <LinearLayout
+                android:layout_marginStart="10dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    android:textStyle="bold"
+                    android:id="@+id/tv_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="醉红颜醉红颜"
+                    android:textColor="@color/one_text"
+                    android:textSize="12sp" />
+
+                <TextView
+                    android:id="@+id/tv_level"
+                    android:paddingHorizontal="6dp"
+                    android:layout_marginTop="4dp"
+                    android:gravity="center"
+                    android:background="@drawable/shape_level_1_20_bg"
+                    android:layout_width="wrap_content"
+                    android:layout_height="16dp"
+                    android:text="LV.100"
+                    android:textColor="@color/white"
+                    android:textSize="8dp"
+                    />
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:gravity="center"
+                android:visibility="gone"
+                android:id="@+id/tv_comment1"
+                android:paddingHorizontal="6dp"
+                android:background="@drawable/shape_comment1_bg"
+                android:layout_width="wrap_content"
+                android:layout_height="16dp"
+                android:text="有感觉"
+                android:textColor="@color/white"
+                android:textSize="10dp" />
+
+            <TextView
+                android:gravity="center"
+                android:visibility="gone"
+                android:id="@+id/tv_comment2"
+                android:layout_marginLeft="8dp"
+                android:paddingHorizontal="6dp"
+                android:background="@drawable/shape_comment2_bg"
+                android:layout_width="wrap_content"
+                android:layout_height="16dp"
+                android:text="有亲和力"
+                android:textColor="@color/white"
+                android:textSize="10dp" />
+
+            <TextView
+                android:gravity="center"
+                android:visibility="gone"
+                android:id="@+id/tv_comment3"
+                android:layout_marginLeft="8dp"
+                android:paddingHorizontal="6dp"
+                android:background="@drawable/shape_comment3_bg"
+                android:layout_width="wrap_content"
+                android:layout_height="16dp"
+                android:text="身材好"
+                android:textColor="@color/white"
+                android:textSize="10dp" />
+        </LinearLayout>
+
+    </RelativeLayout>
+
+</LinearLayout>

app/src/main/res/layout/layout_login_one_key.xml

@@ -29,6 +29,7 @@
 
 
     <LinearLayout
+        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"

app/src/main/res/values/attrs.xml

@@ -66,4 +66,78 @@
     <declare-styleable name="RoundAngleImageView">
         <attr name="round" format="dimension" />
     </declare-styleable>
+
+    <declare-styleable name="FlowLayout">
+        <attr name="selectType" format="enum">
+            <enum name="NONE" value="1" />
+            <enum name="SINGLE" value="2" />
+            <enum name="SINGLE_IRREVOCABLY" value="3" />
+            <enum name="MULTI" value="4" />
+        </attr>
+
+        <attr name="labelGravity">
+            <!-- Push object to the top of its container, not changing its size. -->
+            <flag name="top" value="0x30" />
+            <!-- Push object to the bottom of its container, not changing its size. -->
+            <flag name="bottom" value="0x50" />
+            <!-- Push object to the left of its container, not changing its size. -->
+            <flag name="left" value="0x03" />
+            <!-- Push object to the right of its container, not changing its size. -->
+            <flag name="right" value="0x05" />
+            <!-- Place object in the vertical center of its container, not changing its size. -->
+            <flag name="center_vertical" value="0x10" />
+            <!-- Grow the vertical size of the object if needed so it completely fills its container. -->
+            <flag name="fill_vertical" value="0x70" />
+            <!-- Place object in the horizontal center of its container, not changing its size. -->
+            <flag name="center_horizontal" value="0x01" />
+            <!-- Grow the horizontal size of the object if needed so it completely fills its container. -->
+            <flag name="fill_horizontal" value="0x07" />
+            <!-- Place the object in the center of its container in both the vertical and horizontal axis, not changing its size. -->
+            <flag name="center" value="0x11" />
+            <!-- Grow the horizontal and vertical size of the object if needed so it completely fills its container. -->
+            <flag name="fill" value="0x77" />
+            <!-- Additional option that can be set to have the top and/or bottom edges of
+                 the child clipped to its container's bounds.
+                 The clip will be based on the vertical gravity: a top gravity will clip the bottom
+                 edge, a bottom gravity will clip the top edge, and neither will clip both edges. -->
+            <flag name="clip_vertical" value="0x80" />
+            <!-- Additional option that can be set to have the left and/or right edges of
+                 the child clipped to its container's bounds.
+                 The clip will be based on the horizontal gravity: a left gravity will clip the right
+                 edge, a right gravity will clip the left edge, and neither will clip both edges. -->
+            <flag name="clip_horizontal" value="0x08" />
+            <!-- Push object to the beginning of its container, not changing its size. -->
+            <flag name="start" value="0x00800003" />
+            <!-- Push object to the end of its container, not changing its size. -->
+            <flag name="end" value="0x00800005" />
+        </attr>
+
+        <attr name="maxSelect" format="integer" />
+        <attr name="minSelect" format="integer" />
+        <attr name="maxLines" format="integer" />
+        <attr name="isIndicator" format="boolean" />
+        <attr name="labelTextColor" format="reference|color" />
+        <attr name="selectlabelTextColor" format="reference|color" />
+        <attr name="labelTextSize" format="dimension" />
+        <attr name="labelTextWidth" format="dimension">
+            <enum name="fill_parent" value="-1" />
+            <enum name="match_parent" value="-1" />
+            <enum name="wrap_content" value="-2" />
+        </attr>
+        <attr name="labelTextHeight" format="dimension">
+            <enum name="fill_parent" value="-1" />
+            <enum name="match_parent" value="-1" />
+            <enum name="wrap_content" value="-2" />
+        </attr>
+        <attr name="labelTextPadding" format="dimension" />
+        <attr name="labelTextPaddingLeft" format="dimension" />
+        <attr name="labelTextPaddingTop" format="dimension" />
+        <attr name="labelTextPaddingRight" format="dimension" />
+        <attr name="labelTextPaddingBottom" format="dimension" />
+        <attr name="lineMargin" format="dimension" />
+        <attr name="wordMargin" format="dimension" />
+        <attr name="labelBackground" format="reference|color" />
+        <attr name="selectlabelBackground" format="reference|color" />
+        <attr name="singleLine" format="boolean" />
+    </declare-styleable>
 </resources>

app/src/main/res/values/colors.xml

@@ -32,7 +32,7 @@
     <color name="noticeCuttingLine">#cccccc</color>
     <color name="newsTimeBackground">#d8d8d8</color>
     <color name="frame_stroke_color">#d5d5d5</color>
-    <color name="transColor">#99FFFFFF</color>
+    <color name="transColor">#00000000</color>
     <color name="nofocus">#666666</color>
     <color name="level2">#9AD836</color>
     <color name="level1">#7FC72D</color>

app/src/main/res/values/ids.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="statusbarutil_fake_status_bar_view" type="id"/>
+    <item name="statusbarutil_translucent_view" type="id"/>
+
+    <item name="tag_key_data" type="id"/>
+    <item name="tag_key_position" type="id"/>
+</resources>

app/src/main/res/values/styles.xml

@@ -71,4 +71,29 @@
         <item name="android:windowTranslucentStatus">true</item>
     </style>
 
+    <style name="progressBar_voice" parent="@android:style/Widget.ProgressBar.Horizontal">
+        <!-- 最大高度50dp，最小高度10dp，进度值确定，Drawable样式文件引用 -->
+        <item name="android:progress">0</item>
+        <item name="android:indeterminateOnly">false</item>
+        <item name="android:indeterminateDrawable">
+            @android:drawable/progress_indeterminate_horizontal
+        </item>
+        <item name="android:progressDrawable">@drawable/progressbar_voice</item>
+    </style>
+
+    <style name="activity_dialog" parent="Theme.AppCompat.Dialog">
+        <item name="android:windowIsFloating">true</item>
+        <!--        <item name="android:windowFrame">@null</item>-->
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:fullBright">@android:color/transparent</item>
+        <item name="android:fullDark">@android:color/transparent</item>
+        <item name="android:topBright">@android:color/transparent</item>
+        <item name="android:topDark">@android:color/transparent</item>
+        <item name="android:borderlessButtonStyle">@android:color/transparent</item>
+
+    </style>
+
 </resources>

uikit/src/main/java/com/fengliyan/uikit/photopicker/MultiImageSelectorActivity.java

@@ -57,7 +57,7 @@ public class MultiImageSelectorActivity extends AppCompatActivity
         setContentView(R.layout.mis_activity_default);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            getWindow().setStatusBarColor(Color.BLACK);
+            getWindow().setStatusBarColor(Color.WHITE);
         }
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         if(toolbar != null){