测试

app/build.gradle

@@ -379,7 +379,7 @@ android {
         implementation 'com.flyco.roundview:FlycoRoundView_Lib:1.1.4@aar'
         implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.6'
         implementation 'com.github.eralpyucel:CircleProgressView:v1.1'
-        //implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.1.0'
+//        implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.1.0'
         implementation 'com.shuyu:GSYVideoPlayer:8.1.0'
 
         implementation 'com.googlecode.mp4parser:isoparser:1.1.21'
@@ -401,7 +401,9 @@ android {
         implementation 'com.github.Dimezis:BlurView:version-3.1.0'
 
         implementation "com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-x"
-        implementation "com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.6" //3.0.2更换了很多API
+//        implementation "com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.6" //3.0.2更换了很多API
+
+//        implementation 'io.github.carguo:gsyvideoplayer:12.1.0'
     }
 }
 

app/src/main/AndroidManifest.xml

@@ -174,6 +174,18 @@
         <activity
             android:name=".view.base.BaseActivity"
             android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".view.settings.PersonalJobActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".view.settings.PersonalSchoolActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".view.settings.PhotoListTwoActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".view.register.RegisterActivity"
             android:screenOrientation="portrait" />
@@ -260,15 +272,24 @@
         <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" />
         <activity
             android:name=".view.dynamics.activity.DynamicPostActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".view.dynamics.activity.DynamicPublishActivity"
+            android:screenOrientation="portrait" />
         <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" />
@@ -413,6 +434,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"
@@ -908,6 +933,9 @@
         <activity
             android:name=".view.dynamics.activity.PageVideoPlayActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".view.dynamics.activity.PageVideoPlay2Activity"
+            android:screenOrientation="portrait" />
         <activity android:name=".view.settings.GoddessPrivilegeActivity" />
         <activity android:name=".view.settings.CancellationActivity" />
         <activity android:name=".view.settings.BindBankActivity" />

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

@@ -20,7 +20,7 @@ public class ConstUrl {
             "http://pre-api.jindashengkj.cn/";
     //public static final String WEBSOCKTURL = "saws://192.168.32.106:11119/acc1";
     public static final String WEBSOCKTURL = "ws://red.nndongqing.cn/acc1";
-    public static final String SOCKET_USERSTATIS_DEBUG = "wss://pre.ws.ncaicai.tech?user_id=";
+    public static final String SOCKET_USERSTATIS_DEBUG = "wss://pre.ws.whnuanbeinikj.cn?user_id=";
     public static final String SOCKET_USERSTATIS = "wss://ws.whnuanbeinikj.cn?user_id=";
     public static final String SOCKET_SPEED_DATE = DEBUG ? (DEBUG1 ? "wss://pre.ws.whnuanbeinikj.cn/speed?token=" : "wss://ws.whnuanbeinikj.cn/speed?token=") :
             "wss://ws.whnuanbeinikj.cn/speed?token=";
@@ -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/dynamics/adapter/DynamicsAdapter1.java

@@ -233,7 +233,7 @@ public class DynamicsAdapter1 extends BaseAdapter {
         //TODO  显示浏览次数
         holder.tv_see_count.setText("已有"+bean.getLike_count()+"次浏览");
 
-
+        holder.tv_dynamic_level.setText("LV." + bean.getLevel());
 
         holder.info.setText(bean.getContent(), bean.getExpand(), new ExpandLayout.OnExpandListener() {
             @Override
@@ -549,6 +549,7 @@ public class DynamicsAdapter1 extends BaseAdapter {
         holder.realPeopleImageView = v.findViewById(R.id.realPeopleImageView);
         holder.newPeopleImageView = v.findViewById(R.id.newPeopleImageView);
         holder.rl_dynamic_item = v.findViewById(R.id.rl_dynamic_item);
+        holder.tv_dynamic_level = v.findViewById(R.id.tv_dynamic_level);
 
         return holder;
     }
@@ -579,6 +580,7 @@ public class DynamicsAdapter1 extends BaseAdapter {
         ImageView realPeopleImageView;
         ImageView newPeopleImageView;
         RelativeLayout rl_dynamic_item;
+        TextView tv_dynamic_level;
 
     }
 

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/MainLookMeAdapter.java

@@ -49,6 +49,9 @@ public class MainLookMeAdapter extends BaseQuickAdapter<SocialBean, BaseViewHold
         TextView tv_visit_number = baseViewHolder.getView(R.id.tv_visit_number);
         TextView tv_chat = baseViewHolder.getView(R.id.tv_chat);
         RelativeLayout rl_item = baseViewHolder.getView(R.id.rl_item);
+        RelativeLayout rl_level = baseViewHolder.getView(R.id.rl_level);
+        ImageView iv_level = baseViewHolder.getView(R.id.iv_level);
+        TextView tv_level = baseViewHolder.getView(R.id.tv_level);
 
         if (mType == 0) {
             ll_visit_time.setVisibility(View.VISIBLE);
@@ -78,16 +81,67 @@ public class MainLookMeAdapter extends BaseQuickAdapter<SocialBean, BaseViewHold
 //            redPoint.setVisibility(View.VISIBLE);
 //        }
 
-        if (0 == bean.getVip()) {
+//        if (0 == bean.getVip()) {
+//            ivMemberSign.setVisibility(View.VISIBLE);
+//            ivMemberSign.setImageResource(R.drawable.ic_pvip);
+//        } else if (1 == bean.getVip()) {
+//            ivMemberSign.setVisibility(View.VISIBLE);
+//            ivMemberSign.setImageResource(R.drawable.ic_gvip);
+//        } else {
+//            ivMemberSign.setVisibility(View.GONE);
+//        }
+
+        if (bean.getVip() == 0 || bean.getVip() == 1) {
             ivMemberSign.setVisibility(View.VISIBLE);
-            ivMemberSign.setImageResource(R.drawable.ic_pvip);
+        }else {
-        } else if (1 == bean.getVip()) {
-            ivMemberSign.setVisibility(View.VISIBLE);
-            ivMemberSign.setImageResource(R.drawable.ic_gvip);
-        } else {
             ivMemberSign.setVisibility(View.GONE);
         }
 
+        int level = bean.getLevel();
+        tv_level.setText(level + "");
+        if (bean.getGender() == 1) {
+            if (level > 0 && level <= 15) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg1);
+                iv_level.setImageResource(R.mipmap.ic_modle_1);
+            } else if (level > 15 && level <= 30) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg2);
+                iv_level.setImageResource(R.mipmap.ic_modle_2);
+            } else if (level > 30 && level <= 45) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg3);
+                iv_level.setImageResource(R.mipmap.ic_modle_3);
+            } else if (level > 45 && level <= 60) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg4);
+                iv_level.setImageResource(R.mipmap.ic_modle_4);
+            } else if (level > 60 && level <= 75) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg5);
+                iv_level.setImageResource(R.mipmap.ic_modle_5);
+            } else {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg6);
+                iv_level.setImageResource(R.mipmap.ic_modle_6);
+            }
+        }else {
+            if (level > 0 && level <= 15) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg1);
+                iv_level.setImageResource(R.mipmap.ic_use_1);
+            } else if (level > 15 && level <= 30) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg2);
+                iv_level.setImageResource(R.mipmap.ic_use_2);
+            } else if (level > 30 && level <= 45) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg3);
+                iv_level.setImageResource(R.mipmap.ic_use_3);
+            } else if (level > 45 && level <= 60) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg4);
+                iv_level.setImageResource(R.mipmap.ic_use_4);
+            } else if (level > 60 && level <= 75) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg5);
+                iv_level.setImageResource(R.mipmap.ic_use_5);
+            } else {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg6);
+                iv_level.setImageResource(R.mipmap.ic_use_6);
+            }
+        }
+
+
         if (TextUtils.isEmpty(bean.getSignature())) {
             tv_sign.setVisibility(View.INVISIBLE);
         }else {

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

@@ -0,0 +1,144 @@
+package com.xuebiping.bolizhuzi.controller.main.adapter;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+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);
+        RelativeLayout rl_level = baseViewHolder.getView(R.id.rl_level);
+        ImageView iv_level = baseViewHolder.getView(R.id.iv_level);
+        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());
+
+        int level = bean.getLevel();
+        tv_level.setText(level + "");
+        if (bean.getGender() == 1) {
+            if (level > 0 && level <= 15) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg1);
+                iv_level.setImageResource(R.mipmap.ic_modle_1);
+            } else if (level > 15 && level <= 30) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg2);
+                iv_level.setImageResource(R.mipmap.ic_modle_2);
+            } else if (level > 30 && level <= 45) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg3);
+                iv_level.setImageResource(R.mipmap.ic_modle_3);
+            } else if (level > 45 && level <= 60) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg4);
+                iv_level.setImageResource(R.mipmap.ic_modle_4);
+            } else if (level > 60 && level <= 75) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg5);
+                iv_level.setImageResource(R.mipmap.ic_modle_5);
+            } else {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg6);
+                iv_level.setImageResource(R.mipmap.ic_modle_6);
+            }
+        }else {
+            if (level > 0 && level <= 15) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg1);
+                iv_level.setImageResource(R.mipmap.ic_use_1);
+            } else if (level > 15 && level <= 30) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg2);
+                iv_level.setImageResource(R.mipmap.ic_use_2);
+            } else if (level > 30 && level <= 45) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg3);
+                iv_level.setImageResource(R.mipmap.ic_use_3);
+            } else if (level > 45 && level <= 60) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg4);
+                iv_level.setImageResource(R.mipmap.ic_use_4);
+            } else if (level > 60 && level <= 75) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg5);
+                iv_level.setImageResource(R.mipmap.ic_use_5);
+            } else {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg6);
+                iv_level.setImageResource(R.mipmap.ic_use_6);
+            }
+        }
+
+        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,12 +1,12 @@
 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;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.cardview.widget.CardView;
@@ -16,12 +16,9 @@ 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.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.utils.UiUtils;
+import com.xuebiping.bolizhuzi.view.main.MainPageActivity;
-
-import net.lucode.hackware.magicindicator.buildins.UIUtil;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -200,7 +197,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 +209,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/adapter/SearchAdapter.java

@@ -1,6 +1,7 @@
 package com.xuebiping.bolizhuzi.controller.main.adapter;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
@@ -53,19 +54,23 @@ public class SearchAdapter extends BaseAdapter {
             holder = (Holder) view.getTag();
         }
 
-        if (0 == bean.getVip()) {
+//        if (0 == bean.getVip()) {
-            holder.ivMemberSign.setVisibility(View.VISIBLE);
+//            holder.ivMemberSign.setVisibility(View.VISIBLE);
-            holder.ivMemberSign.setImageResource(R.drawable.ic_pvip);
+//            holder.ivMemberSign.setImageResource(R.drawable.ic_pvip);
-        } else if (1 == bean.getVip()) {
+//        } else if (1 == bean.getVip()) {
-            holder.ivMemberSign.setVisibility(View.VISIBLE);
+//            holder.ivMemberSign.setVisibility(View.VISIBLE);
-            holder.ivMemberSign.setImageResource(R.drawable.ic_gvip);
+//            holder.ivMemberSign.setImageResource(R.drawable.ic_gvip);
-        } else {
+//        } else {
-            holder.ivMemberSign.setVisibility(View.GONE);
+//            holder.ivMemberSign.setVisibility(View.GONE);
-        }
+//        }
 
         holder.mPhoto.setImageURI(StrU.getResourcePath(bean.getAvatar(), mContext));
         holder.mName.setText(bean.getNickname());
-        holder.mInfo.setText(bean.getCity() + " | " + bean.getAge() + "岁");
+//        holder.mInfo.setText(bean.getCity() + " | " + bean.getAge() + "岁");
+        if (!TextUtils.isEmpty(bean.getSignature())) {
+            holder.mInfo.setText(bean.getSignature());
+        }
+
         holder.mTime.setText(bean.getDateline());
         view.setTag(holder);
         return view;

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,
@@ -1034,7 +1081,7 @@ public class MainManager {
             }
         };
 
-        task.start();
+        task.start(false);
     }
 
     public static void evaluateVideo(BaseActivity activity,
@@ -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/controller/register/manager/RegisterManager.java

@@ -194,6 +194,8 @@ public class RegisterManager {
                 builder.addParam("cityId", (String) map.get("city"));
                 builder.addParam("birthday", (String) map.get("birthday"));
                 builder.addParam("job", (String) map.get("job"));
+                builder.addParam("height", (String) map.get("height"));
+                builder.addParam("school", (String) map.get("school"));
                 builder.addParam("del_video", (String) map.get("del_video"));
                 if (null != map.get("inviteId") && !"".equals(map.get("inviteId"))) {
                     builder.addParam("invite_code", (String) map.get("inviteId"));

app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/adapter/ContactListAdapter.java

@@ -79,13 +79,19 @@ public class ContactListAdapter extends BaseQuickAdapter<SocialBean, BaseViewHol
 //            redPoint.setVisibility(View.VISIBLE);
 //        }
 
-        if (0 == bean.getVip()) {
+//        if (0 == bean.getVip()) {
+//            ivMemberSign.setVisibility(View.VISIBLE);
+//            ivMemberSign.setImageResource(R.drawable.ic_pvip);
+//        } else if (1 == bean.getVip()) {
+//            ivMemberSign.setVisibility(View.VISIBLE);
+//            ivMemberSign.setImageResource(R.drawable.ic_gvip);
+//        } else {
+//            ivMemberSign.setVisibility(View.GONE);
+//        }
+
+        if (bean.getVip() == 0 || bean.getVip() == 1) {
             ivMemberSign.setVisibility(View.VISIBLE);
-            ivMemberSign.setImageResource(R.drawable.ic_pvip);
+        }else {
-        } else if (1 == bean.getVip()) {
-            ivMemberSign.setVisibility(View.VISIBLE);
-            ivMemberSign.setImageResource(R.drawable.ic_gvip);
-        } else {
             ivMemberSign.setVisibility(View.GONE);
         }
 

app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/adapter/IntimacyAdapter.java

@@ -3,6 +3,8 @@ package com.xuebiping.bolizhuzi.controller.settings.adapter;
 import android.content.Context;
 import android.content.Intent;
 import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -31,11 +33,70 @@ public class IntimacyAdapter extends BaseQuickAdapter<IntimacyBean, BaseViewHold
         SimpleDraweeView user_head = baseViewHolder.getView(R.id.user_head);
         TextView tv_nick_name = baseViewHolder.getView(R.id.tv_nick_name);
         TextView tv_intimacy = baseViewHolder.getView(R.id.tv_intimacy);
+        RelativeLayout rl_level = baseViewHolder.getView(R.id.rl_level);
+        ImageView iv_level = baseViewHolder.getView(R.id.iv_level);
+        TextView tv_level = baseViewHolder.getView(R.id.tv_level);
+        LinearLayout ll_unlock = baseViewHolder.getView(R.id.ll_unlock);
+        TextView tv_unlock_desc = baseViewHolder.getView(R.id.tv_unlock_desc);
+        TextView tv_lock = baseViewHolder.getView(R.id.tv_lock);
 
         user_head.setImageURI(StrU.getResourcePath(bean.getAvatar(), mContext));
         tv_nick_name.setText(bean.getNickname());
         tv_intimacy.setText(bean.getTotal_consume_coin() + "");
 
+        int unlock_status = bean.getUnlock_status();
+        if (unlock_status == 1) {
+            ll_unlock.setVisibility(View.GONE);
+            tv_lock.setVisibility(View.VISIBLE);
+        }else {
+            ll_unlock.setVisibility(View.VISIBLE);
+            tv_unlock_desc.setText(bean.getUnlock_desc());
+        }
+
+        int level = bean.getLevel();
+        tv_level.setText(level + "");
+        if (bean.getGender() == 1) {
+            if (level > 0 && level <= 15) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg1);
+                iv_level.setImageResource(R.mipmap.ic_modle_1);
+            } else if (level > 15 && level <= 30) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg2);
+                iv_level.setImageResource(R.mipmap.ic_modle_2);
+            } else if (level > 30 && level <= 45) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg3);
+                iv_level.setImageResource(R.mipmap.ic_modle_3);
+            } else if (level > 45 && level <= 60) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg4);
+                iv_level.setImageResource(R.mipmap.ic_modle_4);
+            } else if (level > 60 && level <= 75) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg5);
+                iv_level.setImageResource(R.mipmap.ic_modle_5);
+            } else {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg6);
+                iv_level.setImageResource(R.mipmap.ic_modle_6);
+            }
+        }else {
+            if (level > 0 && level <= 15) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg1);
+                iv_level.setImageResource(R.mipmap.ic_use_1);
+            } else if (level > 15 && level <= 30) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg2);
+                iv_level.setImageResource(R.mipmap.ic_use_2);
+            } else if (level > 30 && level <= 45) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg3);
+                iv_level.setImageResource(R.mipmap.ic_use_3);
+            } else if (level > 45 && level <= 60) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg4);
+                iv_level.setImageResource(R.mipmap.ic_use_4);
+            } else if (level > 60 && level <= 75) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg5);
+                iv_level.setImageResource(R.mipmap.ic_use_5);
+            } else {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg6);
+                iv_level.setImageResource(R.mipmap.ic_use_6);
+            }
+        }
+
         rl_item.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

app/src/main/java/com/xuebiping/bolizhuzi/im/uikit/api/UIKitOptions.java

@@ -92,7 +92,8 @@ public class UIKitOptions {
      * IM 接收到的消息时，内容区域背景的drawable id
      */
 //    public int messageLeftBackground = R.drawable.nim_message_item_left_selector;
-    public int messageLeftBackground = R.drawable.ic_message_alice;
+//    public int messageLeftBackground = R.drawable.ic_message_alice;
+    public int messageLeftBackground = R.drawable.nim_message_item_left;
     public int messageLeftBackgroundVip = R.drawable.ic_message_alice_vip;
     public int messageLeftBackgroundVipMan = R.drawable.ic_message_alice_vip_man;
 
@@ -101,7 +102,8 @@ public class UIKitOptions {
      */
 //    public int messageRightBackground = R.drawable.nim_message_item_right_selector;
 //    public int messageRightBackground = R.drawable.ic_message_me;
-    public int messageRightBackground = R.drawable.ic_huang;
+//    public int messageRightBackground = R.drawable.ic_huang;
+    public int messageRightBackground = R.drawable.nim_message_item_right;
     public int messageRightBackgroundVIP = R.drawable.ic_huang_vip;
     public int messageRightBackgroundVIPMan = R.drawable.ic_huang_vip_man;
 

app/src/main/java/com/xuebiping/bolizhuzi/im/uikit/business/session/fragment/MessageFragment.java

@@ -212,6 +212,7 @@ public class MessageFragment extends TFragment implements ModuleProxy, SelectTyp
 
     private String title;
     private String avatar;
+    private RelativeLayout mRl_title_coin_tip;
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
@@ -265,7 +266,6 @@ public class MessageFragment extends TFragment implements ModuleProxy, SelectTyp
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         rootView = inflater.inflate(R.layout.nim_message_fragment, container, false);
-//        getTipData();
         EventBus.getDefault().register(this);
         rl_message_root = rootView.findViewById(R.id.rl_message_root);
         rl_guard = rootView.findViewById(R.id.rl_guard);
@@ -296,6 +296,7 @@ public class MessageFragment extends TFragment implements ModuleProxy, SelectTyp
         iv_album3 = rootView.findViewById(R.id.iv_album3);
         iv_album4 = rootView.findViewById(R.id.iv_album4);
         rv_call_list = rootView.findViewById(R.id.rv_call_list);
+        mRl_title_coin_tip = rootView.findViewById(R.id.rl_title_coin_tip);
 
         LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity(), LinearLayoutManager.HORIZONTAL, false);
         rv_call_list.setLayoutManager(layoutManager);
@@ -316,8 +317,8 @@ public class MessageFragment extends TFragment implements ModuleProxy, SelectTyp
         ic_guard_close.setOnClickListener(this);
         mSvgaDialog = new SvgaDialog(getContext());
         iv_back.setOnClickListener(this);
-        tv_user_name.setOnClickListener(this);
+//        tv_user_name.setOnClickListener(this);
-        iv_interactive.setOnClickListener(this);
+//        iv_interactive.setOnClickListener(this);
         iv_user_info.setOnClickListener(this);
         cl_info_card.setOnClickListener(this);
         tv_msg_like.setOnClickListener(this);
@@ -397,6 +398,7 @@ public class MessageFragment extends TFragment implements ModuleProxy, SelectTyp
                 NewsManager.getChatTip((BaseActivity) getActivity(), new HttpUiCallBack<ChatTipBean>() {
                     @Override
                     public void onSuccess(BaseActivity activity, ChatTipBean result, String message) {
+
                         if (null != result) {
                             if (!TextUtils.isEmpty(result.getTip())) {
                                 warmAnimator(result.getTip());
@@ -427,48 +429,49 @@ public class MessageFragment extends TFragment implements ModuleProxy, SelectTyp
     private ObjectAnimator fadeOut;
 
     private void showUserInfoCard(boolean show, int i) {
-        if (show) {
-            if (fadeOut != null) {
-                fadeOut.cancel();
-            }
-            iv_interactive.setImageResource(R.drawable.icon_arrow_down);
-            isInteractiveShow = true;
-            ObjectAnimator.ofFloat(cl_info_card, "translationY", 0F, -537F).setDuration(0).start();
-            cl_info_card.setVisibility(View.VISIBLE);
-            ObjectAnimator fadeIn = ObjectAnimator.ofFloat(cl_info_card, "translationY", -537F, 0);
-            fadeIn.setDuration(1000).start();
-            ObjectAnimator alphaIn = ObjectAnimator.ofFloat(cl_info_card, View.ALPHA, 1f);
-            alphaIn.setDuration(1000); // 设置动画持续时间为1000毫秒
-            alphaIn.start(); // 启动动画
-        } else {
-            iv_interactive.setImageResource(R.drawable.icon_arrow_up);
         isInteractiveShow = false;
-            ObjectAnimator.ofFloat(cl_info_card, "translationY", 0F, -537F).setDuration(1000).start();
+//        if (show) {
-            fadeOut = ObjectAnimator.ofFloat(cl_info_card, View.ALPHA, 0f);
+//            if (fadeOut != null) {
-            fadeOut.setDuration(500); // 设置动画持续时间为1000毫秒
+//                fadeOut.cancel();
-            fadeOut.addListener(new Animator.AnimatorListener() {
+//            }
-                @Override
+//            iv_interactive.setImageResource(R.drawable.icon_arrow_down);
-                public void onAnimationStart(Animator animation) {
+//            isInteractiveShow = true;
-
+//            ObjectAnimator.ofFloat(cl_info_card, "translationY", 0F, -537F).setDuration(0).start();
-                }
+//            cl_info_card.setVisibility(View.VISIBLE);
-
+//            ObjectAnimator fadeIn = ObjectAnimator.ofFloat(cl_info_card, "translationY", -537F, 0);
-                @Override
+//            fadeIn.setDuration(1000).start();
-                public void onAnimationEnd(Animator animation) {
+//            ObjectAnimator alphaIn = ObjectAnimator.ofFloat(cl_info_card, View.ALPHA, 1f);
-                    cl_info_card.setVisibility(View.GONE);
+//            alphaIn.setDuration(1000); // 设置动画持续时间为1000毫秒
-                }
+//            alphaIn.start(); // 启动动画
-
+//        } else {
-                @Override
+//            iv_interactive.setImageResource(R.drawable.icon_arrow_up);
-                public void onAnimationCancel(Animator animation) {
+//            isInteractiveShow = false;
-
+//            ObjectAnimator.ofFloat(cl_info_card, "translationY", 0F, -537F).setDuration(1000).start();
-                }
+//            fadeOut = ObjectAnimator.ofFloat(cl_info_card, View.ALPHA, 0f);
-
+//            fadeOut.setDuration(500); // 设置动画持续时间为1000毫秒
-                @Override
+//            fadeOut.addListener(new Animator.AnimatorListener() {
-                public void onAnimationRepeat(Animator animation) {
+//                @Override
-
+//                public void onAnimationStart(Animator animation) {
-                }
+//
-            });
+//                }
-            fadeOut.start(); // 启动动画
+//
-        }
+//                @Override
+//                public void onAnimationEnd(Animator animation) {
+//                    cl_info_card.setVisibility(View.GONE);
+//                }
+//
+//                @Override
+//                public void onAnimationCancel(Animator animation) {
+//
+//                }
+//
+//                @Override
+//                public void onAnimationRepeat(Animator animation) {
+//
+//                }
+//            });
+//            fadeOut.start(); // 启动动画
+//        }
     }
 
     /**
@@ -492,6 +495,28 @@ public class MessageFragment extends TFragment implements ModuleProxy, SelectTyp
                 ObjectAnimator fadeOut = ObjectAnimator.ofFloat(mRlTextWarm, View.ALPHA, 0f);
                 fadeOut.setDuration(2000); // 设置动画持续时间为500毫秒
                 fadeOut.start(); // 启动动画
+
+                fadeOut.addListener(new Animator.AnimatorListener() {
+                    @Override
+                    public void onAnimationStart(Animator animator) {
+
+                    }
+
+                    @Override
+                    public void onAnimationEnd(Animator animator) {
+                        mRlTextWarm.setVisibility(View.GONE);
+                    }
+
+                    @Override
+                    public void onAnimationCancel(Animator animator) {
+
+                    }
+
+                    @Override
+                    public void onAnimationRepeat(Animator animator) {
+
+                    }
+                });
             }
         }, 4000);
     }
@@ -593,22 +618,22 @@ public class MessageFragment extends TFragment implements ModuleProxy, SelectTyp
                 tv_user_name.setTextColor(ContextCompat.getColor(getContext(), R.color.one_text));
                 iv_interactive.setVisibility(View.GONE);
                 iv_user_info.setVisibility(View.INVISIBLE);
-                iv_back.setImageResource(R.drawable.sand_icon_back);
+//                iv_back.setImageResource(R.drawable.sand_icon_back);
-                if ("11".equals(sessionId)) {
+//                if ("11".equals(sessionId)) {
-                    rl_message_root.setBackgroundResource(R.color.white);
+//                    rl_message_root.setBackgroundResource(R.color.white);
-                    if (SPUtils.getInt(getContext(), ConsUser.DYNAMICS_TYPE) == 0) {
+//                    if (SPUtils.getInt(getContext(), ConsUser.DYNAMICS_TYPE) == 0) {
-                        lin_msg_dynamic.setVisibility(View.VISIBLE);
+//                        lin_msg_dynamic.setVisibility(View.VISIBLE);
-                    } else {
+//                    } else {
-                        if (SPUtils.getInt(getContext(), ConsUser.DYNAMICS_TYPE) == 24) {
+//                        if (SPUtils.getInt(getContext(), ConsUser.DYNAMICS_TYPE) == 24) {
-                            tv_user_name.setText("新增点赞");
+//                            tv_user_name.setText("新增点赞");
-                        } else if (SPUtils.getInt(getContext(), ConsUser.DYNAMICS_TYPE) == 26) {
+//                        } else if (SPUtils.getInt(getContext(), ConsUser.DYNAMICS_TYPE) == 26) {
-                            tv_user_name.setText("新增评论");
+//                            tv_user_name.setText("新增评论");
-                        } else if (SPUtils.getInt(getContext(), ConsUser.DYNAMICS_TYPE) == 16) {
+//                        } else if (SPUtils.getInt(getContext(), ConsUser.DYNAMICS_TYPE) == 16) {
-                            tv_user_name.setText("新增关注");
+//                            tv_user_name.setText("新增关注");
-                        }
+//                        }
-                        lin_msg_dynamic.setVisibility(View.GONE);
+//                        lin_msg_dynamic.setVisibility(View.GONE);
-                    }
+//                    }
-                }
+//                }
             } else if ("4".equals(sessionId)) {  //如果是客服，不显示礼物和视频按钮
                 isShowGiftAndVideo = true;
                 getMainPageData(Integer.parseInt(sessionId));
@@ -617,8 +642,24 @@ public class MessageFragment extends TFragment implements ModuleProxy, SelectTyp
             } else {
                 getMainPageData(Integer.parseInt(sessionId));
             }
+
+            if (!"2".equals(sessionId) && !"4".equals(sessionId) && !"11".equals(sessionId) && !"3".equals(sessionId) && !"5".equals(sessionId)
+                    && !"6".equals(sessionId) && !"7".equals(sessionId) && !"8".equals(sessionId) && !"9".equals(sessionId) && !"10".equals(sessionId)) {
+
+                if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 1) {
+                    if (SPUtils.getInt(getActivity(), ConsUser.IS_ANCHOR) == 1) {
+                        mRl_title_coin_tip.setVisibility(View.GONE);
+                    }else {
+                        mRl_title_coin_tip.setVisibility(View.VISIBLE);
                     }
-//        getTipData(); //展示提示信息
+                }else {
+                    mRl_title_coin_tip.setVisibility(View.VISIBLE);
+                }
+            }else {
+                mRl_title_coin_tip.setVisibility(View.GONE);
+            }
+        }
+        getTipData(); //展示提示信息
 
         if (inputPanel == null) {
             inputPanel = new InputPanel(container, rootView, getActionList(), isShowEditBar, isShowGiftAndVideo, getActivity());
@@ -1080,95 +1121,95 @@ public class MessageFragment extends TFragment implements ModuleProxy, SelectTyp
      * @param message
      */
     private void imCost(final int type, String id, final String content, final IMMessage message, String is_greet) {
-        if (isInteractiveShow) {
+//        if (isInteractiveShow) {
-            showUserInfoCard(false, 2);
+//            showUserInfoCard(false, 2);
-        }
+//        }
         NewsManager.sendIMCost((BaseActivity) getActivity(), type,
                 id, content, is_greet, new HttpUiCallBack<IMCostBean>() {
                     @Override
                     public void onSuccess(BaseActivity activity, IMCostBean result, String tips) {
 
-                        final AlertDialog builder = new AlertDialog.Builder(getActivity()).create();
+//                        final AlertDialog builder = new AlertDialog.Builder(getActivity()).create();
-
+//
-                        builder.setCancelable(false);
+//                        builder.setCancelable(false);
-
+//
-                        if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 2) {   //男生
+//                        if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 2) {   //男生
-                            builder.setMessage("一条私信扣" + result.getCut_coin() + "金币,成为会员享免费特权！");
+//                            builder.setMessage("一条私信扣" + result.getCut_coin() + "金币,成为会员享免费特权！");
-
+//
-                            builder.setButton(DialogInterface.BUTTON_NEUTRAL, "不再提醒", new DialogInterface.OnClickListener() {
+//                            builder.setButton(DialogInterface.BUTTON_NEUTRAL, "不再提醒", new DialogInterface.OnClickListener() {
-                                @Override
+//                                @Override
-                                public void onClick(DialogInterface dialogInterface, int i) {
+//                                public void onClick(DialogInterface dialogInterface, int i) {
-                                    builder.dismiss();
+//                                    builder.dismiss();
-                                    StorageManager.getInstance(getActivity())
+//                                    StorageManager.getInstance(getActivity())
-                                            .putInt("isDynamicNoticeCanceled", 1);
+//                                            .putInt("isDynamicNoticeCanceled", 1);
-                                }
+//                                }
-                            });
+//                            });
-
+//
-                            builder.setButton(DialogInterface.BUTTON_POSITIVE, "成为VIP", new DialogInterface.OnClickListener() {
+//                            builder.setButton(DialogInterface.BUTTON_POSITIVE, "成为VIP", new DialogInterface.OnClickListener() {
-                                @Override
+//                                @Override
-                                public void onClick(DialogInterface dialogInterface, int i) {
+//                                public void onClick(DialogInterface dialogInterface, int i) {
-                                    builder.dismiss();
+//                                    builder.dismiss();
-                                    Intent intent = new Intent(getActivity(), MemberActivity.class);
+//                                    Intent intent = new Intent(getActivity(), MemberActivity.class);
-                                    getActivity().startActivity(intent);
+//                                    getActivity().startActivity(intent);
-                                }
+//                                }
-                            });
+//                            });
-
+//
-                            builder.setButton(DialogInterface.BUTTON_NEGATIVE, "知道了", new DialogInterface.OnClickListener() {
+//                            builder.setButton(DialogInterface.BUTTON_NEGATIVE, "知道了", new DialogInterface.OnClickListener() {
-                                @Override
+//                                @Override
-                                public void onClick(DialogInterface dialogInterface, int i) {
+//                                public void onClick(DialogInterface dialogInterface, int i) {
-                                    builder.dismiss();
+//                                    builder.dismiss();
-                                }
+//                                }
-                            });
+//                            });
-
+//
-                            if (result.getChat_card() != null) {
+//                            if (result.getChat_card() != null) {
-                                if (TextUtils.equals("1", result.getChat_card().getIs_pop_up())) {
+//                                if (TextUtils.equals("1", result.getChat_card().getIs_pop_up())) {
-                                    ChatCardRedPacketDialog dialog = new ChatCardRedPacketDialog(getContext(), result.getChat_card());
+//                                    ChatCardRedPacketDialog dialog = new ChatCardRedPacketDialog(getContext(), result.getChat_card());
-                                    dialog.show();
+//                                    dialog.show();
-                                }
+//                                }
-                            }
+//                            }
-
+//
-                        } else if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 1) {  //女生
+//                        } else if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 1) {  //女生
-                            builder.setMessage("本条消息扣除" + result.getCut_coin()
+//                            builder.setMessage("本条消息扣除" + result.getCut_coin()
-                                    + "金币，还剩" + result.getCoin() + "金币，通过真人认证私信免费哦！");
+//                                    + "金币，还剩" + result.getCoin() + "金币，通过真人认证私信免费哦！");
-
+//
-                            builder.setButton(DialogInterface.BUTTON_NEUTRAL, "不再提醒", new DialogInterface.OnClickListener() {
+//                            builder.setButton(DialogInterface.BUTTON_NEUTRAL, "不再提醒", new DialogInterface.OnClickListener() {
-                                @Override
+//                                @Override
-                                public void onClick(DialogInterface dialogInterface, int i) {
+//                                public void onClick(DialogInterface dialogInterface, int i) {
-                                    builder.dismiss();
+//                                    builder.dismiss();
-                                    StorageManager.getInstance(getActivity())
+//                                    StorageManager.getInstance(getActivity())
-                                            .putInt("isDynamicNoticeCanceled", 1);
+//                                            .putInt("isDynamicNoticeCanceled", 1);
-                                }
+//                                }
-                            });
+//                            });
-
+//
-                            builder.setButton(DialogInterface.BUTTON_POSITIVE, "真人认证", new DialogInterface.OnClickListener() {
+//                            builder.setButton(DialogInterface.BUTTON_POSITIVE, "真人认证", new DialogInterface.OnClickListener() {
-                                @Override
+//                                @Override
-                                public void onClick(DialogInterface dialogInterface, int i) {
+//                                public void onClick(DialogInterface dialogInterface, int i) {
-                                    builder.dismiss();
+//                                    builder.dismiss();
-                                    Intent intentApplyBigCast = new Intent(getActivity(), CertificationActivity.class);
+//                                    Intent intentApplyBigCast = new Intent(getActivity(), CertificationActivity.class);
-                                    getActivity().startActivity(intentApplyBigCast);
+//                                    getActivity().startActivity(intentApplyBigCast);
-                                }
+//                                }
-                            });
+//                            });
-                            builder.setButton(DialogInterface.BUTTON_NEGATIVE, "知道了", new DialogInterface.OnClickListener() {
+//                            builder.setButton(DialogInterface.BUTTON_NEGATIVE, "知道了", new DialogInterface.OnClickListener() {
-                                @Override
+//                                @Override
-                                public void onClick(DialogInterface dialogInterface, int i) {
+//                                public void onClick(DialogInterface dialogInterface, int i) {
-                                    builder.dismiss();
+//                                    builder.dismiss();
-                                }
+//                                }
-                            });
+//                            });
-                        }
+//                        }
-
+//
-                        if (result.getIs_cut() == 1
+//                        if (result.getIs_cut() == 1
-                                && 1 != StorageManager.getInstance(getActivity()).getInt("isDynamicNoticeCanceled") && !SPUtils.getBoolean(getActivity(), ConsUser.USER_VIP, false)) {
+//                                && 1 != StorageManager.getInstance(getActivity()).getInt("isDynamicNoticeCanceled") && !SPUtils.getBoolean(getActivity(), ConsUser.USER_VIP, false)) {
-                            builder.show();
+//                            builder.show();
-
+//
-                            Button buttonNue = builder.getButton(DialogInterface.BUTTON_NEUTRAL);
+//                            Button buttonNue = builder.getButton(DialogInterface.BUTTON_NEUTRAL);
-                            buttonNue.setTextColor(getActivity().getResources().getColor(R.color.black));
+//                            buttonNue.setTextColor(getActivity().getResources().getColor(R.color.black));
-
+//
-                            Button buttonPos = builder.getButton(DialogInterface.BUTTON_POSITIVE);
+//                            Button buttonPos = builder.getButton(DialogInterface.BUTTON_POSITIVE);
-                            buttonPos.setTextColor(getActivity().getResources().getColor(R.color.black));
+//                            buttonPos.setTextColor(getActivity().getResources().getColor(R.color.black));
-
+//
-                            Button buttonNeg = builder.getButton(DialogInterface.BUTTON_NEGATIVE);
+//                            Button buttonNeg = builder.getButton(DialogInterface.BUTTON_NEGATIVE);
-                            buttonNeg.setTextColor(getActivity().getResources().getColor(R.color.black));
+//                            buttonNeg.setTextColor(getActivity().getResources().getColor(R.color.black));
-                        }
+//                        }
 
                         Map<String, Object> data = new HashMap<>();
                         data.put("is_cut", result.getIs_cut());
@@ -1651,7 +1692,8 @@ public class MessageFragment extends TFragment implements ModuleProxy, SelectTyp
         });
     }
 
-    private boolean isInteractiveShow = true;
+//    private boolean isInteractiveShow = true;
+    private boolean isInteractiveShow = false;
 
     /**
      * 获取文字招呼列表

app/src/main/java/com/xuebiping/bolizhuzi/im/uikit/common/Constans.java

@@ -6,7 +6,7 @@ package com.xuebiping.bolizhuzi.im.uikit.common;
 
 public class Constans {
     //    public final static String IMAGE_URL = "http://xqasset.whnuanbeinikj.cn/";
-    public final static String IMAGE_URL = "http://xqasset.whnuanbeinikj.cn/";
+    public final static String IMAGE_URL = "http://oss.jindashengkj.cn/";
     public final static String FIRST_CHARGE_TYPE = "FIRST_CHARGE_TYPE";
     public final static String DEFAULT_PAY_TYPE = "DEFAULT_PAY_TYPE";//默认支付方式 "1":"支付宝","2":"微信"
     public final static String SHOW_CER_DIALOG = "SHOW_CER_DIALOG";//真人认证弹窗

app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/DynamicsItemBean.java

@@ -22,6 +22,15 @@ public class DynamicsItemBean implements Serializable {
     private List<CommentBean> list;
     private List<CommentBean> likes;
     private boolean expand;
+    private int level;
+
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
 
     public int getMark() {
         return mark;

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,70 @@
+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;
+    private int gender;
+
+    public int getGender() {
+        return gender;
+    }
+
+    public void setGender(int gender) {
+        this.gender = gender;
+    }
+
+    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,43 @@ 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;
+    private int level;
+
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
+
+    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 +69,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/SearchBean.java

@@ -10,6 +10,15 @@ public class SearchBean {
     private String city;
     private String dateline;
     private int vip = 2;
+    private String signature;
+
+    public String getSignature() {
+        return signature;
+    }
+
+    public void setSignature(String signature) {
+        this.signature = signature;
+    }
 
     public int getUserid() {
         return userid;

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/model/settings/IntimacyBean.java

@@ -6,6 +6,42 @@ public class IntimacyBean {
     private int total_consume_coin;
     private String nickname;
     private String avatar;
+    private int gender;
+    private int level;
+    private int unlock_status;
+    private String unlock_desc;
+
+    public String getUnlock_desc() {
+        return unlock_desc;
+    }
+
+    public void setUnlock_desc(String unlock_desc) {
+        this.unlock_desc = unlock_desc;
+    }
+
+    public int getUnlock_status() {
+        return unlock_status;
+    }
+
+    public void setUnlock_status(int unlock_status) {
+        this.unlock_status = unlock_status;
+    }
+
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
+
+    public int getGender() {
+        return gender;
+    }
+
+    public void setGender(int gender) {
+        this.gender = gender;
+    }
 
     public int getUser_id() {
         return user_id;

app/src/main/java/com/xuebiping/bolizhuzi/model/settings/InvitationBean.java

@@ -8,6 +8,9 @@ public class InvitationBean {
     private InvitationReward reward;
     private InvitationTotal total;
     private String qrcode;
+    private String max_divide;
+    private String permanent_divide;
+    private String invite_rule;
     private List<RewardDescBean> reward_desc;
     private int show_invite_list;
 
@@ -77,6 +80,30 @@ public class InvitationBean {
         this.show_invite_list = show_invite_list;
     }
 
+    public String getMax_divide() {
+        return max_divide;
+    }
+
+    public void setMax_divide(String max_divide) {
+        this.max_divide = max_divide;
+    }
+
+    public String getPermanent_divide() {
+        return permanent_divide;
+    }
+
+    public void setPermanent_divide(String permanent_divide) {
+        this.permanent_divide = permanent_divide;
+    }
+
+    public String getInvite_rule() {
+        return invite_rule;
+    }
+
+    public void setInvite_rule(String invite_rule) {
+        this.invite_rule = invite_rule;
+    }
+
     public class RewardDescBean {
         private String title;
         private String content;

app/src/main/java/com/xuebiping/bolizhuzi/model/settings/InvitationTotal.java

@@ -2,6 +2,7 @@ package com.xuebiping.bolizhuzi.model.settings;
 
 public class InvitationTotal {
     private int total_reward;
+    private int total_commission_coin;
     private int total_invite;
     private int total_commission;
     private int recharge_count;
@@ -46,4 +47,12 @@ public class InvitationTotal {
     public void setAuth_count(int auth_count) {
         this.auth_count = auth_count;
     }
+
+    public int getTotal_commission_coin() {
+        return total_commission_coin;
+    }
+
+    public void setTotal_commission_coin(int total_commission_coin) {
+        this.total_commission_coin = total_commission_coin;
+    }
 }

app/src/main/java/com/xuebiping/bolizhuzi/model/settings/SocialBean.java

@@ -17,6 +17,15 @@ public class SocialBean {
     private String signature;
     private int online_status; //0 不在线  1在线  2活跃
     private int visit_times;
+    private int level;
+
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
 
     public int getUserid() {
         return userid;

app/src/main/java/com/xuebiping/bolizhuzi/model/settings/UserInfoBean.java

@@ -38,10 +38,55 @@ public class UserInfoBean {
     private int newer_win_status;//新用户弹窗标识：1=新用户、0=旧用户
     private String job;
     private String signature;
+    private String school;
     private UserFrameBean user_frame;
+    private int height;
     private int user_type;
     private int online_status;
     private int do_not_disturb;
+    private int level;
+    private int next_level_diff_wealth_value;
+    private int level_percent;
+
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
+
+    public int getNext_level_diff_wealth_value() {
+        return next_level_diff_wealth_value;
+    }
+
+    public void setNext_level_diff_wealth_value(int next_level_diff_wealth_value) {
+        this.next_level_diff_wealth_value = next_level_diff_wealth_value;
+    }
+
+    public int getLevel_percent() {
+        return level_percent;
+    }
+
+    public void setLevel_percent(int level_percent) {
+        this.level_percent = level_percent;
+    }
+
+    public int getHeight() {
+        return height;
+    }
+
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    public String getSchool() {
+        return school;
+    }
+
+    public void setSchool(String school) {
+        this.school = school;
+    }
 
     public int getDo_not_disturb() {
         return do_not_disturb;

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/dynamics/activity/DynamicPublishActivity.java

@@ -0,0 +1,147 @@
+package com.xuebiping.bolizhuzi.view.dynamics.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
+
+import com.fengliyan.uikit.toast.MaleToast;
+import com.xuebiping.bolizhuzi.R;
+import com.xuebiping.bolizhuzi.controller.main.adapter.MainViewPagerAdapter;
+import com.xuebiping.bolizhuzi.controller.main.adapter.ScaleTransitionPagerTitleView;
+import com.xuebiping.bolizhuzi.view.base.BaseActivity;
+import com.xuebiping.bolizhuzi.view.dynamics.fragment.DynamicImageTextFragment;
+import com.xuebiping.bolizhuzi.view.dynamics.fragment.DynamicVideoTextFragment;
+
+import net.lucode.hackware.magicindicator.MagicIndicator;
+import net.lucode.hackware.magicindicator.ViewPagerHelper;
+import net.lucode.hackware.magicindicator.buildins.UIUtil;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.CommonNavigator;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.titles.SimplePagerTitleView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DynamicPublishActivity extends BaseActivity implements View.OnClickListener {
+
+    private MagicIndicator mMagicIndicator;
+    private ViewPager mMainViewPager;
+
+    private MainViewPagerAdapter mViewPagerAdapter;
+    private List<Fragment> mChannelFragments = new ArrayList<>();
+    private DynamicImageTextFragment mDynamicImageTextFragment;
+    private DynamicVideoTextFragment mDynamicVideoTextFragment;
+    private List<String> mDataList = new ArrayList<>();
+    private int mIndex = 0;
+    private RelativeLayout mLl_back;
+    private TextView mTv_zhunze;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_dynamic_publish);
+        hideTitleBar();
+        initView();
+    }
+
+    private void initView() {
+        mMagicIndicator = findViewById(R.id.magic_indicator);
+        mMainViewPager = findViewById(R.id.main_view_pager);
+        mLl_back = findViewById(R.id.ll_back);
+        mTv_zhunze = findViewById(R.id.tv_zhunze);
+
+        mLl_back.setOnClickListener(this);
+        mTv_zhunze.setOnClickListener(this);
+
+        mDynamicImageTextFragment = new DynamicImageTextFragment();
+        mDynamicVideoTextFragment = new DynamicVideoTextFragment();
+
+        mChannelFragments.add(mDynamicImageTextFragment);
+        mChannelFragments.add(mDynamicVideoTextFragment);
+
+
+        mViewPagerAdapter = new MainViewPagerAdapter(getSupportFragmentManager(),
+                mChannelFragments);
+        mMainViewPager.setAdapter(mViewPagerAdapter);
+
+        initMagicIndicator();
+
+        mViewPagerAdapter.notifyDataSetChanged();
+        mMainViewPager.setCurrentItem(mIndex);
+    }
+
+    private void initMagicIndicator() {
+        mDataList.clear();
+        mDataList.add("图文动态");
+        mDataList.add("视频动态");
+
+        CommonNavigator commonNavigator = new CommonNavigator(this);
+        commonNavigator.setAdapter(new CommonNavigatorAdapter() {
+            @Override
+            public int getCount() {
+                return mDataList == null ? 0 : mDataList.size();
+            }
+
+            @Override
+            public IPagerTitleView getTitleView(Context context, final int index) {
+                SimplePagerTitleView simplePagerTitleView = new ScaleTransitionPagerTitleView(context);
+                simplePagerTitleView.setText(mDataList.get(index));
+                simplePagerTitleView.setTextSize(20);
+                simplePagerTitleView.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));//加粗
+                simplePagerTitleView.setNormalColor(Color.parseColor("#33000000"));
+                simplePagerTitleView.setSelectedColor(Color.parseColor("#000000"));
+                simplePagerTitleView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mMainViewPager.setCurrentItem(index);
+
+                    }
+                });
+                return simplePagerTitleView;
+            }
+
+            @Override
+            public IPagerIndicator getIndicator(Context context) {
+                LinePagerIndicator indicator = new LinePagerIndicator(context);
+                indicator.setColors(getResources().getColor(R.color.yellow_ffd33e));
+                indicator.setLineHeight(UIUtil.dip2px(context, 10));
+                indicator.setMode(LinePagerIndicator.MODE_WRAP_CONTENT);
+                return null;
+            }
+        });
+        mMagicIndicator.setNavigator(commonNavigator);
+        ViewPagerHelper.bind(mMagicIndicator, mMainViewPager);
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (view == mLl_back) {
+            finish();
+        } else if (view == mTv_zhunze) {
+            MaleToast.showMessage(this, "开发中");
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
+        if (null != mDynamicImageTextFragment) {
+            mDynamicImageTextFragment.onActivityResult(requestCode & 0xffff, resultCode, intent);
+        }
+
+        if (null != mDynamicVideoTextFragment) {
+            mDynamicVideoTextFragment.onActivityResult(requestCode & 0xffff, resultCode, intent);
+        }
+    }
+}

app/src/main/java/com/xuebiping/bolizhuzi/view/dynamics/activity/PageVideoPlay2Activity.kt

@@ -0,0 +1,49 @@
+package com.xuebiping.bolizhuzi.view.dynamics.activity
+
+import android.animation.ValueAnimator
+import android.os.Bundle
+import com.shuyu.gsyvideoplayer.utils.GSYVideoType
+import com.xuebiping.bolizhuzi.databinding.ActivityPageVideoPlay2Binding
+import com.xuebiping.bolizhuzi.im.uikit.common.Constans
+import com.xuebiping.bolizhuzi.view.base.BaseActivity
+
+class PageVideoPlay2Activity : BaseActivity() {
+    lateinit var binding: ActivityPageVideoPlay2Binding
+
+    private var videoUrl: String? = ""
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityPageVideoPlay2Binding.inflate(layoutInflater)
+        setContentView(binding.root)
+        hideTitleBar()
+        videoUrl = intent.getStringExtra("videoUrl")
+        binding.ivBack.setOnClickListener {
+            finish()
+        }
+        GSYVideoType.setShowType(GSYVideoType.SCREEN_TYPE_FULL)
+//        GSYVideoType.setShowType(GSYVideoType.SCREEN_TYPE_DEFAULT)
+
+        binding.videoView.setUp(
+            Constans.IMAGE_URL + videoUrl, true, ""
+        )
+        binding.videoView.isLooping = true
+        binding.videoView.startPlayLogic()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        binding.videoView.onVideoPause()
+    }
+
+    override fun onRestart() {
+        super.onRestart()
+        binding.videoView.onVideoResume()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        binding.videoView.setVideoAllCallBack(null)
+        binding.videoView.release()
+    }
+}

app/src/main/java/com/xuebiping/bolizhuzi/view/dynamics/fragment/DynamicImageTextFragment.java

@@ -0,0 +1,554 @@
+package com.xuebiping.bolizhuzi.view.dynamics.fragment;
+
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.media.ThumbnailUtils;
+import android.os.Bundle;
+import android.provider.MediaStore;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.fengliyan.http.httprequest.UploadFile;
+import com.fengliyan.uikit.photopicker.MultiImageSelector;
+import com.fengliyan.uikit.toast.MaleToast;
+import com.xuebiping.bolizhuzi.R;
+import com.xuebiping.bolizhuzi.controller.constant.Constant;
+import com.xuebiping.bolizhuzi.controller.dynamics.manager.DynamicsManager;
+import com.xuebiping.bolizhuzi.im.uikit.business.session.helper.VideoMessageHelper;
+import com.xuebiping.bolizhuzi.model.dynamics.DynamicPostBean;
+import com.xuebiping.bolizhuzi.model.dynamics.ImageUploadBean;
+import com.xuebiping.bolizhuzi.model.dynamics.UploadImageBean;
+import com.xuebiping.bolizhuzi.utils.camera2.BitmapUtils;
+import com.xuebiping.bolizhuzi.view.base.BaseActivity;
+import com.xuebiping.bolizhuzi.view.base.utils.HttpUiCallBack;
+import com.xuebiping.bolizhuzi.view.base.utils.ImageUtils;
+import com.xuebiping.bolizhuzi.view.dynamics.dialog.TopicListDialog;
+import com.xuebiping.bolizhuzi.view.dynamics.utils.ImageLayout;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+import kotlin.jvm.functions.Function2;
+
+public class DynamicImageTextFragment extends Fragment implements View.OnClickListener {
+
+    public static final int MULTI_SELECTOR_REQUEST = 200;
+    public static final int SINGLE_SELECTOR_REQUEST = 201;
+    public static final int MAX_IMAGE_COUNT = 9;
+    private View v;
+    private LinearLayout mPhotoLine1;
+    private LinearLayout mPhotoLine2;
+    private LinearLayout mPhotoLine3;
+    private EditText mEditText;
+    private TextView mComplaintInputText;
+    private int mSingleIndex;
+    private ArrayList<String> mSelectPath = new ArrayList<>();
+    private MultiImageSelector mSelector;
+    private StringBuilder mImages;
+    private ProgressDialog progressDialog;
+    private boolean isVideo = false;
+    private VideoMessageHelper helper;
+    private File videoFile;
+    private TextWatcher mWatcher = new TextWatcher() {
+        @Override
+        public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+        }
+
+        @Override
+        public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+            String length = mEditText.getText().length() + "/300字";
+            mComplaintInputText.setText(length);
+        }
+
+        @Override
+        public void afterTextChanged(Editable editable) {
+
+        }
+    };
+    private RelativeLayout rl_add_topic;
+    private TextView tv_topic_content;
+    private TopicListDialog topicListDialog;
+    private Button mBt_publish;
+
+    @Nullable
+    @org.jetbrains.annotations.Nullable
+    @Override
+    public View onCreateView(@NonNull @NotNull LayoutInflater inflater, @Nullable @org.jetbrains.annotations.Nullable ViewGroup container, @Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
+        v = inflater.inflate(R.layout.fragment_dynamic_image_text, container, false);
+        helper = new VideoMessageHelper(getActivity(), new VideoMessageHelper.VideoMessageHelperListener() {
+            @Override
+            public void onVideoPicked(File file, String md5) {
+                videoFile = file;
+                Bitmap bitmap = ThumbnailUtils.createVideoThumbnail(file.getAbsolutePath(), MediaStore.Video.Thumbnails.FULL_SCREEN_KIND);
+                BitmapUtils.savePicNoRotate(BitmapUtils.toByteArray(bitmap), "video_cover",
+                        new Function2<String, String, Unit>() {
+                            @Override
+                            public Unit invoke(String s, String s2) {
+                                bitmap.recycle();
+                                getActivity().runOnUiThread(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        List<String> paths = new ArrayList<>();
+                                        paths.add(s);
+                                        notifyDataSetChanged(paths);
+                                        mSelectPath.add(s);
+                                    }
+                                });
+                                return null;
+                            }
+                        }, new Function1<String, Unit>() {
+                            @Override
+                            public Unit invoke(String s) {
+                                getActivity().runOnUiThread(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        MaleToast.showMessage(getActivity(), "获取视频缩略图失败");
+
+                                    }
+                                });
+                                return null;
+                            }
+                        });
+            }
+        });
+        initView(v);
+        return v;
+    }
+
+    private void initView(View v) {
+        mPhotoLine1 = v.findViewById(R.id.dynamics_post_line_1);
+        mPhotoLine2 = v.findViewById(R.id.dynamics_post_line_2);
+        mPhotoLine3 = v.findViewById(R.id.dynamics_post_line_3);
+        mEditText = v.findViewById(R.id.edit_post);
+        rl_add_topic = v.findViewById(R.id.rl_add_topic);
+        tv_topic_content = v.findViewById(R.id.tv_topic_content);
+        mComplaintInputText = v.findViewById(R.id.edit_char_count);
+        mBt_publish = v.findViewById(R.id.bt_publish);
+
+        mSelector = MultiImageSelector.create().multi().count(MAX_IMAGE_COUNT);
+        mImages = new StringBuilder();
+        addPhotos(mSelectPath);
+        mEditText.addTextChangedListener(mWatcher);
+
+        rl_add_topic.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                //TODO 添加话题，打开话题弹窗
+                topicListDialog = new TopicListDialog(getActivity());
+                topicListDialog.show();
+                topicListDialog.setRightOnClickListener(new TopicListDialog.OnDialogRightClickListener() {
+                    @Override
+                    public void rightClick(String str) {
+                        tv_topic_content.setText(str);
+                    }
+                });
+            }
+        });
+
+        mBt_publish.setOnClickListener(this);
+    }
+
+    public void notifyDataSetChanged(List<String> imagePath) {
+        removePhotos();
+        addPhotos(imagePath);
+    }
+
+    private void removePhotos() {
+        mPhotoLine1.removeAllViews();
+        mPhotoLine2.removeAllViews();
+        mPhotoLine3.removeAllViews();
+    }
+
+    private void addPhotos(List<String> imagePath) {
+        Iterator<String> i = imagePath.iterator();
+        int count = 0;
+
+        while (i.hasNext()) {
+            String path = i.next();
+            final ImageLayout image = new ImageLayout(getActivity());
+            setImage(path, image);
+            image.setPadding(6, 0, 0, 0);
+            image.setOnImageHandlingListener(new ImageLayout.OnImageHandlingListener() {
+                @Override
+                public void onImageClicked() {
+                    singleReplace(image.getImageUrl());
+                }
+
+                @Override
+                public void onReadyLogoClicked() {
+                    startImageSelector();
+                }
+
+                @Override
+                public void onRemoveLogoClicked() {
+                    removeImage(image.getImageUrl());
+                }
+            });
+
+            if (count < 3) {
+                mPhotoLine1.addView(image);
+            } else if (count < 6) {
+                mPhotoLine2.addView(image);
+            } else if (count < 9) {
+                mPhotoLine3.addView(image);
+            }
+
+            count++;
+        }
+
+        if (isVideo) {
+            if (imagePath.size() == 0) {
+                addTail(count);
+            }
+        } else {
+            addTail(count);
+        }
+
+    }
+
+    void addTail(int count) {
+        if (count != 9) {
+            ImageLayout image = new ImageLayout(getActivity());
+            image.setPadding(6, 0, 0, 0);
+            image.setOnImageHandlingListener(new ImageLayout.OnImageHandlingListener() {
+                @Override
+                public void onImageClicked() {
+
+                }
+
+                @Override
+                public void onReadyLogoClicked() {
+                    startImageSelector();
+                }
+
+                @Override
+                public void onRemoveLogoClicked() {
+
+                }
+            });
+
+//            if (count == 0) {
+//                image.empty();
+//            }
+
+            if (count < 3) {
+                mPhotoLine1.addView(image);
+            } else if (count < 6) {
+                mPhotoLine2.addView(image);
+            } else if (count < 9) {
+                mPhotoLine3.addView(image);
+            }
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (isVideo) {
+            helper.onGetLocalVideoResult(data);
+        }
+        if (requestCode == MULTI_SELECTOR_REQUEST && resultCode == getActivity().RESULT_OK) {
+            mSelectPath.addAll(data.getStringArrayListExtra(MultiImageSelector.EXTRA_RESULT));
+            notifyDataSetChanged(mSelectPath);
+        } else if (requestCode == SINGLE_SELECTOR_REQUEST && resultCode == getActivity().RESULT_OK) {
+            mSelectPath.remove(mSingleIndex);
+            mSelectPath.add(mSingleIndex, data.
+                    getStringArrayListExtra(MultiImageSelector.EXTRA_RESULT).get(0));
+
+            notifyDataSetChanged(mSelectPath);
+        }
+    }
+
+    public void removeImage(String path) {
+        path = path.replace("file:", "");
+        mSelectPath.remove(path);
+        notifyDataSetChanged(mSelectPath);
+    }
+
+    public void startImageSelector() {
+        if (isVideo) {
+            helper.chooseVideoFromLocal();
+            return;
+        }
+        mSelector.multi();
+        mSelector.count(9 - mSelectPath.size());
+        mSelector.start(this, MULTI_SELECTOR_REQUEST);
+    }
+
+    public void singleReplace(String path) {
+        if (isVideo) {
+            helper.chooseVideoFromLocal();
+            return;
+        }
+        path = path.replace("file:", "");
+        mSingleIndex = mSelectPath.indexOf(path);
+        mSelector.single();
+        mSelector.start(this, SINGLE_SELECTOR_REQUEST);
+    }
+
+    private void setImage(String path, ImageLayout image) {
+        if (path != null) {
+            File file = new File(path);
+            if (null != file) {
+                URI uri = file.toURI();
+                image.imageLoad(uri.toString());
+            }
+        }
+    }
+
+    private void compressAndUpload() {
+        Iterator<String> i = mSelectPath.iterator();
+        final UploadFile[] uploadFiles = new UploadFile[mSelectPath.size()];
+        int count = 0;
+        while (i.hasNext()) {
+            String path = i.next();
+            path = ImageUtils.compressImage(getActivity(), path, Constant.IMAGE_MEMORY_SIZE, false);
+            File file = new File(path);
+            UploadFile uploadFile = new UploadFile("file[" + count + "]", file);
+            uploadFiles[count] = uploadFile;
+            count++;
+        }
+
+        if (null != uploadFiles) {
+            if (uploadFiles.length != 0) {
+                if (uploadFiles[0].getFile().exists()) {
+                    getActivity().runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            uploadImage(uploadFiles, mEditText.getText().toString());
+                        }
+                    });
+                }
+            }
+        } else {
+            progressDialog.dismiss();
+            mBt_publish.setEnabled(true);
+        }
+
+    }
+
+    void uploadVideo(String content, String coverUrl) {
+        UploadFile uploadFile = new UploadFile(System.currentTimeMillis() + ".mp4", videoFile);
+        UploadFile[] files = new UploadFile[]{uploadFile};
+        DynamicsManager.uploadImage((BaseActivity) getActivity(), files, "dynamic",
+                new HttpUiCallBack<List<UploadImageBean>>() {
+                    @Override
+                    public void onSuccess(BaseActivity activity, List<UploadImageBean> result, String message) {
+                        if (result.size() > 0) {
+                            String videoUrl = result.get(0).getUrl();
+                            postDynamics(content, coverUrl, videoUrl);
+                        }
+
+                    }
+
+                    @Override
+                    public void onFailure(BaseActivity activity, String tip) {
+                        progressDialog.dismiss();
+                        MaleToast.showMessage(activity, tip);
+                        mBt_publish.setEnabled(true);
+                    }
+
+                    @Override
+                    public void onException(BaseActivity activity, Throwable e) {
+                        progressDialog.dismiss();
+                        MaleToast.showMessage(activity, "视频上传失败");
+                        mBt_publish.setEnabled(true);
+                    }
+                });
+    }
+
+    private void uploadImage(UploadFile[] uploadFiles, final String content) {
+        DynamicsManager.uploadImage((BaseActivity) getActivity(), uploadFiles, "dynamic",
+                new HttpUiCallBack<List<UploadImageBean>>() {
+                    @Override
+                    public void onSuccess(BaseActivity activity, List<UploadImageBean> result, String message) {
+                        mImages = new StringBuilder();
+                        Iterator<UploadImageBean> iterator = result.iterator();
+                        int count = 0;
+                        while (iterator.hasNext()) {
+                            UploadImageBean bean = iterator.next();
+                            if (0 != count) {
+                                mImages.append(",");
+                            }
+
+                            mImages.append(bean.getUrl());
+                            count++;
+                        }
+                        if (isVideo) {
+                            uploadVideo(content, mImages.toString());
+                        } else {
+                            postDynamics(content, mImages.toString(), null);
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(BaseActivity activity, String tip) {
+                        progressDialog.dismiss();
+                        MaleToast.showMessage(activity, tip);
+                        mBt_publish.setEnabled(true);
+                    }
+
+                    @Override
+                    public void onException(BaseActivity activity, Throwable e) {
+                        progressDialog.dismiss();
+                        MaleToast.showMessage(activity, "图片上传失败");
+                        mBt_publish.setEnabled(true);
+                    }
+                });
+    }
+
+    private void setImageUrl(String dynamicId, String imageUrl, String videoUrl) {
+        DynamicsManager.setImageUrl((BaseActivity) getActivity(), dynamicId, imageUrl, videoUrl, new HttpUiCallBack<ImageUploadBean>() {
+            @Override
+            public void onSuccess(BaseActivity activity, ImageUploadBean result, String message) {
+                progressDialog.dismiss();
+                MaleToast.showMessage(activity, "动态上传成功");
+                getActivity().setResult(getActivity().RESULT_OK);
+                getActivity().finish();
+            }
+
+            @Override
+            public void onFailure(BaseActivity activity, String tip) {
+                progressDialog.dismiss();
+                MaleToast.showMessage(activity, tip);
+                mBt_publish.setEnabled(true);
+            }
+
+            @Override
+            public void onException(BaseActivity activity, Throwable e) {
+//                MaleToast.showMessage(activity, "图片上传失败");
+                progressDialog.dismiss();
+                getActivity().setResult(getActivity().RESULT_OK);
+                getActivity().finish();
+            }
+        });
+    }
+
+    private void postDynamics(String content, final String images, final String videoUrl) {
+        DynamicsManager.postDynamics((BaseActivity) getActivity(), content, new HttpUiCallBack<DynamicPostBean>() {
+            @Override
+            public void onSuccess(BaseActivity activity, DynamicPostBean result, String message) {
+                if (null != images) {
+                    setImageUrl(result.getDynamic_id(), images, videoUrl);
+                } else {
+                    if (progressDialog != null) {
+                        progressDialog.dismiss();
+                    }
+                    MaleToast.showMessage(activity, "动态上传成功");
+                    getActivity().setResult(getActivity().RESULT_OK);
+                    getActivity().finish();
+                }
+            }
+
+            @Override
+            public void onFailure(BaseActivity activity, String tip) {
+                if (progressDialog != null) {
+                    progressDialog.dismiss();
+                }
+                MaleToast.showMessage(activity, tip);
+                mBt_publish.setEnabled(true);
+            }
+
+            @Override
+            public void onException(BaseActivity activity, Throwable e) {
+                if (progressDialog != null) {
+                    progressDialog.dismiss();
+                }
+                MaleToast.showMessage(activity, "动态上传失败");
+                mBt_publish.setEnabled(true);
+            }
+        });
+    }
+
+    private final int MIN_DELAY_TIME = 8000; // 两次点击间隔不能少于10000ms
+    private long lastClickTime;
+
+    public boolean isFastClick() {
+        boolean flag = true;
+        long currentClickTime = System.currentTimeMillis();
+        if ((currentClickTime - lastClickTime) >= MIN_DELAY_TIME) {
+            flag = false;
+        }
+        lastClickTime = currentClickTime;
+        return flag;
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (view == mBt_publish) {
+            String content = mEditText.getText().toString();
+            if (TextUtils.isEmpty(content)) {
+                MaleToast.showFailureMsg(getActivity(), "请输入文字内容");
+                return;
+            }
+            if (isVideo) {
+//                if (videoFile == null) {
+//                    MaleToast.showFailureMsg(DynamicPostActivity.this, "请选择视频");
+//                    return;
+//                }
+                if (videoFile != null) {
+                    mBt_publish.setEnabled(false);
+                    progressDialog = ProgressDialog.show(getActivity(), "正在发布", "请稍后...");
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            compressAndUpload();
+                        }
+                    }).start();
+                    return;
+                }
+            }
+//            if (mSelectPath.isEmpty()) {
+//                MaleToast.showFailureMsg(DynamicPostActivity.this, "请选择图片");
+//                return;
+//            }
+            String word = null;
+            if (!TextUtils.isEmpty(content)) {
+                word = mEditText.getText().toString();
+            }
+
+            if (!mSelectPath.isEmpty()) {
+                if (!isFastClick()) {
+                    progressDialog = ProgressDialog.show(getActivity(), "正在发布", "请稍后...");
+                    mBt_publish.setEnabled(false);
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            compressAndUpload();
+
+                        }
+                    }).start();
+                }
+            } else {
+                if (null != word || TextUtils.isEmpty(word)) {
+                    postDynamics(content, null, null);
+//                    MaleToast.showMessage(DynamicPostActivity.this, "请选择图片");
+                } else {
+                    MaleToast.showMessage(getActivity(), "请输入内容");
+                }
+            }
+        }
+    }
+}

app/src/main/java/com/xuebiping/bolizhuzi/view/dynamics/fragment/DynamicVideoTextFragment.java

@@ -0,0 +1,554 @@
+package com.xuebiping.bolizhuzi.view.dynamics.fragment;
+
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.media.ThumbnailUtils;
+import android.os.Bundle;
+import android.provider.MediaStore;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.fengliyan.http.httprequest.UploadFile;
+import com.fengliyan.uikit.photopicker.MultiImageSelector;
+import com.fengliyan.uikit.toast.MaleToast;
+import com.xuebiping.bolizhuzi.R;
+import com.xuebiping.bolizhuzi.controller.constant.Constant;
+import com.xuebiping.bolizhuzi.controller.dynamics.manager.DynamicsManager;
+import com.xuebiping.bolizhuzi.im.uikit.business.session.helper.VideoMessageHelper;
+import com.xuebiping.bolizhuzi.model.dynamics.DynamicPostBean;
+import com.xuebiping.bolizhuzi.model.dynamics.ImageUploadBean;
+import com.xuebiping.bolizhuzi.model.dynamics.UploadImageBean;
+import com.xuebiping.bolizhuzi.utils.camera2.BitmapUtils;
+import com.xuebiping.bolizhuzi.view.base.BaseActivity;
+import com.xuebiping.bolizhuzi.view.base.utils.HttpUiCallBack;
+import com.xuebiping.bolizhuzi.view.base.utils.ImageUtils;
+import com.xuebiping.bolizhuzi.view.dynamics.dialog.TopicListDialog;
+import com.xuebiping.bolizhuzi.view.dynamics.utils.ImageLayout;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+import kotlin.jvm.functions.Function2;
+
+public class DynamicVideoTextFragment  extends Fragment implements View.OnClickListener{
+
+    public static final int MULTI_SELECTOR_REQUEST = 200;
+    public static final int SINGLE_SELECTOR_REQUEST = 201;
+    public static final int MAX_IMAGE_COUNT = 9;
+    private View v;
+    private LinearLayout mPhotoLine1;
+    private LinearLayout mPhotoLine2;
+    private LinearLayout mPhotoLine3;
+    private EditText mEditText;
+    private TextView mComplaintInputText;
+    private int mSingleIndex;
+    private ArrayList<String> mSelectPath = new ArrayList<>();
+    private MultiImageSelector mSelector;
+    private StringBuilder mImages;
+    private ProgressDialog progressDialog;
+    private boolean isVideo = true;
+    private VideoMessageHelper helper;
+    private File videoFile;
+    private TextWatcher mWatcher = new TextWatcher() {
+        @Override
+        public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+        }
+
+        @Override
+        public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+            String length = mEditText.getText().length() + "/300字";
+            mComplaintInputText.setText(length);
+        }
+
+        @Override
+        public void afterTextChanged(Editable editable) {
+
+        }
+    };
+    private RelativeLayout rl_add_topic;
+    private TextView tv_topic_content;
+    private TopicListDialog topicListDialog;
+    private Button mBt_publish;
+
+    @Nullable
+    @org.jetbrains.annotations.Nullable
+    @Override
+    public View onCreateView(@NonNull @NotNull LayoutInflater inflater, @Nullable @org.jetbrains.annotations.Nullable ViewGroup container, @Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
+        v = inflater.inflate(R.layout.fragment_dynamic_video_text, container, false);
+        helper = new VideoMessageHelper(getActivity(), new VideoMessageHelper.VideoMessageHelperListener() {
+            @Override
+            public void onVideoPicked(File file, String md5) {
+                videoFile = file;
+                Bitmap bitmap = ThumbnailUtils.createVideoThumbnail(file.getAbsolutePath(), MediaStore.Video.Thumbnails.FULL_SCREEN_KIND);
+                BitmapUtils.savePicNoRotate(BitmapUtils.toByteArray(bitmap), "video_cover",
+                        new Function2<String, String, Unit>() {
+                            @Override
+                            public Unit invoke(String s, String s2) {
+                                bitmap.recycle();
+                                getActivity().runOnUiThread(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        List<String> paths = new ArrayList<>();
+                                        paths.add(s);
+                                        notifyDataSetChanged(paths);
+                                        mSelectPath.add(s);
+                                    }
+                                });
+                                return null;
+                            }
+                        }, new Function1<String, Unit>() {
+                            @Override
+                            public Unit invoke(String s) {
+                                getActivity().runOnUiThread(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        MaleToast.showMessage(getActivity(), "获取视频缩略图失败");
+
+                                    }
+                                });
+                                return null;
+                            }
+                        });
+            }
+        });
+        initView(v);
+        return v;
+    }
+
+    private void initView(View v) {
+        mPhotoLine1 = v.findViewById(R.id.dynamics_post_line_1);
+        mPhotoLine2 = v.findViewById(R.id.dynamics_post_line_2);
+        mPhotoLine3 = v.findViewById(R.id.dynamics_post_line_3);
+        mEditText = v.findViewById(R.id.edit_post);
+        rl_add_topic = v.findViewById(R.id.rl_add_topic);
+        tv_topic_content = v.findViewById(R.id.tv_topic_content);
+        mComplaintInputText = v.findViewById(R.id.edit_char_count);
+        mBt_publish = v.findViewById(R.id.bt_publish);
+
+        mSelector = MultiImageSelector.create().multi().count(MAX_IMAGE_COUNT);
+        mImages = new StringBuilder();
+        addPhotos(mSelectPath);
+        mEditText.addTextChangedListener(mWatcher);
+
+        rl_add_topic.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                //TODO 添加话题，打开话题弹窗
+                topicListDialog = new TopicListDialog(getActivity());
+                topicListDialog.show();
+                topicListDialog.setRightOnClickListener(new TopicListDialog.OnDialogRightClickListener() {
+                    @Override
+                    public void rightClick(String str) {
+                        tv_topic_content.setText(str);
+                    }
+                });
+            }
+        });
+
+        mBt_publish.setOnClickListener(this);
+    }
+
+    public void notifyDataSetChanged(List<String> imagePath) {
+        removePhotos();
+        addPhotos(imagePath);
+    }
+
+    private void removePhotos() {
+        mPhotoLine1.removeAllViews();
+        mPhotoLine2.removeAllViews();
+        mPhotoLine3.removeAllViews();
+    }
+
+    private void addPhotos(List<String> imagePath) {
+        Iterator<String> i = imagePath.iterator();
+        int count = 0;
+
+        while (i.hasNext()) {
+            String path = i.next();
+            final ImageLayout image = new ImageLayout(getActivity());
+            setImage(path, image);
+            image.setPadding(6, 0, 0, 0);
+            image.setOnImageHandlingListener(new ImageLayout.OnImageHandlingListener() {
+                @Override
+                public void onImageClicked() {
+                    singleReplace(image.getImageUrl());
+                }
+
+                @Override
+                public void onReadyLogoClicked() {
+                    startImageSelector();
+                }
+
+                @Override
+                public void onRemoveLogoClicked() {
+                    removeImage(image.getImageUrl());
+                }
+            });
+
+            if (count < 3) {
+                mPhotoLine1.addView(image);
+            } else if (count < 6) {
+                mPhotoLine2.addView(image);
+            } else if (count < 9) {
+                mPhotoLine3.addView(image);
+            }
+
+            count++;
+        }
+
+        if (isVideo) {
+            if (imagePath.size() == 0) {
+                addTail(count);
+            }
+        } else {
+            addTail(count);
+        }
+
+    }
+
+    void addTail(int count) {
+        if (count != 9) {
+            ImageLayout image = new ImageLayout(getActivity());
+            image.setPadding(6, 0, 0, 0);
+            image.setOnImageHandlingListener(new ImageLayout.OnImageHandlingListener() {
+                @Override
+                public void onImageClicked() {
+
+                }
+
+                @Override
+                public void onReadyLogoClicked() {
+                    startImageSelector();
+                }
+
+                @Override
+                public void onRemoveLogoClicked() {
+
+                }
+            });
+
+//            if (count == 0) {
+//                image.empty();
+//            }
+
+            if (count < 3) {
+                mPhotoLine1.addView(image);
+            } else if (count < 6) {
+                mPhotoLine2.addView(image);
+            } else if (count < 9) {
+                mPhotoLine3.addView(image);
+            }
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (isVideo) {
+            helper.onGetLocalVideoResult(data);
+        }
+        if (requestCode == MULTI_SELECTOR_REQUEST && resultCode == getActivity().RESULT_OK) {
+            mSelectPath.addAll(data.getStringArrayListExtra(MultiImageSelector.EXTRA_RESULT));
+            notifyDataSetChanged(mSelectPath);
+        } else if (requestCode == SINGLE_SELECTOR_REQUEST && resultCode == getActivity().RESULT_OK) {
+            mSelectPath.remove(mSingleIndex);
+            mSelectPath.add(mSingleIndex, data.
+                    getStringArrayListExtra(MultiImageSelector.EXTRA_RESULT).get(0));
+
+            notifyDataSetChanged(mSelectPath);
+        }
+    }
+
+    public void removeImage(String path) {
+        path = path.replace("file:", "");
+        mSelectPath.remove(path);
+        notifyDataSetChanged(mSelectPath);
+    }
+
+    public void startImageSelector() {
+        if (isVideo) {
+            helper.chooseVideoFromLocal();
+            return;
+        }
+        mSelector.multi();
+        mSelector.count(9 - mSelectPath.size());
+        mSelector.start(this, MULTI_SELECTOR_REQUEST);
+    }
+
+    public void singleReplace(String path) {
+        if (isVideo) {
+            helper.chooseVideoFromLocal();
+            return;
+        }
+        path = path.replace("file:", "");
+        mSingleIndex = mSelectPath.indexOf(path);
+        mSelector.single();
+        mSelector.start(this, SINGLE_SELECTOR_REQUEST);
+    }
+
+    private void setImage(String path, ImageLayout image) {
+        if (path != null) {
+            File file = new File(path);
+            if (null != file) {
+                URI uri = file.toURI();
+                image.imageLoad(uri.toString());
+            }
+        }
+    }
+
+    private void compressAndUpload() {
+        Iterator<String> i = mSelectPath.iterator();
+        final UploadFile[] uploadFiles = new UploadFile[mSelectPath.size()];
+        int count = 0;
+        while (i.hasNext()) {
+            String path = i.next();
+            path = ImageUtils.compressImage(getActivity(), path, Constant.IMAGE_MEMORY_SIZE, false);
+            File file = new File(path);
+            UploadFile uploadFile = new UploadFile("file[" + count + "]", file);
+            uploadFiles[count] = uploadFile;
+            count++;
+        }
+
+        if (null != uploadFiles) {
+            if (uploadFiles.length != 0) {
+                if (uploadFiles[0].getFile().exists()) {
+                    getActivity().runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            uploadImage(uploadFiles, mEditText.getText().toString());
+                        }
+                    });
+                }
+            }
+        } else {
+            progressDialog.dismiss();
+            mBt_publish.setEnabled(true);
+        }
+
+    }
+
+    void uploadVideo(String content, String coverUrl) {
+        UploadFile uploadFile = new UploadFile(System.currentTimeMillis() + ".mp4", videoFile);
+        UploadFile[] files = new UploadFile[]{uploadFile};
+        DynamicsManager.uploadImage((BaseActivity) getActivity(), files, "dynamic",
+                new HttpUiCallBack<List<UploadImageBean>>() {
+                    @Override
+                    public void onSuccess(BaseActivity activity, List<UploadImageBean> result, String message) {
+                        if (result.size() > 0) {
+                            String videoUrl = result.get(0).getUrl();
+                            postDynamics(content, coverUrl, videoUrl);
+                        }
+
+                    }
+
+                    @Override
+                    public void onFailure(BaseActivity activity, String tip) {
+                        progressDialog.dismiss();
+                        MaleToast.showMessage(activity, tip);
+                        mBt_publish.setEnabled(true);
+                    }
+
+                    @Override
+                    public void onException(BaseActivity activity, Throwable e) {
+                        progressDialog.dismiss();
+                        MaleToast.showMessage(activity, "视频上传失败");
+                        mBt_publish.setEnabled(true);
+                    }
+                });
+    }
+
+    private void uploadImage(UploadFile[] uploadFiles, final String content) {
+        DynamicsManager.uploadImage((BaseActivity) getActivity(), uploadFiles, "dynamic",
+                new HttpUiCallBack<List<UploadImageBean>>() {
+                    @Override
+                    public void onSuccess(BaseActivity activity, List<UploadImageBean> result, String message) {
+                        mImages = new StringBuilder();
+                        Iterator<UploadImageBean> iterator = result.iterator();
+                        int count = 0;
+                        while (iterator.hasNext()) {
+                            UploadImageBean bean = iterator.next();
+                            if (0 != count) {
+                                mImages.append(",");
+                            }
+
+                            mImages.append(bean.getUrl());
+                            count++;
+                        }
+                        if (isVideo) {
+                            uploadVideo(content, mImages.toString());
+                        } else {
+                            postDynamics(content, mImages.toString(), null);
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(BaseActivity activity, String tip) {
+                        progressDialog.dismiss();
+                        MaleToast.showMessage(activity, tip);
+                        mBt_publish.setEnabled(true);
+                    }
+
+                    @Override
+                    public void onException(BaseActivity activity, Throwable e) {
+                        progressDialog.dismiss();
+                        MaleToast.showMessage(activity, "图片上传失败");
+                        mBt_publish.setEnabled(true);
+                    }
+                });
+    }
+
+    private void setImageUrl(String dynamicId, String imageUrl, String videoUrl) {
+        DynamicsManager.setImageUrl((BaseActivity) getActivity(), dynamicId, imageUrl, videoUrl, new HttpUiCallBack<ImageUploadBean>() {
+            @Override
+            public void onSuccess(BaseActivity activity, ImageUploadBean result, String message) {
+                progressDialog.dismiss();
+                MaleToast.showMessage(activity, "动态上传成功");
+                getActivity().setResult(getActivity().RESULT_OK);
+                getActivity().finish();
+            }
+
+            @Override
+            public void onFailure(BaseActivity activity, String tip) {
+                progressDialog.dismiss();
+                MaleToast.showMessage(activity, tip);
+                mBt_publish.setEnabled(true);
+            }
+
+            @Override
+            public void onException(BaseActivity activity, Throwable e) {
+//                MaleToast.showMessage(activity, "图片上传失败");
+                progressDialog.dismiss();
+                getActivity().setResult(getActivity().RESULT_OK);
+                getActivity().finish();
+            }
+        });
+    }
+
+    private void postDynamics(String content, final String images, final String videoUrl) {
+        DynamicsManager.postDynamics((BaseActivity) getActivity(), content, new HttpUiCallBack<DynamicPostBean>() {
+            @Override
+            public void onSuccess(BaseActivity activity, DynamicPostBean result, String message) {
+                if (null != images) {
+                    setImageUrl(result.getDynamic_id(), images, videoUrl);
+                } else {
+                    if (progressDialog != null) {
+                        progressDialog.dismiss();
+                    }
+                    MaleToast.showMessage(activity, "动态上传成功");
+                    getActivity().setResult(getActivity().RESULT_OK);
+                    getActivity().finish();
+                }
+            }
+
+            @Override
+            public void onFailure(BaseActivity activity, String tip) {
+                if (progressDialog != null) {
+                    progressDialog.dismiss();
+                }
+                MaleToast.showMessage(activity, tip);
+                mBt_publish.setEnabled(true);
+            }
+
+            @Override
+            public void onException(BaseActivity activity, Throwable e) {
+                if (progressDialog != null) {
+                    progressDialog.dismiss();
+                }
+                MaleToast.showMessage(activity, "动态上传失败");
+                mBt_publish.setEnabled(true);
+            }
+        });
+    }
+
+    private final int MIN_DELAY_TIME = 8000; // 两次点击间隔不能少于10000ms
+    private long lastClickTime;
+
+    public boolean isFastClick() {
+        boolean flag = true;
+        long currentClickTime = System.currentTimeMillis();
+        if ((currentClickTime - lastClickTime) >= MIN_DELAY_TIME) {
+            flag = false;
+        }
+        lastClickTime = currentClickTime;
+        return flag;
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (view == mBt_publish) {
+            String content = mEditText.getText().toString();
+            if (TextUtils.isEmpty(content)) {
+                MaleToast.showFailureMsg(getActivity(), "请输入文字内容");
+                return;
+            }
+            if (isVideo) {
+//                if (videoFile == null) {
+//                    MaleToast.showFailureMsg(DynamicPostActivity.this, "请选择视频");
+//                    return;
+//                }
+                if (videoFile != null) {
+                    mBt_publish.setEnabled(false);
+                    progressDialog = ProgressDialog.show(getActivity(), "正在发布", "请稍后...");
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            compressAndUpload();
+                        }
+                    }).start();
+                    return;
+                }
+            }
+//            if (mSelectPath.isEmpty()) {
+//                MaleToast.showFailureMsg(DynamicPostActivity.this, "请选择图片");
+//                return;
+//            }
+            String word = null;
+            if (!TextUtils.isEmpty(content)) {
+                word = mEditText.getText().toString();
+            }
+
+            if (!mSelectPath.isEmpty()) {
+                if (!isFastClick()) {
+                    progressDialog = ProgressDialog.show(getActivity(), "正在发布", "请稍后...");
+                    mBt_publish.setEnabled(false);
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            compressAndUpload();
+
+                        }
+                    }).start();
+                }
+            } else {
+                if (null != word || TextUtils.isEmpty(word)) {
+                    postDynamics(content, null, null);
+//                    MaleToast.showMessage(DynamicPostActivity.this, "请选择图片");
+                } else {
+                    MaleToast.showMessage(getActivity(), "请输入内容");
+                }
+            }
+        }
+    }
+}

app/src/main/java/com/xuebiping/bolizhuzi/view/dynamics/fragment/DynamicViewPager2Fragment.java

@@ -10,6 +10,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.ViewPager;
@@ -18,8 +19,13 @@ import com.fengliyan.base.base.AnyCallback;
 import com.xuebiping.bolizhuzi.R;
 import com.xuebiping.bolizhuzi.controller.main.adapter.MainViewPagerAdapter;
 import com.xuebiping.bolizhuzi.controller.main.adapter.ScaleTransitionPagerTitleView;
+import com.xuebiping.bolizhuzi.controller.settings.manager.SettingManager;
+import com.xuebiping.bolizhuzi.model.settings.UserHomeBean;
 import com.xuebiping.bolizhuzi.view.base.BaseActivity;
+import com.xuebiping.bolizhuzi.view.base.utils.HttpUiCallBack;
 import com.xuebiping.bolizhuzi.view.dynamics.activity.DynamicPostActivity;
+import com.xuebiping.bolizhuzi.view.dynamics.activity.DynamicPublishActivity;
+import com.xuebiping.bolizhuzi.view.main.MainActivity;
 import com.xuebiping.bolizhuzi.view.main.SearchActivity;
 
 import net.lucode.hackware.magicindicator.MagicIndicator;
@@ -51,12 +57,15 @@ public class DynamicViewPager2Fragment extends Fragment implements View.OnClickL
     private RecentDynamicFragment mRecent;
     private FollowUsersDynamicFragment mFocusFragment;
     private ImageView mAddFeedBtn;
+    private RelativeLayout mRl_wurao;
+    private TextView mTv_set_wurao;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View v = inflater.inflate(R.layout.fragment_dynamic_view_pager2, container, false);
         initView(v);
+        geDisturb();
         return v;
     }
 
@@ -73,6 +82,8 @@ public class DynamicViewPager2Fragment extends Fragment implements View.OnClickL
         mDynamicViewPager = v.findViewById(R.id.dynamic_view_pager);
         mRl_home_search = v.findViewById(R.id.rl_home_search);
         mAddFeedBtn = v.findViewById(R.id.addFeedBtn);
+        mRl_wurao = v.findViewById(R.id.rl_wurao);
+        mTv_set_wurao = v.findViewById(R.id.tv_set_wurao);
 
         mRecent = new RecentDynamicFragment();
         mFocusFragment = new FollowUsersDynamicFragment();
@@ -110,6 +121,7 @@ public class DynamicViewPager2Fragment extends Fragment implements View.OnClickL
 
         mAddFeedBtn.setOnClickListener(this);
         mRl_home_search.setOnClickListener(this);
+        mTv_set_wurao.setOnClickListener(this);
     }
 
     private void initMagicIndicator() {
@@ -176,16 +188,19 @@ public class DynamicViewPager2Fragment extends Fragment implements View.OnClickL
     }
 
     void chooseFeedType() {
-        ChooseFeedTypeDialog dialog = new ChooseFeedTypeDialog(getActivity());
+//        ChooseFeedTypeDialog dialog = new ChooseFeedTypeDialog(getActivity());
-        dialog.setCallback(new AnyCallback<ChooseFeedTypeDialog.FeedType>() {
+//        dialog.setCallback(new AnyCallback<ChooseFeedTypeDialog.FeedType>() {
-            @Override
+//            @Override
-            public void callback(ChooseFeedTypeDialog.FeedType feedType) {
+//            public void callback(ChooseFeedTypeDialog.FeedType feedType) {
-                Intent intent = new Intent(getActivity(), DynamicPostActivity.class);
+//                Intent intent = new Intent(getActivity(), DynamicPostActivity.class);
-                intent.putExtra("isVideo", feedType == ChooseFeedTypeDialog.FeedType.Video);
+//                intent.putExtra("isVideo", feedType == ChooseFeedTypeDialog.FeedType.Video);
-                getActivity().startActivityForResult(intent, REQUEST_POST);
+//                getActivity().startActivityForResult(intent, REQUEST_POST);
-            }
+//            }
-        });
+//        });
-        dialog.show();
+//        dialog.show();
+
+        Intent intent = new Intent(getActivity(), DynamicPublishActivity.class);
+        startActivity(intent);
     }
 
     @Override
@@ -194,8 +209,50 @@ public class DynamicViewPager2Fragment extends Fragment implements View.OnClickL
         if (view == mRl_home_search) {
             Intent intent = new Intent(getActivity(), SearchActivity.class);
             startActivity(intent);
-        }else if (view == mAddFeedBtn) {
+        } else if (view == mAddFeedBtn) {
             chooseFeedType();
+        }  else if (view == mTv_set_wurao) {
+            if (null != getActivity()) {
+                MainActivity mainActivity = (MainActivity) getActivity();
+                if (null != mainActivity) {
+                    mainActivity.setMainGOSettingFragment();
+                }
+            }
+        }
+    }
+
+    public void geDisturb() {
+        SettingManager.getHomeUser((BaseActivity) getActivity(), new HttpUiCallBack<UserHomeBean>() {
+            @Override
+            public void onSuccess(BaseActivity activity, UserHomeBean result, String message) {
+                int do_not_disturb = result.getUserinfo().getDo_not_disturb();
+                if (do_not_disturb == 1) {
+                    mRl_wurao.setVisibility(View.VISIBLE);
+                }else {
+                    mRl_wurao.setVisibility(View.GONE);
+                }
+
+            }
+
+            @Override
+            public void onFailure(BaseActivity activity, String tip) {
+
+            }
+
+            @Override
+            public void onException(BaseActivity activity, Throwable e) {
+
+            }
+        });
+    }
+
+    public void getDisturb2(int do_not_disturb) {
+        if (null != mRl_wurao) {
+            if (do_not_disturb == 1) {
+                mRl_wurao.setVisibility(View.VISIBLE);
+            }else {
+                mRl_wurao.setVisibility(View.GONE);
+            }
         }
     }
 }

app/src/main/java/com/xuebiping/bolizhuzi/view/dynamics/fragment/FollowUsersDynamicFragment.java

@@ -329,9 +329,9 @@ public class FollowUsersDynamicFragment extends Fragment {
 
                 mImageList.addAll(result.getList());
 
-                if (mImageList.size() != 0 && mImageList.size() % 10 != 0) {   //显示尾布局
+//                if (mImageList.size() != 0 && mImageList.size() % 10 != 0) {   //显示尾布局
-                    mListView.onNoDataLoaded();
+//                    mListView.onNoDataLoaded();
-                }
+//                }
                 mAdapter.notifyDataSetChanged();
                 if (page == 1) {
                     mListView.setSelection(0);

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/MainActivity.java

@@ -44,6 +44,16 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.transition.Transition;
 import com.facebook.drawee.view.SimpleDraweeView;
+import com.fengliyan.device.DeviceManager;
+import com.fengliyan.http.httprequest.HttpCallback;
+import com.fengliyan.location.LocationManager;
+import com.fengliyan.messaging.ChatManager;
+import com.fengliyan.messaging.CustomAttachment;
+import com.fengliyan.messaging.GiftAttachment;
+import com.fengliyan.storage.StorageManager;
+import com.fengliyan.uikit.bottomtab.BottomTab;
+import com.fengliyan.uikit.dialog.BaseMessageDialog;
+import com.fengliyan.uikit.toast.MaleToast;
 import com.google.gson.Gson;
 import com.google.gson.internal.LinkedTreeMap;
 import com.hjq.permissions.OnPermissionCallback;
@@ -51,12 +61,23 @@ import com.hjq.permissions.XXPermissions;
 import com.huawei.agconnect.config.AGConnectServicesConfig;
 import com.huawei.hms.aaid.HmsInstanceId;
 import com.huawei.hms.common.ApiException;
-import com.fengliyan.device.DeviceManager;
+import com.netease.nimlib.sdk.NIMClient;
-import com.fengliyan.http.httprequest.HttpCallback;
+import com.netease.nimlib.sdk.RequestCallback;
-import com.fengliyan.location.LocationManager;
+import com.netease.nimlib.sdk.RequestCallbackWrapper;
-import com.fengliyan.messaging.ChatManager;
+import com.netease.nimlib.sdk.auth.AuthService;
-import com.fengliyan.messaging.CustomAttachment;
+import com.netease.nimlib.sdk.msg.MsgService;
-import com.fengliyan.messaging.GiftAttachment;
+import com.netease.nimlib.sdk.msg.MsgServiceObserve;
+import com.netease.nimlib.sdk.msg.attachment.MsgAttachment;
+import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
+import com.netease.nimlib.sdk.msg.model.IMMessage;
+import com.netease.nimlib.sdk.msg.model.RecentContact;
+import com.netease.nimlib.sdk.uinfo.UserService;
+import com.netease.nimlib.sdk.uinfo.model.NimUserInfo;
+import com.snail.antifake.deviceid.emulator.EmuCheckUtil;
+import com.snail.antifake.jni.EmulatorDetectUtil;
+import com.umeng.socialize.UMAuthListener;
+import com.umeng.socialize.bean.SHARE_MEDIA;
+import com.xinlingwu.share.ShareManager;
 import com.xuebiping.bolizhuzi.R;
 import com.xuebiping.bolizhuzi.agora.utils.ToastUtil;
 import com.xuebiping.bolizhuzi.controller.constant.ConsUser;
@@ -70,6 +91,7 @@ import com.xuebiping.bolizhuzi.controller.eventBus.TurntableEvent;
 import com.xuebiping.bolizhuzi.controller.eventBus.UnReadCountEvent;
 import com.xuebiping.bolizhuzi.controller.main.manager.GlobalManager;
 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.im.uikit.business.session.activity.P2PMessageActivity;
@@ -85,9 +107,11 @@ import com.xuebiping.bolizhuzi.model.main.DialogAdBean;
 import com.xuebiping.bolizhuzi.model.main.FreeVideoBean;
 import com.xuebiping.bolizhuzi.model.main.GlobalConfigBean;
 import com.xuebiping.bolizhuzi.model.main.IsKidModelBean;
+import com.xuebiping.bolizhuzi.model.main.MainPageAnchorBean;
 import com.xuebiping.bolizhuzi.model.main.SpeedInfoBean;
 import com.xuebiping.bolizhuzi.model.main.SystemVersionBean;
 import com.xuebiping.bolizhuzi.model.main.VideoRequestBean;
+import com.xuebiping.bolizhuzi.model.settings.UserHomeBean;
 import com.xuebiping.bolizhuzi.model.user.bean.BaseUserInfo;
 import com.xuebiping.bolizhuzi.utils.CitySPUtils;
 import com.xuebiping.bolizhuzi.utils.DemoHelper;
@@ -109,12 +133,12 @@ import com.xuebiping.bolizhuzi.view.base.utils.view.AttentionDialog;
 import com.xuebiping.bolizhuzi.view.base.utils.view.KidDialog;
 import com.xuebiping.bolizhuzi.view.base.utils.view.KidOpenDialog;
 import com.xuebiping.bolizhuzi.view.dynamics.fragment.DynamicViewPager2Fragment;
-import com.xuebiping.bolizhuzi.view.dynamics.fragment.DynamicViewPagerFragment;
 import com.xuebiping.bolizhuzi.view.login.LoginActivity;
 import com.xuebiping.bolizhuzi.view.login.utils.LoginUtils;
 import com.xuebiping.bolizhuzi.view.luck.LuckFragment;
 import com.xuebiping.bolizhuzi.view.main.dialog.CustomAlertDialog;
 import com.xuebiping.bolizhuzi.view.main.dialog.FreeVideoDialog;
+import com.xuebiping.bolizhuzi.view.main.dialog.OpenDisturbDialog;
 import com.xuebiping.bolizhuzi.view.main.dialog.PermissionDialog;
 import com.xuebiping.bolizhuzi.view.main.dialog.UpdateDialog;
 import com.xuebiping.bolizhuzi.view.main.receiver.NotificationClickReceiver;
@@ -124,31 +148,9 @@ import com.xuebiping.bolizhuzi.view.news.fragment.MainMessageFragment;
 import com.xuebiping.bolizhuzi.view.news.im.DemoCache;
 import com.xuebiping.bolizhuzi.view.settings.BindPhoneConfirmActivity;
 import com.xuebiping.bolizhuzi.view.settings.QuickRechargeActivity;
-import com.xuebiping.bolizhuzi.view.settings.SettingFragment;
 import com.xuebiping.bolizhuzi.view.settings.SettingFragment2;
 import com.xuebiping.bolizhuzi.view.settings.dialog.GirlAuthDialog;
 import com.xuebiping.bolizhuzi.view.settings.dialog.SpeedCallDialog;
-import com.fengliyan.storage.StorageManager;
-import com.fengliyan.uikit.bottomtab.BottomTab;
-import com.fengliyan.uikit.dialog.BaseMessageDialog;
-import com.fengliyan.uikit.toast.MaleToast;
-import com.netease.nimlib.sdk.NIMClient;
-import com.netease.nimlib.sdk.RequestCallback;
-import com.netease.nimlib.sdk.RequestCallbackWrapper;
-import com.netease.nimlib.sdk.auth.AuthService;
-import com.netease.nimlib.sdk.msg.MsgService;
-import com.netease.nimlib.sdk.msg.MsgServiceObserve;
-import com.netease.nimlib.sdk.msg.attachment.MsgAttachment;
-import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
-import com.netease.nimlib.sdk.msg.model.IMMessage;
-import com.netease.nimlib.sdk.msg.model.RecentContact;
-import com.netease.nimlib.sdk.uinfo.UserService;
-import com.netease.nimlib.sdk.uinfo.model.NimUserInfo;
-import com.snail.antifake.deviceid.emulator.EmuCheckUtil;
-import com.snail.antifake.jni.EmulatorDetectUtil;
-import com.umeng.socialize.UMAuthListener;
-import com.umeng.socialize.bean.SHARE_MEDIA;
-import com.xinlingwu.share.ShareManager;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -435,7 +437,7 @@ public class MainActivity extends BaseActivity implements DemoHelper.AppIdsUpdat
         queryCities();
         getGlobalConfig();
         activeUpdate();
-        getKidModel(0);
+//        getKidModel(0);
 
         int unreadNum = NIMClient.getService(MsgService.class).getTotalUnreadCount();
         //消息tab显示最近未读联系人头像
@@ -485,6 +487,8 @@ public class MainActivity extends BaseActivity implements DemoHelper.AppIdsUpdat
 
         NIMClient.getService(MsgServiceObserve.class).observeReceiveMessage(incomingMessageObserver, true);
 //        freeAnchor();
+        geMainDisturb();
+
     }
 
     com.netease.nimlib.sdk.Observer<List<IMMessage>> incomingMessageObserver = new com.netease.nimlib.sdk.Observer<List<IMMessage>>() {
@@ -872,9 +876,9 @@ public class MainActivity extends BaseActivity implements DemoHelper.AppIdsUpdat
         mBottomTab.setOnTabClickListener(new BottomTab.TabClickListener() {
             @Override
             public void onClick(int position, int currentPosition) {
-                if ((UserManager.getUserInfo().getIs_anchor() != 1 || UserManager.getUserInfo().getIs_face_status() != 1) && UserManager.getUserInfo().isWomen()) {
+//                if ((UserManager.getUserInfo().getIs_anchor() != 1 || UserManager.getUserInfo().getIs_face_status() != 1) && UserManager.getUserInfo().isWomen()) {
-                    new GirlAuthDialog(MainActivity.this).show();
+//                    new GirlAuthDialog(MainActivity.this).show();
-                }
+//                }
                 if (position == currentPosition) {  //第二次点击
                     if (position == 0) {
                         if (isOne) {
@@ -1759,6 +1763,64 @@ public class MainActivity extends BaseActivity implements DemoHelper.AppIdsUpdat
         });
     }
 
+    private OpenDisturbDialog mOpenDisturbDialog;
+
+    public void geMainDisturb() {
+        SettingManager.getHomeUser(this, new HttpUiCallBack<UserHomeBean>() {
+            @Override
+            public void onSuccess(BaseActivity activity, UserHomeBean result, String message) {
+                int do_not_disturb = result.getUserinfo().getDo_not_disturb();
+                if (do_not_disturb == 1) {
+                    if (mOpenDisturbDialog != null) {
+                        mOpenDisturbDialog.dismiss();
+                        mOpenDisturbDialog = null;
+                    }
+
+                    mOpenDisturbDialog = new OpenDisturbDialog(MainActivity.this, R.style.SelectiveDialog);
+                    mOpenDisturbDialog.setOnFinishDisturbListener(new OpenDisturbDialog.OnFinishDisturbListener() {
+                        @Override
+                        public void onFinishDisturb() {
+                            changeVideoStatus2();
+                        }
+                    });
+                    mOpenDisturbDialog.show();
+
+                }
+            }
+
+            @Override
+            public void onFailure(BaseActivity activity, String tip) {
+
+            }
+
+            @Override
+            public void onException(BaseActivity activity, Throwable e) {
+
+            }
+        });
+    }
+
+    private void changeVideoStatus2() {
+        MainManager.changeVideoStatus2(this, 0, new HttpUiCallBack<MainPageAnchorBean>() {
+                    @Override
+                    public void onSuccess(BaseActivity activity, MainPageAnchorBean result, String message) {
+                        MaleToast.showMessage(activity, "勿扰模式关闭成功");
+                        mOpenDisturbDialog.dismiss();
+                        getMainDisturb(0);
+                    }
+
+                    @Override
+                    public void onFailure(BaseActivity activity, String tip) {
+                        MaleToast.showMessage(activity, tip);
+                    }
+
+                    @Override
+                    public void onException(BaseActivity activity, Throwable e) {
+                        MaleToast.showMessage(activity, "请重试");
+                    }
+                });
+    }
+
     @Override
     public void onIdsValid(String ids) {
         try {
@@ -1769,6 +1831,22 @@ public class MainActivity extends BaseActivity implements DemoHelper.AppIdsUpdat
         }
     }
 
+    public void getMainDisturb(int do_not_disturb) {
+        if (null != mMainRecommendFragment) {
+            mMainRecommendFragment.getDisturb2(do_not_disturb);
+        }
+
+        if (null != mDynamicViewPagerFragment) {
+            mDynamicViewPagerFragment.getDisturb2(do_not_disturb);
+        }
+    }
+
+    public void setMainGOSettingFragment() {
+        if (null != mBottomTab) {
+            mBottomTab.change(4);
+        }
+    }
+
     //  速配相关
     @Override
     public void onMessageListener(int code, String method, String data, String message) {

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

@@ -2,21 +2,29 @@ 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 com.xuebiping.bolizhuzi.R;
+import com.fengliyan.uikit.dialog.BottomGiftDialog;
-import com.xuebiping.bolizhuzi.controller.dynamics.adapter.DynamicsAdapter;
-import com.xuebiping.bolizhuzi.controller.dynamics.manager.DynamicsManager;
-import com.xuebiping.bolizhuzi.controller.eventBus.DynamicEvent;
-import com.xuebiping.bolizhuzi.model.dynamics.DynamicsItemBean;
-import com.xuebiping.bolizhuzi.model.dynamics.DynamicsListBean;
-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.dialog.DialogGiftBean;
+import com.fengliyan.uikit.dialog.GiftListBean;
 import com.fengliyan.uikit.refresh.LoadMoreListView;
 import com.fengliyan.uikit.toast.MaleToast;
+import com.xuebiping.bolizhuzi.R;
+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.dynamics.activity.DynamicDetailActivity;
+import com.xuebiping.bolizhuzi.view.settings.CaibeiRechargeActivity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,15 +42,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 +63,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 +99,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 +150,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 +336,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 +392,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,32 @@ 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.shuyu.gsyvideoplayer.utils.GSYVideoType;
 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;
@@ -60,8 +74,13 @@ import com.xuebiping.bolizhuzi.view.base.utils.view.OtherGuardDialog;
 import com.xuebiping.bolizhuzi.view.base.utils.view.WechatDialog;
 import com.xuebiping.bolizhuzi.view.diooto.Diooto;
 import com.xuebiping.bolizhuzi.view.diooto.config.DiootoConfig;
+import com.xuebiping.bolizhuzi.view.dynamics.activity.PageVideoPlay2Activity;
 import com.xuebiping.bolizhuzi.view.dynamics.activity.PageVideoPlayActivity;
+import com.xuebiping.bolizhuzi.view.dynamics.activity.QYPreviewVideoActivity;
 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.ui.EmptyControlVideo;
 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 +105,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;
@@ -133,7 +152,7 @@ public class MainPageFragment extends Fragment implements View.OnClickListener {
     private TextView copyBtn;
 
     private ImageView tagVipImageView;
-    private ImageView tagSVipImageView;
+//    private ImageView tagSVipImageView;
     private ImageView tagNewImageView;
     private ImageView tagRealImageView;
     private ImageView tagPhoneImageView;
@@ -142,7 +161,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 +417,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);
@@ -421,7 +458,7 @@ public class MainPageFragment extends Fragment implements View.OnClickListener {
         mSvGuardImages[3] = v.findViewById(R.id.personal_main_page_guard_photo_4);
 
         tagVipImageView = v.findViewById(R.id.tagVipImageView);
-        tagSVipImageView = v.findViewById(R.id.tagSVipImageView);
+//        tagSVipImageView = v.findViewById(R.id.tagSVipImageView);
         tagNewImageView = v.findViewById(R.id.tagNewImageView);
         tagRealImageView = v.findViewById(R.id.tagRealImageView);
         tagPhoneImageView = v.findViewById(R.id.tagPhoneImageView);
@@ -435,11 +472,41 @@ 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);
 
-        iv_video_call.setImageAssetsFolder("images/");
+        mLl_auto = v.findViewById(R.id.ll_auto);
-        iv_video_call.setAnimation("video_call_btn.json");
+        mLl_mobile_auto = v.findViewById(R.id.ll_mobile_auto);
-        iv_video_call.playAnimation();
+        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);
+
+        RelativeLayout rl_level = v.findViewById(R.id.rl_level);
+        ImageView iv_level = v.findViewById(R.id.iv_level);
+        TextView tv_level = v.findViewById(R.id.tv_level);
 
         mBack.setOnClickListener(this);
         mFocusButton.setOnClickListener(this);
@@ -450,11 +517,87 @@ public class MainPageFragment extends Fragment implements View.OnClickListener {
         mOtherPhoto.setOnClickListener(this);
         mGuardLayout.setOnClickListener(this);
         view_end.setOnClickListener(this);
-        iv_video_call.setOnClickListener(this);
+//        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);
+
+        int level = mMainPageBean.getInfo().getLevel();
+        tv_level.setText(level + "");
+        if (mMainPageBean.getInfo().getGender() == 1) {
+            if (level > 0 && level <= 15) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg1);
+                iv_level.setImageResource(R.mipmap.ic_modle_1);
+            } else if (level > 15 && level <= 30) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg2);
+                iv_level.setImageResource(R.mipmap.ic_modle_2);
+            } else if (level > 30 && level <= 45) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg3);
+                iv_level.setImageResource(R.mipmap.ic_modle_3);
+            } else if (level > 45 && level <= 60) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg4);
+                iv_level.setImageResource(R.mipmap.ic_modle_4);
+            } else if (level > 60 && level <= 75) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg5);
+                iv_level.setImageResource(R.mipmap.ic_modle_5);
+            } else {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg6);
+                iv_level.setImageResource(R.mipmap.ic_modle_6);
+            }
+        }else {
+            if (level > 0 && level <= 15) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg1);
+                iv_level.setImageResource(R.mipmap.ic_use_1);
+            } else if (level > 15 && level <= 30) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg2);
+                iv_level.setImageResource(R.mipmap.ic_use_2);
+            } else if (level > 30 && level <= 45) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg3);
+                iv_level.setImageResource(R.mipmap.ic_use_3);
+            } else if (level > 45 && level <= 60) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg4);
+                iv_level.setImageResource(R.mipmap.ic_use_4);
+            } else if (level > 60 && level <= 75) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg5);
+                iv_level.setImageResource(R.mipmap.ic_use_5);
+            } else {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg6);
+                iv_level.setImageResource(R.mipmap.ic_use_6);
+            }
+        }
+
+        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();
@@ -464,7 +607,7 @@ public class MainPageFragment extends Fragment implements View.OnClickListener {
             if (player.getAudioComponent() != null) {
                 player.getAudioComponent().setVolume(0);
             }
-            player.setRepeatMode(Player.REPEAT_MODE_OFF);
+            player.setRepeatMode(Player.REPEAT_MODE_ONE);
             personal_player.setPlayer(player);
             player.setMediaSource(new DefaultExoConfig(getActivity()).createMediaSource(Uri.parse(StrU.getResourcePath(videoUrl, getActivity()))));
             player.prepare();
@@ -475,32 +618,25 @@ public class MainPageFragment extends Fragment implements View.OnClickListener {
                 public void onPlaybackStateChanged(int state) {
                     Player.EventListener.super.onPlaybackStateChanged(state);
                     if (state == Player.STATE_ENDED) {
-                        view_end.setVisibility(View.VISIBLE);
+//                        view_end.setVisibility(View.VISIBLE);
-                        iv_video_call.setVisibility(View.VISIBLE);
+//                        iv_video_call.setVisibility(View.VISIBLE);
                     }
                 }
             });
         }
 
-        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()) {
+//        if (0 == mMainPageBean.getInfo().getVip()) {
+//            tagVipImageView.setVisibility(View.VISIBLE);
+//        } else if (1 == mMainPageBean.getInfo().getVip()) {
+//            tagSVipImageView.setVisibility(View.VISIBLE);
+//        }
+
+        if (mMainPageBean.getInfo().getVip() == 0 || mMainPageBean.getInfo().getVip() == 1) {
             tagVipImageView.setVisibility(View.VISIBLE);
-        } else if (1 == mMainPageBean.getInfo().getVip()) {
-            tagSVipImageView.setVisibility(View.VISIBLE);
         }
+
         if (mMainPageBean.getInfo().getGender() == 1) {
             tagRealImageView.setVisibility(View.VISIBLE);
         }
@@ -511,14 +647,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 +657,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 +689,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 +704,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 +765,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 +816,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 +882,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 +943,51 @@ public class MainPageFragment extends Fragment implements View.OnClickListener {
                         });
             }
         }
+
+        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 +1160,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 +1174,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 +1249,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) {
@@ -1120,17 +1277,99 @@ public class MainPageFragment extends Fragment implements View.OnClickListener {
         } else if (view == iv_video_call || view == view_end) {
             getCallInfo(0);
         } else if (view == personal_player || view == cv_video) {
-            Intent intent = new Intent(getActivity(), PageVideoPlayActivity.class);
+//            Intent intent = new Intent(getActivity(), PageVideoPlayActivity.class);
-            intent.putExtra("userId", mMainPageBean.getInfo().getUserId());
+//            intent.putExtra("userId", mMainPageBean.getInfo().getUserId());
+//            intent.putExtra("videoUrl", mMainPageBean.getVideo_url());
+//            intent.putExtra("age", mMainPageBean.getInfo().getAge());
+//            intent.putExtra("nickname", mMainPageBean.getInfo().getNickname());
+//            intent.putExtra("avatar_url", mMainPageBean.getInfo().getAvatar());
+//            intent.putExtra("is_follow", mMainPageBean.getInfo().getIs_follow());
+//            startActivity(intent);
+
+//            Intent intent = new Intent(getActivity(), QYPreviewVideoActivity.class);
+//            intent.putExtra("videoUrl", StrU.getResourcePath(mMainPageBean.getVideo_url(), getActivity()));
+//            startActivity(intent);
+
+            Intent intent = new Intent(getActivity(), PageVideoPlay2Activity.class);
             intent.putExtra("videoUrl", mMainPageBean.getVideo_url());
-            intent.putExtra("age", mMainPageBean.getInfo().getAge());
+//            intent.putExtra("videoUrl", "http://www.w3school.com.cn/i/movie.mp4");
-            intent.putExtra("nickname", mMainPageBean.getInfo().getNickname());
+            startActivity(intent);
-            intent.putExtra("avatar_url", mMainPageBean.getInfo().getAvatar());
+        } else if (view == mIv_look_wechat) {
-            intent.putExtra("is_follow", mMainPageBean.getInfo().getIs_follow());
+            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
     public void onDestroyView() {
         super.onDestroyView();

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

@@ -16,19 +16,33 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.ViewPager;
 
+import com.blankj.utilcode.util.GsonUtils;
+import com.fengliyan.http.httprequest.HttpCallback;
 import com.fengliyan.uikit.UiUtils;
 import com.fengliyan.uikit.toast.MaleToast;
 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.eventBus.RegisterInfoEvent;
 import com.xuebiping.bolizhuzi.controller.main.adapter.MainViewPagerAdapter;
 import com.xuebiping.bolizhuzi.controller.main.adapter.ScaleTransitionPagerTitleView;
+import com.xuebiping.bolizhuzi.controller.main.manager.MainManager;
+import com.xuebiping.bolizhuzi.controller.settings.adapter.constant.SettingOptions;
+import com.xuebiping.bolizhuzi.controller.settings.manager.SettingManager;
 import com.xuebiping.bolizhuzi.controller.user.manager.UserManager;
 import com.xuebiping.bolizhuzi.im.uikit.common.ToastHelper;
+import com.xuebiping.bolizhuzi.model.settings.UserFrameBean;
+import com.xuebiping.bolizhuzi.model.settings.UserHomeBean;
 import com.xuebiping.bolizhuzi.utils.NoClearSPUtils;
+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.main.dialog.ShaiXuanDialog;
 
 import net.lucode.hackware.magicindicator.MagicIndicator;
@@ -42,9 +56,12 @@ import net.lucode.hackware.magicindicator.buildins.commonnavigator.indicators.Li
 import net.lucode.hackware.magicindicator.buildins.commonnavigator.titles.CommonPagerTitleView;
 import net.lucode.hackware.magicindicator.buildins.commonnavigator.titles.SimplePagerTitleView;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
+import de.greenrobot.event.EventBus;
+
 public class MainRecommend2Fragment extends Fragment implements View.OnClickListener {
 
     private View v;
@@ -66,12 +83,15 @@ public class MainRecommend2Fragment extends Fragment implements View.OnClickList
     private MainFiveStarFragment mFiveStarFragment;
     private MainFourStarFragment mFourStarFragment;
     private MainThreeStarFragment mThreeStarFragment;
+    private RelativeLayout mRl_wurao;
+    private TextView mTv_set_wurao;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         v = inflater.inflate(R.layout.fragment_main_recommend2, container, false);
         initView(v);
+        geDisturb();
         return v;
     }
 
@@ -89,10 +109,13 @@ public class MainRecommend2Fragment extends Fragment implements View.OnClickList
         mRl_home_change = v.findViewById(R.id.rl_home_change);
         mMagicIndicator = v.findViewById(R.id.magic_indicator);
         mMainViewPager = v.findViewById(R.id.main_view_pager);
+        mRl_wurao = v.findViewById(R.id.rl_wurao);
+        mTv_set_wurao = v.findViewById(R.id.tv_set_wurao);
 
         mLl_select.setOnClickListener(this);
         mRl_home_search.setOnClickListener(this);
         mRl_home_change.setOnClickListener(this);
+        mTv_set_wurao.setOnClickListener(this);
 
         mLookMeFragment = new LookMeFragment();
         mRecommendFragment = new RecommendFragment2();
@@ -283,7 +306,7 @@ public class MainRecommend2Fragment extends Fragment implements View.OnClickList
         if (view == mRl_home_search) {
             Intent intent = new Intent(getActivity(), SearchActivity.class);
             startActivity(intent);
-        }else if (view == mLl_select) {
+        } else if (view == mLl_select) {
 
             ShaiXuanDialog shaiXuanDialog = new ShaiXuanDialog(getActivity());
             shaiXuanDialog.show();
@@ -293,11 +316,53 @@ public class MainRecommend2Fragment extends Fragment implements View.OnClickList
                     NoClearSPUtils.saveInt(getActivity(), UserManager.getUserInfo().getUser_id() + Constant.FRIEND_SELECT, isSelect);
                 }
             });
-        }else if (view == mRl_home_change) {
+        } else if (view == mRl_home_change) {
             if (mRecommendFragment != null && mVoiceFragment != null) {
                 mRecommendFragment.layoutChange();
                 mVoiceFragment.layoutChange();
             }
+        } else if (view == mTv_set_wurao) {
+            if (null != getActivity()) {
+                MainActivity mainActivity = (MainActivity) getActivity();
+                if (null != mainActivity) {
+                    mainActivity.setMainGOSettingFragment();
+                }
+            }
+        }
+    }
+
+    public void geDisturb() {
+        SettingManager.getHomeUser((BaseActivity) getActivity(), new HttpUiCallBack<UserHomeBean>() {
+            @Override
+            public void onSuccess(BaseActivity activity, UserHomeBean result, String message) {
+                int do_not_disturb = result.getUserinfo().getDo_not_disturb();
+                if (do_not_disturb == 1) {
+                    mRl_wurao.setVisibility(View.VISIBLE);
+                }else {
+                    mRl_wurao.setVisibility(View.GONE);
+                }
+
+            }
+
+            @Override
+            public void onFailure(BaseActivity activity, String tip) {
+
+            }
+
+            @Override
+            public void onException(BaseActivity activity, Throwable e) {
+
+            }
+        });
+    }
+
+    public void getDisturb2(int do_not_disturb) {
+        if (null != mRl_wurao) {
+            if (do_not_disturb == 1) {
+                mRl_wurao.setVisibility(View.VISIBLE);
+            }else {
+                mRl_wurao.setVisibility(View.GONE);
+            }
         }
     }
 }

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/java/com/xuebiping/bolizhuzi/view/main/dialog/OpenDisturbDialog.java

@@ -0,0 +1,85 @@
+package com.xuebiping.bolizhuzi.view.main.dialog;
+
+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.Button;
+import android.widget.RelativeLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.xuebiping.bolizhuzi.R;
+
+public class OpenDisturbDialog extends Dialog implements View.OnClickListener {
+
+    private Context mContext;
+    private RelativeLayout mRl_close;
+    private Button mBt_finish_disturb;
+
+    public OpenDisturbDialog(@NonNull Context context) {
+        super(context);
+        mContext = context;
+    }
+
+    public OpenDisturbDialog(@NonNull Context context, int themeResId) {
+        super(context, themeResId);
+        mContext = context;
+    }
+
+    protected OpenDisturbDialog(@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_open_disturb);
+
+        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() {
+        mRl_close = findViewById(R.id.rl_close);
+        mBt_finish_disturb = findViewById(R.id.bt_finish_disturb);
+
+        mRl_close.setOnClickListener(this);
+        mBt_finish_disturb.setOnClickListener(this);
+
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (view == mRl_close) {
+            dismiss();
+        } else if (view == mBt_finish_disturb) {
+            if (null != mOnFinishDisturbListener) {
+                mOnFinishDisturbListener.onFinishDisturb();
+            }
+        }
+    }
+
+    private OnFinishDisturbListener mOnFinishDisturbListener;
+
+    public interface OnFinishDisturbListener {
+        void onFinishDisturb();
+    }
+
+    public void setOnFinishDisturbListener(OnFinishDisturbListener onFinishDisturbListener) {
+        mOnFinishDisturbListener = onFinishDisturbListener;
+    }
+}

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

@@ -88,7 +88,7 @@ public class ShaiXuanDialog extends Dialog implements View.OnClickListener {
 
         ll_nm_video_call = findViewById(R.id.ll_nm_video_call);
 
-        findViewById(R.id.iv_close).setOnClickListener(new View.OnClickListener() {
+        findViewById(R.id.rl_close).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 dismiss();

app/src/main/java/com/xuebiping/bolizhuzi/view/main/ui/EmptyControlVideo.java

@@ -2,13 +2,15 @@ package com.xuebiping.bolizhuzi.view.main.ui;
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.MotionEvent;
 
-import com.xuebiping.bolizhuzi.R;
 import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer;
+import com.xuebiping.bolizhuzi.R;
 
 public class EmptyControlVideo extends StandardGSYVideoPlayer {
 
+
     public EmptyControlVideo(Context context, Boolean fullFlag) {
         super(context, fullFlag);
     }
@@ -37,6 +39,7 @@ public class EmptyControlVideo extends StandardGSYVideoPlayer {
 
         //不给触摸亮度，如果需要，屏蔽下方代码即可
         mBrightness = false;
+
     }
 
     @Override

app/src/main/java/com/xuebiping/bolizhuzi/view/news/fragment/MainMessageFragment.java

@@ -97,39 +97,39 @@ public class MainMessageFragment extends Fragment implements View.OnClickListene
         if (!hidden) {
             initTitle();
             viewPagerChange(mIndex);
-            if (UserManager.getUserInfo().getGender() == 2) {
+//            if (UserManager.getUserInfo().getGender() == 2) {
-                if (isSignIn) {
+//                if (isSignIn) {
-                    isSignIn = false;
+//                    isSignIn = false;
-                    signData();
+//                    signData();
-                }
+//                }
-            } else {
+//            } else {
-                lin_msg_sign.setVisibility(View.INVISIBLE);
+//                lin_msg_sign.setVisibility(View.INVISIBLE);
-            }
+//            }
 
-            if (isFirst) {
+//            if (isFirst) {
-                isFirst = false;
+//                isFirst = false;
-                if (UserManager.getUserInfo().getGender() == 2 && !SPUtils.getBoolean(getContext(), ConsUser.USER_VIP, false)) {
+//                if (UserManager.getUserInfo().getGender() == 2 && !SPUtils.getBoolean(getContext(), ConsUser.USER_VIP, false)) {
-                    if (mVipCountDownTimer != null) {
+//                    if (mVipCountDownTimer != null) {
-                        mVipCountDownTimer.cancel();
+//                        mVipCountDownTimer.cancel();
-                    }
+//                    }
-                    mVipCountDownTimer = new CountDownTimer(60_000 * 10, 1000) {
+//                    mVipCountDownTimer = new CountDownTimer(60_000 * 10, 1000) {
-                        @Override
+//                        @Override
-                        public void onTick(long millisUntilFinished) {
+//                        public void onTick(long millisUntilFinished) {
-                            tv_msg_vip_time.setText(TimeUtils.millis2String(millisUntilFinished, "mm:ss"));
+//                            tv_msg_vip_time.setText(TimeUtils.millis2String(millisUntilFinished, "mm:ss"));
-                        }
+//                        }
-
+//
-                        @Override
+//                        @Override
-                        public void onFinish() {
+//                        public void onFinish() {
-                            lin_msg_vip.setVisibility(View.GONE);
+//                            lin_msg_vip.setVisibility(View.GONE);
-                        }
+//                        }
-
+//
-                    };
+//                    };
-                    lin_msg_vip.setVisibility(View.VISIBLE);
+//                    lin_msg_vip.setVisibility(View.VISIBLE);
-                    mVipCountDownTimer.start();
+//                    mVipCountDownTimer.start();
-                } else {
+//                } else {
-                    lin_msg_vip.setVisibility(View.GONE);
+//                    lin_msg_vip.setVisibility(View.GONE);
-                }
+//                }
-            }
+//            }
         }
     }
 

app/src/main/java/com/xuebiping/bolizhuzi/view/settings/GeneralMemberFragment.java

@@ -194,11 +194,11 @@ public class GeneralMemberFragment extends Fragment implements View.OnClickListe
                         tv_member_open.setText("立即开通");
                     }
 
-                    if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 1) {
+//                    if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 1) {
-                        lin_member_bottom_btn.setVisibility(View.GONE);
+//                        lin_member_bottom_btn.setVisibility(View.GONE);
-                        tv_member_open.setVisibility(View.VISIBLE);
+//                        tv_member_open.setVisibility(View.VISIBLE);
-                        tv_member_open.setText("邀请好友开通");
+//                        tv_member_open.setText("邀请好友开通");
-                    }
+//                    }
 
                     List<MemberInfoList> list = result.getInfo().getList();
                     if (list != null && list.size() > 0) {
@@ -338,10 +338,23 @@ public class GeneralMemberFragment extends Fragment implements View.OnClickListe
             }
             showPay(goodsId);
         } else if (v == tv_member_open) {
-            if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 1) {
+//            if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 1) {
-                Intent intent = new Intent(getContext(), InvitationActivity.class);
+//                Intent intent = new Intent(getContext(), InvitationActivity.class);
-                startActivity(intent);
+//                startActivity(intent);
-            } else {
+//            } else {
+//                if (defaultType == 1) {
+//                    goodsId = goodsId2;
+//                    price = price2;
+//                } else if (defaultType == 2) {
+//                    goodsId = goodsId3;
+//                    price = price3;
+//                } else {
+//                    goodsId = goodsId1;
+//                    price = price1;
+//                }
+//                showPay(goodsId);
+//            }
+
             if (defaultType == 1) {
                 goodsId = goodsId2;
                 price = price2;
@@ -355,7 +368,6 @@ public class GeneralMemberFragment extends Fragment implements View.OnClickListe
             showPay(goodsId);
         }
     }
-    }
 
     /**
      * 支付方式

app/src/main/java/com/xuebiping/bolizhuzi/view/settings/InfoEditActivity.java

@@ -1,6 +1,7 @@
 package com.xuebiping.bolizhuzi.view.settings;
 
 import android.Manifest;
+import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -8,6 +9,7 @@ import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.media.ThumbnailUtils;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.provider.MediaStore;
 import android.text.Html;
@@ -19,10 +21,12 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
@@ -34,6 +38,8 @@ import com.bigkoo.pickerview.listener.OnOptionsSelectListener;
 import com.bigkoo.pickerview.listener.OnTimeSelectListener;
 import com.bigkoo.pickerview.view.OptionsPickerView;
 import com.bigkoo.pickerview.view.TimePickerView;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.gson.Gson;
 import com.hjq.permissions.OnPermissionCallback;
@@ -62,6 +68,7 @@ import com.xuebiping.bolizhuzi.model.login.bean.LoginBean;
 import com.xuebiping.bolizhuzi.model.main.GlobalConfigBean;
 import com.xuebiping.bolizhuzi.model.settings.UserHomeBean;
 import com.xuebiping.bolizhuzi.model.settings.UserInfoBean;
+import com.xuebiping.bolizhuzi.utils.GlideUtils;
 import com.xuebiping.bolizhuzi.utils.PermissionUtil;
 import com.xuebiping.bolizhuzi.utils.SPUtils;
 import com.xuebiping.bolizhuzi.utils.SimpleItemTouchCallBack;
@@ -86,6 +93,9 @@ import com.fengliyan.uikit.sketch.SketchImageView;
 import com.fengliyan.uikit.toast.MaleToast;
 
 import java.io.File;
+import java.time.LocalDate;
+import java.time.Period;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -107,6 +117,8 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
     private String[] permissions = {Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
     public static final int VIDEO_COVER_REQUEST = 501;//封面视频
     public static final int SIGNATURE_REQUEST = 502;//个性签名
+    public static final int JOB_REQUEST = 503;//职业
+    public static final int SCHOOL_REQUEST = 504;//学校
     public static final int MULTI_SELECTOR_REQUEST = 200;
     public static final int PERMISSION_REQUEST_CODE = 101;
     public static final int REQUEST_EDIT_NICKNAME = 210;
@@ -167,6 +179,8 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
     private String mOldBirthday = "";
     private String mOldCity = "";
     private String mOldJob = "";
+    private String mOldSchool = "";
+    private String mOldHeight = "";
     private WQTipsDialog mWQTipsDialog;
     private String mEdit_nickname_tip;
     private String mNickname_tip;
@@ -182,7 +196,21 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
     TextView videoStatusLabel;
     View videoBtn;
     private String del_video = "0";
-    private String job = "自由职业-自由职业";
+    //private String job = "自由职业-自由职业";
+    private SimpleDraweeView photosImageView;
+    private TextView settings_info_edit_age;
+    private TextView settings_info_edit_xz;
+    private TextView settings_info_edit_gender;
+    private TextView settings_info_edit_school;
+    private TextView settings_info_edit_height;
+    private String height;
+    private RelativeLayout photosBtn;
+    private String album;
+    private String mOldalbum;
+    private RelativeLayout settings_info_edit_height_layout;
+    private RelativeLayout settings_info_edit_xx_layout;
+    private TextView tv_finish_bfb;
+    private ProgressBar progress_bar_bfb;
 
     @Override
     public void onCreate(Bundle onSavedInstance) {
@@ -197,6 +225,11 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
     }
 
     private void initView() {
+        tv_finish_bfb = findViewById(R.id.tv_finish_bfb);
+        progress_bar_bfb = findViewById(R.id.progress_bar_bfb);
+
+        progress_bar_bfb.setMax(100);
+
         videoStatusLabel = findViewById(R.id.videoStatusLabel);
         avatarImageView = findViewById(R.id.avatarImageView);
         videoCoverImageView = findViewById(R.id.videoCoverImageView);
@@ -218,7 +251,17 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
 
             }
         });
+        photosImageView = findViewById(R.id.photosImageView);
+        photosBtn = findViewById(R.id.photosBtn);
+        settings_info_edit_age = findViewById(R.id.settings_info_edit_age);
+        settings_info_edit_xz = findViewById(R.id.settings_info_edit_xz);
+        settings_info_edit_gender = findViewById(R.id.settings_info_edit_gender);
+        settings_info_edit_school = findViewById(R.id.settings_info_edit_school);
+        settings_info_edit_xx_layout = findViewById(R.id.settings_info_edit_xx_layout);
+        settings_info_edit_height_layout = findViewById(R.id.settings_info_edit_height_layout);
+        settings_info_edit_height = findViewById(R.id.settings_info_edit_height);
         mPhotoListView = findViewById(R.id.settings_info_edit_photos);
+        mPhotoListView.setVisibility(View.GONE);
         mNickNameLayout = findViewById(R.id.settings_info_edit_nick_name_layout);
         mBirthDayLayout = findViewById(R.id.settings_info_edit_birthday_layout);
         mJobLayout = findViewById(R.id.settings_info_edit_job_layout);
@@ -243,9 +286,15 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
         mSignLayout.setOnClickListener(this);
         mConfirmButton.setOnClickListener(this);
         info_video_delete.setOnClickListener(this);
+        photosBtn.setOnClickListener(this);
+        settings_info_edit_height_layout.setOnClickListener(this);
+        settings_info_edit_xx_layout.setOnClickListener(this);
+
+        initHeightOptionPicker();
+
         videoBtn = findViewById(R.id.videoBtn);
         if (UserManager.getUserInfo().isWomen()) {
-            videoBtn.setVisibility(View.VISIBLE);
+            videoBtn.setVisibility(View.GONE);
         } else {
             videoBtn.setVisibility(View.GONE);
         }
@@ -311,6 +360,7 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
         if (!file.exists()) {
             file.mkdirs();
         }
+
     }
 
     private PermissionDialog permissionDialog;
@@ -512,15 +562,10 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
 
     // 最后一步之前检测视频和头像是否有变化
     private void editProfile(String albums) {
-        if (videoFile != null && videoUrl == null && videoCoverUrl == null) {
+        /*if (videoFile != null && videoUrl == null && videoCoverUrl == null) {
             uploadVideo(albums);
             return;
-        }
+        }*/
-        if (avatarPath != null && avatarUrl == null) {
-            //uploadAvatar
-            uploadAvatar(albums);
-            return;
-        }
         if (mUserInfo == null) {
             return;
         }
@@ -534,7 +579,9 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
         map.put("gender", mUserInfo.getGender() + "");
         map.put("avatar", avatarUrl);
         map.put("city", mCityId);
-        map.put("job", job);
+        map.put("job", mJob.getText().toString());
+        map.put("height", height);
+        map.put("school", settings_info_edit_school.getText().toString());
         map.put("birthday", mBirthDay.getText().toString());
         map.put("del_video", del_video);
         if (videoUrl != null) {
@@ -604,11 +651,26 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
         } else if (view == mConfirmButton) {
             submit();
         } else if (view == mJobLayout) {
-            pvOptions.show();
+            //pvOptions.show();
+            Intent intent = new Intent(this, PersonalJobActivity.class);
+            intent.putExtra("job", mJob.getText());
+            startActivityForResult(intent, JOB_REQUEST);
         } else if (view == mSignLayout) {
             Intent intent = new Intent(this, PersonalSignatureActivity.class);
             intent.putExtra("signature", mSign.getText());
             startActivityForResult(intent, SIGNATURE_REQUEST);
+        }else if(view == photosBtn){
+            Intent intent = new Intent(this, PhotoListTwoActivity.class);
+            if(!TextUtils.isEmpty(mOldalbum)){
+                intent.putExtra("album", mOldalbum);
+            }
+            startActivityForResult(intent,206);
+        }else if(view == settings_info_edit_xx_layout){
+            Intent intent = new Intent(this, PersonalSchoolActivity.class);
+            intent.putExtra("school", settings_info_edit_school.getText().toString());
+            startActivityForResult(intent, SCHOOL_REQUEST);
+        }else if(view == settings_info_edit_height_layout){
+            pvHeighttions.show();
         }
     }
 
@@ -636,7 +698,7 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
                 });
     }
 
-    void uploadAvatar(String albums) {
+    void uploadAvatar(String avatarPath) {
         UploadFile uploadFile = new UploadFile(System.currentTimeMillis() + ".jpg", avatarPath);
         UploadFile[] files = new UploadFile[]{uploadFile};
         DynamicsManager.uploadImage(this, files, "album",
@@ -644,7 +706,7 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
                     @Override
                     public void onSuccess(BaseActivity activity, List<UploadImageBean> result, String message) {
                         avatarUrl = result.get(0).getUrl();
-                        editProfile(albums);
+                        //editProfile(albums);
                     }
 
                     @Override
@@ -725,24 +787,29 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
      */
     private void updateData() {
         boolean hasPhoto = false;
-        for (String path : mPhotoDataList) {
+        /*for (String path : mPhotoDataList) {
             if (path.equals("") || path.equals("selector")) {
                 continue;
             }
 
+            hasPhoto = true;
+        }*/
+
+
+        if(!TextUtils.isEmpty(album)){
             hasPhoto = true;
         }
 
         if (!hasPhoto) {
             editProfile(null);
         } else {
-            new Thread(new Runnable() {
+           /* new Thread(new Runnable() {
                 @Override
                 public void run() {
                     compressAndUpload();
                 }
-            }).start();
+            }).start();*/
-
+            editProfile(album);
         }
     }
 
@@ -789,14 +856,36 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
                 int month = calendar.get(Calendar.MONTH) + 1;
                 int day = calendar.get(Calendar.DATE);
                 int year = calendar.get(Calendar.YEAR);
-                mBirthDay.setText(year + "-" + month + "-" + day + " ");
+
+                String mm = "";
+                if(String.valueOf(month).length() == 1) {
+                    mm = "0"+month;
+                }else {
+                    mm = month+"";
+                }
+
+                String dd = "";
+                if(String.valueOf(day).length() == 1) {
+                    dd = "0"+day;
+                }else {
+                    dd = day+"";
+                }
+                mBirthDay.setText(year + "-" + mm + "-" + dd);
+                int age = calculateAge(mBirthDay.getText().toString().trim());
+                String zodiac = getZodiac(mBirthDay.getText().toString().trim());
+
+                settings_info_edit_age.setText(age+"");
+                settings_info_edit_xz.setText(zodiac);
+
             }
         }).setRangDate(startCalendar, endCalendar).build();
 
         mAgePicker.setDate(endCalendar);
-        initOptionPicker();
+        //initOptionPicker();
     }
     
+    int progress = 0;
+
     public void getUserInfo() {
         SettingManager.getHomeUser(this, new HttpUiCallBack<UserHomeBean>() {
             @Override
@@ -810,7 +899,13 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
                         videoCoverImageView.setVisibility(View.VISIBLE);
                         info_video_delete.setVisibility(View.VISIBLE);
                         videoStatusLabel.setVisibility(View.GONE);
-                        videoCoverImageView.setImageURI(Constans.IMAGE_URL + result.getUserinfo().getVideo_cover_url());
+                        videoCoverImageView.setImageURI(StrU.getResourcePath(result.getUserinfo().getVideo_cover_url(), activity));
+                        /*RequestOptions requestOptions = new RequestOptions()
+                                .centerCrop()
+                                .override(100, 100);
+                        Glide.with(InfoEditActivity.this)
+                                .load(StrU.getResourcePath(result.getUserinfo().getVideo_cover_url(), InfoEditActivity.this))
+                                .apply(requestOptions).into(videoCoverImageView);*/
                         videoCoverUrl = result.getUserinfo().getVideo_cover_url();
                         videoUrl = result.getUserinfo().getVideo_url();
                     }
@@ -821,6 +916,11 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
                     //旧生日初始化
                     mOldBirthday = result.getUserinfo().getBirthday();
                     mBirthDay.setText(result.getUserinfo().getBirthday());
+                    int age = calculateAge(mOldBirthday);
+                    settings_info_edit_age.setText(age+"");
+                    String zodiac = getZodiac(mOldBirthday);
+                    settings_info_edit_xz.setText(zodiac);
+
                     //旧城市初始化
                     mOldCity = result.getUserinfo().getCity();
                     mCity.setText(result.getUserinfo().getCity());
@@ -834,15 +934,39 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
                     mNickname_tip = result.getUserinfo().getNickname_tip();
                     mEdit_nickname_tip = result.getUserinfo().getEdit_nickname_tip();
 
+                    if(result.getUserinfo().getGender() == 1) {
+                        settings_info_edit_gender.setText("女");
+                    }else {
+                        settings_info_edit_gender.setText("男");
+                    }
+
+                    mOldHeight = result.getUserinfo().getHeight()+"";
+                    if(result.getUserinfo().getHeight() > 0) {
+                        settings_info_edit_height.setText(result.getUserinfo().getHeight() + "CM");
+                    }
+
+                    mOldSchool = result.getUserinfo().getSchool();
+                    settings_info_edit_school.setText(result.getUserinfo().getSchool());
+
                     List<String> album_list = result.getUserinfo().getAlbum_list();
                     mRequestArray.addAll(album_list);
                     int size = album_list.size();
                     if (size > 0) {
+                        photosImageView.setImageURI(StrU.getResourcePath(album_list.get(0), activity));
+                        StringBuilder stringBuilder = new StringBuilder();
                         for (int i = 0; i < size; i++) {
                             mPhotoDataList.set(i, album_list.get(i));
                             mOldPhotoDataList.set(i, album_list.get(i));
 
+                            String str = album_list.get(i);
+                            stringBuilder.append(str);
+                            if (i < size - 1) {
+                                stringBuilder.append(",");
                             }
+                        }
+
+                        mOldalbum = stringBuilder.toString();
+
                         if (size < 6) {
                             mPhotoDataList.set(size, "selector");
                             mOldPhotoDataList.set(size, "selector");
@@ -852,18 +976,22 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
                     }
                 }
                 //职业
-                if (!TextUtils.isEmpty(result.getUserinfo().getJob())) {
+                /*if (!TextUtils.isEmpty(result.getUserinfo().getJob())) {
                     job = result.getUserinfo().getJob();
                 } else {
                     job = "自由职业-自由职业";
-                }
+                }*/
-                List<String> jobList = Arrays.asList(job.split("-"));
+               /* List<String> jobList = Arrays.asList(job.split("-"));
                 if (jobList.size() > 0) {
                     mJob.setText(jobList.get(jobList.size() - 1));
-                }
+                } else {
+                    mJob.setText(jobList.get(0));
+                }*/
+
+                mJob.setText(result.getUserinfo().getJob());
 
                 if (result.getIp_info() != null) {
-                    settings_info_edit_ip_city_layout.setVisibility(View.VISIBLE);
+                    settings_info_edit_ip_city_layout.setVisibility(View.GONE);
                     settings_info_edit_ip_city.setText(!TextUtils.isEmpty(result.getIp_info().getProvince()) ? result.getIp_info().getProvince() : !TextUtils.isEmpty(result.getIp_info().getCity()) ? result.getIp_info().getCity() : "未知");
                     if (mCityId == null) {
                         if (!TextUtils.isEmpty(result.getIp_info().getCity())) {
@@ -874,6 +1002,45 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
                         mCity.setText(!TextUtils.isEmpty(result.getIp_info().getProvince()) ? result.getIp_info().getProvince() : !TextUtils.isEmpty(result.getIp_info().getCity()) ? result.getIp_info().getCity() : "未知");
                     }
                 }
+
+                if(!TextUtils.isEmpty(mUserInfo.getNickname())){
+                    progress = progress + 10;
+                }
+
+                if(!TextUtils.isEmpty(mUserInfo.getAvatar())){
+                    progress = progress + 10;
+                }
+
+                if(mUserInfo.getAlbum_list() != null && mUserInfo.getAlbum_list().size() > 0){
+                    progress = progress + 10;
+                }
+
+                if(mUserInfo.getGender() == 1 || mUserInfo.getGender() == 2) {
+                    progress = progress + 10;
+                }
+                
+                if(!TextUtils.isEmpty(mUserInfo.getBirthday())){
+                    progress = progress + 20;
+                }
+
+                if(mUserInfo.getHeight() != 0){
+                    progress = progress + 10;
+                }
+
+                if(!TextUtils.isEmpty(mUserInfo.getJob())){
+                    progress = progress + 10;
+                }
+
+                if(!TextUtils.isEmpty(mUserInfo.getSchool())){
+                    progress = progress + 10;
+                }
+
+                if(!TextUtils.isEmpty(mUserInfo.getSignature())){
+                    progress = progress + 10;
+                }
+
+                tv_finish_bfb.setText(progress+"%");
+                progress_bar_bfb.setProgress(progress);
             }
 
             @Override
@@ -956,7 +1123,8 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
         } else if (requestCode == VIDEO_COVER_REQUEST) {//封面视频
             if (data != null) {
                 String videoPath = data.getStringExtra("VideoPath");
-                if (ConstUrl.LOGDEBUG)    Log.i(TAG, "onActivityResult: videoPath----------->" + videoPath);
+                if (ConstUrl.LOGDEBUG)
+                    Log.i(TAG, "onActivityResult: videoPath----------->" + videoPath);
 
                 String md5 = MD5.getStreamMD5(videoPath);
                 String filename = md5 + "." + FileUtil.getExtensionName(videoPath);
@@ -1009,6 +1177,29 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
                 isSignature = true;
                 mSign.setText(city);
             }
+        }else if (requestCode == JOB_REQUEST && resultCode == RESULT_OK) {
+            if (null != data) {
+                String job = data.getStringExtra("job");
+                isJob = true;
+                mJob.setText(job);
+            }
+        }else if (requestCode == SCHOOL_REQUEST && resultCode == RESULT_OK) {
+            if (null != data) {
+                String school = data.getStringExtra("school");
+                isSchool = true;
+                settings_info_edit_school.setText(school);
+            }
+        }else if(requestCode == 206){
+            if(data != null) {
+                album = data.getStringExtra("album");
+                mOldalbum = album;
+                if(!TextUtils.isEmpty(album) && album.contains(",")) {
+                    String[] split = album.split(",");
+                    if (split.length > 0) {
+                        photosImageView.setImageURI(ConstUrl.IMAGE_URL + split[0]);
+                    }
+                }
+            }
         }
     }
 
@@ -1018,6 +1209,7 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
             this.avatarPath = path;
             avatarUrl = null;
             avatarImageView.setImageURI("file://" + this.avatarPath);
+            uploadAvatar(avatarPath);
             return;
         }
         if (null != path && !TextUtils.isEmpty(path)) {
@@ -1060,15 +1252,24 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
     }
 
     private boolean isSignature = false;
+    private boolean isJob = false;
+    private boolean isSchool = false;
 
     private void isChange() {
-        boolean isPhoto = photoChange(mPhotoDataList, mOldPhotoDataList);
+        boolean isPhoto = !TextUtils.isEmpty(album);//photoChange(mPhotoDataList, mOldPhotoDataList);
         boolean isName = mOldNickName.equals(mNickName.getText());
         boolean isBirthday = mOldBirthday.equals(mBirthDay.getText());
-        boolean isCity = mOldCity.equals(mCity.getText());
+        //boolean isCity = mOldCity.equals(mCity.getText());
         boolean avatarChange = TextUtils.isEmpty(avatarPath);
-        boolean isJob = TextUtils.equals(mOldJob, job);
+        String height = "";
-        if (isName && isBirthday && isCity && avatarChange && isJob && videoFile == null && !isSignature) {  //没有改变
+        if(TextUtils.isEmpty(settings_info_edit_height.getText().toString())){
+            height = "0CM";
+        }else {
+            height = settings_info_edit_height.getText().toString();
+        }
+        boolean isHeight = mOldHeight.equals(height.replace("CM",""));
+        //boolean isSchool = mOldSchool.equals(settings_info_edit_school.getText().toString());
+        if (isName && isBirthday && isHeight && avatarChange && !isJob && !isSchool && videoFile == null && !isSignature) {  //没有改变
             if (!isPhoto) {
                 finish();
             } else {
@@ -1114,21 +1315,21 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
     private List<String> options1Items = new ArrayList<>();
     private ArrayList<ArrayList<String>> options2Items = new ArrayList<>();
 
-    private void initOptionPicker() {//条件选择器初始化
+   /* private void initOptionPicker() {//条件选择器初始化
         options1Items.clear();
         options2Items.clear();
         String s = SysSPUtils.getString(this, ConsUser.PROFILE);
         Gson gson = new Gson();
         GlobalConfigBean.ProfileBean bean = gson.fromJson(s, GlobalConfigBean.ProfileBean.class);
-        if(bean != null && bean.getJob_list().size() > 0) {
+        if (bean != null && bean.getJob_list().size() > 0) {
             for (int i = 0; i < bean.getJob_list().size(); i++) {
                 options1Items.add(bean.getJob_list().get(i).getName());
                 options2Items.add(bean.getJob_list().get(i).getMenu());
             }
         }
-        /**
+        *//**
          * 注意 ：如果是三级联动的数据(省市区等)，请参照 JsonDataActivity 类里面的写法。
-         */
+         *//*
         pvOptions = new OptionsPickerBuilder(this, new OnOptionsSelectListener() {
             @Override
             public void onOptionsSelect(int options1, int options2, int options3, View v) {
@@ -1158,7 +1359,95 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
         if (options1Items.size() > 0 && options2Items.size() > 0) {
             pvOptions.setPicker(options1Items, options2Items);//二级选择器
         }
+    }*/
+
+
+    @SuppressLint("NewApi")
+    public int calculateAge(String birthDateString) {
+        LocalDate birthDate = LocalDate.parse(birthDateString, FORMATTER);
+        LocalDate today = LocalDate.now();
+        int age = Period.between(birthDate, today).getYears();
+        return age;
     }
+
+
+    @SuppressLint("NewApi")
+    private final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+    @SuppressLint("NewApi")
+    public String getZodiac(String birthDateString) {
+        LocalDate birthDate = LocalDate.parse(birthDateString, FORMATTER);
+        int month = birthDate.getMonthValue();
+        int day = birthDate.getDayOfMonth();
+
+        String chinese;
+        if ((month == 1 && day >= 20) || (month == 2 && day <= 18)) {
+            chinese = "水瓶座";
+        } else if ((month == 2 && day >= 19) || (month == 3 && day <= 20)) {
+            chinese = "双鱼座";
+        } else if ((month == 3 && day >= 21) || (month == 4 && day <= 19)) {
+            chinese = "白羊座";
+        } else if ((month == 4 && day >= 20) || (month == 5 && day <= 20)) {
+            chinese = "金牛座";
+        } else if ((month == 5 && day >= 21) || (month == 6 && day <= 20)) {
+            chinese = "双子座";
+        } else if ((month == 6 && day >= 21) || (month == 7 && day <= 22)) {
+            chinese = "巨蟹座";
+        } else if ((month == 7 && day >= 23) || (month == 8 && day <= 22)) {
+            chinese = "狮子座";
+        } else if ((month == 8 && day >= 23) || (month == 9 && day <= 22)) {
+            chinese = "处女座";
+        } else if ((month == 9 && day >= 23) || (month == 10 && day <= 22)) {
+            chinese = "天秤座";
+        } else if ((month == 10 && day >= 23) || (month == 11 && day <= 21)) {
+            chinese = "天蝎座";
+        } else if ((month == 11 && day >= 22) || (month == 12 && day <= 21)) {
+            chinese = "射手座";
+        } else {
+            chinese = "摩羯座";
+        }
+        return chinese;
+    }
+
+    public List<String> heightLists=new ArrayList<>();
+    private OptionsPickerView pvHeighttions;
+
+    private void initHeightOptionPicker() {//条件选择器初始化
+        heightLists.clear();
+        for (int i = 160; i < 191; i++) {
+            heightLists.add(i+"CM");
+        }
+        /**
+         * 注意 ：如果是三级联动的数据(省市区等)，请参照 JsonDataActivity 类里面的写法。
+         */
+        pvHeighttions = new OptionsPickerBuilder(this, new OnOptionsSelectListener() {
+            @Override
+            public void onOptionsSelect(int options1, int options2, int options3, View v) {
+                //返回的分别是三个级别的选中位置
+                if (heightLists.size() > 0) {
+                    String occupation = heightLists.get(options1);
+                    settings_info_edit_height.setText(occupation);
+                    height = heightLists.get(options1).replace("CM","");
+                }
+            }
+        })
+                .setTitleText("身高")
+                .setSelectOptions(0, 0)//默认选中项
+                .setTitleBgColor(Color.WHITE)
+                .isRestoreItem(true)//切换时是否还原，设置默认选中第一项。
+                .isCenterLabel(false) //是否只显示中间选中项的label文字，false则每项item全部都带有label。
+                .setOptionsSelectChangeListener(new OnOptionsSelectChangeListener() {
+                    @Override
+                    public void onOptionsSelectChanged(int options1, int options2, int options3) {
+                        String str = "options1: " + options1 + "\noptions2: " + options2 + "\noptions3: " + options3;
+                        //Toast.makeText(MainActivity.this, str, Toast.LENGTH_SHORT).show();
+                    }
+                })
+                .build();
+
+        if (heightLists.size() > 0) {
+            pvHeighttions.setPicker(heightLists);//二级选择器
+        }
+    }
+
 }
-
-

app/src/main/java/com/xuebiping/bolizhuzi/view/settings/InvitationActivity.java

@@ -6,6 +6,7 @@ import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -43,6 +44,7 @@ public class InvitationActivity extends BaseActivity implements
     private List<String> posterList;
     private TextView tv_zg;
     private TextView tv_my_fc_bl;
+    private TextView tv_rule_txt;
 
 
     @Override
@@ -50,8 +52,15 @@ public class InvitationActivity extends BaseActivity implements
         super.onCreate(onSavedInstance);
         binding = ActivityInvitationBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
-        setDefaultTitle();
+//        setDefaultTitle();
-        setTitleName("邀请好友");
+//        setTitleName("邀请好友");
+        setRightCustomTextTitle("邀请好友", "邀请明细", new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(InvitationActivity.this, InviteListActivity.class);
+                startActivity(intent);
+            }
+        });
 //        View lin = binding.holderView;
 //        ImageView bgImageView = findViewById(R.id.bgImageView);
 //        lin.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
@@ -81,6 +90,7 @@ public class InvitationActivity extends BaseActivity implements
 
         tv_zg = findViewById(R.id.tv_zg);
         tv_my_fc_bl = findViewById(R.id.tv_my_fc_bl);
+        tv_rule_txt = findViewById(R.id.tv_rule_txt);
 
         mShareDialog = new BottomShareDialog(this, R.style.SelectiveDialog);
         mShareDialog.setOnButtonSelectListener(this);
@@ -99,7 +109,7 @@ public class InvitationActivity extends BaseActivity implements
                 startActivity(intent);
             }
         });
-        binding.shareLinkBtn.setOnClickListener(new View.OnClickListener() {
+        binding.shareLinkBtn2.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 mShareDialog.show();
@@ -116,7 +126,7 @@ public class InvitationActivity extends BaseActivity implements
             binding.tvManTip.setVisibility(View.GONE);
             binding.menTip1.setVisibility(View.GONE);
         }
-        binding.sharePosterBtn.setOnClickListener(new View.OnClickListener() {
+        binding.sharePosterBtn2.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 showPoster();
@@ -212,14 +222,16 @@ public class InvitationActivity extends BaseActivity implements
                 binding.firstLabel.setText(result.getReward().getFirst());
                 binding.secondLabel.setText(result.getReward().getSecond());
                 binding.thirdLabel.setText(result.getReward().getThird());
-                //TODO 需要接口返回准确数据
+                tv_zg.setText("最高" + result.getMax_divide() +"分成");
-                tv_zg.setText("最高" + result.getReward().getFour() +"分成");
+                tv_my_fc_bl.setText(result.getPermanent_divide());
-                tv_my_fc_bl.setText(result.getReward().getThird());
                 binding.fourLabel.setText(result.getReward().getFour() + "");
                 posterList = result.getAvatar_list();
                 binding.totalPeopleLabel.setText(result.getTotal().getTotal_invite() + "");
-                binding.totalRewardLabel.setText(result.getTotal().getRecharge_count() + "");
+                binding.totalRewardLabel.setText(result.getTotal().getTotal_commission_coin() + "");
                 binding.totalTiChengLabel.setText(result.getTotal().getAuth_count() + "");
+
+                tv_rule_txt.setText(result.getInvite_rule());
+
                 mShareData = result.getShare();
                 qrImageUrl = ConstUrl.IMAGE_URL + result.getQrcode();
                 if (result.getShow_invite_list() == 1) {

app/src/main/java/com/xuebiping/bolizhuzi/view/settings/PersonalJobActivity.java

@@ -0,0 +1,102 @@
+package com.xuebiping.bolizhuzi.view.settings;
+
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.fengliyan.uikit.dialog.BaseMessageDialog;
+import com.xuebiping.bolizhuzi.R;
+import com.xuebiping.bolizhuzi.utils.StrU;
+import com.xuebiping.bolizhuzi.view.base.BaseActivity;
+
+public class PersonalJobActivity extends BaseActivity implements View.OnClickListener {
+    private RelativeLayout tv_finish;
+    private TextView tv_save;
+    private EditText et_signature;
+    private TextView tv_text_num;
+
+    @Override
+    public void onCreate(Bundle onSavedInstance) {
+        super.onCreate(onSavedInstance);
+        setContentView(R.layout.activity_personal_job);
+        hideTitleBar();
+        initView();
+        et_signature.setText(getIntent().getStringExtra("job"));
+        et_signature.setSelection(et_signature.getText().length());
+    }
+
+    private void initView() {
+        tv_finish = findViewById(R.id.rl_finish);
+        tv_save = findViewById(R.id.tv_save);
+        et_signature = findViewById(R.id.nick_name_edit_input);
+        tv_text_num = findViewById(R.id.tv_text_num);
+
+        tv_finish.setOnClickListener(this);
+        tv_save.setOnClickListener(this);
+        et_signature.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                //tv_text_num.setText(et_signature.getText().toString().length() + "/20");
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+
+            }
+        });
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (view == tv_finish) {
+            saveDialog();
+        } else if (view == tv_save) {
+            String signature = et_signature.getText().toString();
+            setResult(RESULT_OK, new Intent().putExtra("job", signature));
+            finish();
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        saveDialog();
+    }
+
+    private BaseMessageDialog saveDialog;
+
+    public void saveDialog() {
+        if (!StrU.isEmpty(et_signature.getText().toString())) {
+            saveDialog = new BaseMessageDialog.Builder(this).setMessage("是否保存？")
+                    .setCancelable(true)
+                    .setPositiveButtonListener(new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialogInterface, int i) {
+                            saveDialog.dismiss();
+                            String signature = et_signature.getText().toString();
+                            setResult(RESULT_OK, new Intent().putExtra("job", signature));
+                            finish();
+                        }
+                    }).setNegative("取消").setNegativeButtonListener(new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialogInterface, int i) {
+                            saveDialog.dismiss();
+                            finish();
+                        }
+                    }).build();
+            saveDialog.show();
+        } else {
+            finish();
+        }
+    }
+}

app/src/main/java/com/xuebiping/bolizhuzi/view/settings/PersonalSchoolActivity.java

@@ -0,0 +1,102 @@
+package com.xuebiping.bolizhuzi.view.settings;
+
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.fengliyan.uikit.dialog.BaseMessageDialog;
+import com.xuebiping.bolizhuzi.R;
+import com.xuebiping.bolizhuzi.utils.StrU;
+import com.xuebiping.bolizhuzi.view.base.BaseActivity;
+
+public class PersonalSchoolActivity extends BaseActivity implements View.OnClickListener {
+    private RelativeLayout tv_finish;
+    private TextView tv_save;
+    private EditText et_signature;
+    private TextView tv_text_num;
+
+    @Override
+    public void onCreate(Bundle onSavedInstance) {
+        super.onCreate(onSavedInstance);
+        setContentView(R.layout.activity_personal_school);
+        hideTitleBar();
+        initView();
+        et_signature.setText(getIntent().getStringExtra("school"));
+        et_signature.setSelection(et_signature.getText().length());
+    }
+
+    private void initView() {
+        tv_finish = findViewById(R.id.rl_finish);
+        tv_save = findViewById(R.id.tv_save);
+        et_signature = findViewById(R.id.nick_name_edit_input);
+        tv_text_num = findViewById(R.id.tv_text_num);
+
+        tv_finish.setOnClickListener(this);
+        tv_save.setOnClickListener(this);
+        et_signature.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                //tv_text_num.setText(et_signature.getText().toString().length() + "/20");
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+
+            }
+        });
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (view == tv_finish) {
+            saveDialog();
+        } else if (view == tv_save) {
+            String signature = et_signature.getText().toString();
+            setResult(RESULT_OK, new Intent().putExtra("school", signature));
+            finish();
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        saveDialog();
+    }
+
+    private BaseMessageDialog saveDialog;
+
+    public void saveDialog() {
+        if (!StrU.isEmpty(et_signature.getText().toString())) {
+            saveDialog = new BaseMessageDialog.Builder(this).setMessage("是否保存？")
+                    .setCancelable(true)
+                    .setPositiveButtonListener(new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialogInterface, int i) {
+                            saveDialog.dismiss();
+                            String signature = et_signature.getText().toString();
+                            setResult(RESULT_OK, new Intent().putExtra("school", signature));
+                            finish();
+                        }
+                    }).setNegative("取消").setNegativeButtonListener(new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialogInterface, int i) {
+                            saveDialog.dismiss();
+                            finish();
+                        }
+                    }).build();
+            saveDialog.show();
+        } else {
+            finish();
+        }
+    }
+}

app/src/main/java/com/xuebiping/bolizhuzi/view/settings/PersonalSignatureActivity.java

@@ -46,7 +46,7 @@ public class PersonalSignatureActivity extends BaseActivity implements View.OnCl
 
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
-                tv_text_num.setText(et_signature.getText().toString().length() + "/20");
+                //tv_text_num.setText(et_signature.getText().toString().length() + "/20");
             }
 
             @Override

app/src/main/java/com/xuebiping/bolizhuzi/view/settings/PhotoListTwoActivity.java

@@ -0,0 +1,469 @@
+package com.xuebiping.bolizhuzi.view.settings;
+
+import android.Manifest;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.fengliyan.http.httprequest.UploadFile;
+import com.fengliyan.uikit.photopicker.MultiImageSelector;
+import com.fengliyan.uikit.sketch.SketchImageView;
+import com.fengliyan.uikit.toast.MaleToast;
+import com.hjq.permissions.OnPermissionCallback;
+import com.hjq.permissions.XXPermissions;
+import com.xuebiping.bolizhuzi.R;
+import com.xuebiping.bolizhuzi.controller.constant.Constant;
+import com.xuebiping.bolizhuzi.controller.dynamics.manager.DynamicsManager;
+import com.xuebiping.bolizhuzi.controller.settings.adapter.InfoEditPhotoRecyclerAdapter;
+import com.xuebiping.bolizhuzi.controller.settings.manager.SettingManager;
+import com.xuebiping.bolizhuzi.controller.settings.manager.UserAvatarManager;
+import com.xuebiping.bolizhuzi.model.dynamics.UploadImageBean;
+import com.xuebiping.bolizhuzi.utils.PermissionUtil;
+import com.xuebiping.bolizhuzi.utils.SimpleItemTouchCallBack;
+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.ImageUtils;
+import com.xuebiping.bolizhuzi.view.diooto.Diooto;
+import com.xuebiping.bolizhuzi.view.diooto.config.DiootoConfig;
+import com.xuebiping.bolizhuzi.view.diooto.tools.Utils;
+import com.xuebiping.bolizhuzi.view.main.dialog.CustomAlertDialog;
+import com.xuebiping.bolizhuzi.view.main.dialog.PermissionDialog;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+public class PhotoListTwoActivity extends BaseActivity implements UserAvatarManager.UserImgListener {
+
+    private RecyclerView mPhotoListView;
+    private InfoEditPhotoRecyclerAdapter mPhotoAdapter;
+
+    private String[] permissions = {Manifest.permission.READ_EXTERNAL_STORAGE,
+            Manifest.permission.WRITE_EXTERNAL_STORAGE,
+            Manifest.permission.READ_PHONE_STATE};
+
+    private List<String> mPhotoDataList = new ArrayList<String>() {
+        {
+            add("selector");
+            add("");
+            add("");
+            add("");
+            add("");
+            add("");
+            add("");
+            add("");
+            add("");
+        }
+    };
+
+    private List<String> mOldPhotoDataList = new ArrayList<String>() {
+        {
+            add("selector");
+            add("");
+            add("");
+            add("");
+            add("");
+            add("");
+            add("");
+            add("");
+            add("");
+        }
+    };
+
+    private MultiImageSelector mSelector;
+    private PermissionDialog permissionDialog;
+
+    private UserAvatarManager mManager;
+    public static final int MULTI_SELECTOR_REQUEST = 200;
+    private HashMap<Integer, Integer> photoListIndexMap;
+    private StringBuilder mImages;
+    private String album;
+    private List<String> albumList=new ArrayList<>();
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_photo_list_two);
+        setTitleName("相册");
+
+        mSelector = MultiImageSelector.create().multi().count(9);
+
+        mManager = new UserAvatarManager(this);
+
+        Intent intent = getIntent();
+        album = intent.getStringExtra("album");
+
+        if(!TextUtils.isEmpty(album)) {
+            if(album.contains(",")){
+                String[] split = album.split(",");
+                if(split.length > 0) {
+                    for (int i = 0; i < split.length; i++) {
+                        albumList.add(split[i]);
+                    }
+                }
+            }else {
+                albumList.add(album);
+            }
+        }
+
+        initView();
+
+    }
+
+    private void initView() {
+        mPhotoListView = findViewById(R.id.rv_list);
+
+        mPhotoListView.setLayoutManager(new GridLayoutManager(this, 3));
+        mPhotoListView.setNestedScrollingEnabled(false);
+        ViewGroup.LayoutParams layoutParams = mPhotoListView.getLayoutParams();
+        layoutParams.height = Utils.dip2px(this, 360);
+        mPhotoListView.setLayoutParams(layoutParams);
+
+        mPhotoAdapter = new InfoEditPhotoRecyclerAdapter(this);
+        mPhotoAdapter.setPhotoList(mPhotoDataList);
+        mPhotoAdapter.setOnSelectorClickedListener(new InfoEditPhotoRecyclerAdapter
+                .OnSelectorClickedListener() {
+            @Override
+            public void onSelectorClicked() {
+                checkPermission(2);
+            }
+
+            @Override
+            public void onClickImage(List<String> mPhotoList, int position) {
+                if (null != mPhotoList && mPhotoList.size() != 0) {
+                    List<String> imageUrl = new ArrayList<>();
+                    for (String imagePath : mPhotoList) {
+                        if (!TextUtils.isEmpty(imagePath) && !imagePath.equals("selector")) {
+                            if (imagePath.contains("uploads/")) {
+                                imageUrl.add(StrU.getResourcePath(imagePath, PhotoListTwoActivity.this));
+                            } else {
+                                imageUrl.add("file://" + imagePath);
+                            }
+                        }
+                    }
+                    clickImage((ArrayList<String>) imageUrl, position);
+                }
+            }
+        });
+        mPhotoListView.setAdapter(mPhotoAdapter);
+        // 拖拽移动和左滑删除
+        SimpleItemTouchCallBack simpleItemTouchCallBack = new SimpleItemTouchCallBack(mPhotoAdapter);
+        ItemTouchHelper helper = new ItemTouchHelper(simpleItemTouchCallBack);
+        helper.attachToRecyclerView(mPhotoListView);
+
+        findViewById(R.id.submit_button).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                //这里需要调接口上传 提交
+                updateData();
+            }
+        });
+
+        int size = albumList.size();
+        if (size > 0) {
+            for (int i = 0; i < size; i++) {
+                mPhotoDataList.set(i, albumList.get(i));
+                mOldPhotoDataList.set(i, albumList.get(i));
+
+            }
+            if (size < 9) {
+                mPhotoDataList.set(size, "selector");
+                mOldPhotoDataList.set(size, "selector");
+            }
+            mPhotoAdapter.setPhotoList(mPhotoDataList);
+            mPhotoAdapter.notifyDataSetChanged();
+        }
+    }
+
+    /**
+     * @param type 0.封面视频 1.头像 2.相册
+     */
+    private void checkPermission(int type) {
+        permissionDialog = new PermissionDialog(PhotoListTwoActivity.this, permissions);
+        permissionDialog.show();
+        XXPermissions.with(PhotoListTwoActivity.this)
+                .permission(permissions)
+                .request(new OnPermissionCallback() {
+                    @Override
+                    public void onGranted(List<String> permissions, boolean all) {
+                        if (all) {
+                            permissionDialog.dismiss();
+                            startImageSelector();
+                        }
+                    }
+
+                    @Override
+                    public void onDenied(List<String> permissions, boolean never) {
+                        if (never) {
+                            CustomAlertDialog customAlertDialog = new CustomAlertDialog(PhotoListTwoActivity.this);
+                            customAlertDialog.setTitle("芊颜需要开启读写权限，以便查看本地图库内容");
+                            customAlertDialog.hideContent(true);
+                            customAlertDialog.setRightBtnText("去开启");
+                            customAlertDialog.setRightOnClickListener(new CustomAlertDialog.OnDialogRightClickListener() {
+                                @Override
+                                public void rightClick() {
+                                    PermissionUtil.jumpPermissionPage(PhotoListTwoActivity.this);
+                                }
+                            });
+                            customAlertDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+                                @Override
+                                public void onDismiss(DialogInterface dialog) {
+                                    permissionDialog.dismiss();
+                                }
+                            });
+                            customAlertDialog.show();
+                        } else {
+                            permissionDialog.dismiss();
+                        }
+                    }
+                });
+    }
+
+    /**
+     * 跳到图片展示页
+     *
+     * @param pathList
+     * @param innerCount
+     */
+    private void clickImage(ArrayList<String> pathList, int innerCount) {
+        String[] strings = new String[pathList.size()];
+        for (int i = 0; i < pathList.size(); i++) {
+            strings[i] = pathList.get(i);
+        }
+        Diooto diooto = new Diooto(this)
+                .urls(strings)
+                .type(DiootoConfig.PHOTO)
+                .immersive(true)
+                .position(innerCount, 0)
+                .views(mPhotoListView, R.id.info_edit_photo_normal, pathList.size())
+                .loadPhotoBeforeShowBigImage(new Diooto.OnLoadPhotoBeforeShowBigImageListener() {
+                    @Override
+                    public void loadView(SketchImageView sketchImageView, int position) {
+                        sketchImageView.setOnLongClickListener(new View.OnLongClickListener() {
+                            @Override
+                            public boolean onLongClick(View v) {
+                                return false;
+                            }
+                        });
+                    }
+                })
+                .start();
+    }
+
+    public void startImageSelector() {
+        mSelector.multi();
+        mSelector.count(1);
+        mSelector.start(this, MULTI_SELECTOR_REQUEST);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+//        if (isChooseVideo) {
+//            helper.onGetLocalVideoResult(data);
+//            return;
+//        }
+        super.onActivityResult(requestCode, resultCode, data);
+        if (mManager != null) {
+            mManager.onActivityResult(requestCode, resultCode, data);
+        }
+        if (requestCode == MULTI_SELECTOR_REQUEST && resultCode == RESULT_OK) {
+            List<String> albumList = data.getStringArrayListExtra(MultiImageSelector.EXTRA_RESULT);
+            String s = "file://" + albumList.get(0);
+            mManager.whoStartCropWithUi(Uri.parse(s));
+        }
+    }
+
+    @Override
+    public void getUserImg(@Nullable final String path) {
+        if (null != path && !TextUtils.isEmpty(path)) {
+            List<String> albumList = new ArrayList<>();
+
+            albumList.add(path);
+
+            for (int i = 0; i < albumList.size(); i++) {
+                if (8 - i >= 0) {
+                    mPhotoDataList.remove(8 - i);
+                }
+            }
+
+            int realSize = 0;
+            for (int i = 0; i < mPhotoDataList.size(); i++) {
+                if (!"".equals(mPhotoDataList.get(i)) && !"selector".equals(mPhotoDataList.get(i))) {
+                    realSize++;
+                }
+            }
+
+            mPhotoDataList.addAll(realSize, albumList);
+            mPhotoAdapter.notifyDataSetChanged();
+        }
+    }
+
+    /**
+     * 更新数据
+     */
+    private void updateData() {
+        boolean hasPhoto = false;
+        for (String path : mPhotoDataList) {
+            if (path.equals("") || path.equals("selector")) {
+                continue;
+            }
+
+            hasPhoto = true;
+        }
+
+        if (!hasPhoto) {
+            //editProfile(null);
+            finishActivity();
+        } else {
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    compressAndUpload();
+                }
+            }).start();
+
+        }
+    }
+
+    private void compressAndUpload() {
+        List<String> photoList = mPhotoAdapter.getmPhotoList();
+        Iterator<String> i = photoList.iterator();
+        int realSize = 0;
+        int currentListCount = 9;
+        photoListIndexMap = new HashMap<>();
+        for (int index = 0; index < photoList.size(); index++) {
+            String path = photoList.get(index);
+            if ("selector".equals(path)) {
+                currentListCount = index;
+            }
+            if ("".equals(path) || "selector".equals(path) || path.contains("uploads/")) {
+                continue;
+            }
+            photoListIndexMap.put(realSize, index);
+            realSize++;
+        }
+
+        final UploadFile[] uploadFiles = new UploadFile[realSize];
+        int count = 0;
+        while (i.hasNext()) {
+            String path = i.next();
+            if ("".equals(path) || "selector".equals(path) || path.contains("uploads/")) {
+                continue;
+            }
+            path = ImageUtils.compressImage(this, path, Constant.IMAGE_MEMORY_SIZE, true);
+            File file = new File(path);
+            UploadFile uploadFile = new UploadFile("file[" + count + "]", file);
+            uploadFiles[count] = uploadFile;
+            count++;
+        }
+
+        if (null != uploadFiles) {
+            if (uploadFiles.length != 0) {
+                if (uploadFiles[0].getFile().exists()) {
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            uploadImage(uploadFiles);
+                        }
+                    });
+                }
+            } else {
+                mImages = new StringBuilder();
+                for (int i1 = 0; i1 < currentListCount; i1++) {
+                    String str = photoList.get(i1);
+                    if (TextUtils.isEmpty(str) || "selector".equals(str)) {
+                        continue;
+                    }
+                    mImages.append(str);
+                    if (i1 < currentListCount - 1) {
+                        mImages.append(",");
+                    }
+                }
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        finishActivity();
+                    }
+                });
+            }
+        }
+    }
+
+    private void uploadImage(final UploadFile[] uploadFiles) {
+        DynamicsManager.uploadImage(this, uploadFiles, "album",
+                new HttpUiCallBack<List<UploadImageBean>>() {
+                    @Override
+                    public void onSuccess(BaseActivity activity, List<UploadImageBean> result, String message) {
+                        mImages = new StringBuilder();
+                        List<String> photoList = mPhotoAdapter.getmPhotoList();
+                        for (int i = 0; i < result.size(); i++) {
+                            Integer integer = photoListIndexMap.get(i);
+                            photoList.set(integer, result.get(i).getUrl());
+                        }
+
+                        for (int i = 0; i < photoList.size(); i++) {
+                            String str = photoList.get(i);
+                            if (TextUtils.isEmpty(str) || "selector".equals(str)) {
+                                continue;
+                            }
+                            mImages.append(str);
+                            if (i < photoList.size() - 1) {
+                                mImages.append(",");
+                            }
+                        }
+
+                        photoListIndexMap.clear();
+
+                        //上传成功后删掉本地图片
+                        new Thread(new Runnable() {
+                            @Override
+                            public void run() {
+                                for (UploadFile uploadFile : uploadFiles) {
+                                    File file = uploadFile.getFile();
+                                    if (file.exists()) {
+                                        file.delete();
+                                    }
+                                }
+                            }
+                        }).start();
+
+                        finishActivity();
+                    }
+
+                    @Override
+                    public void onFailure(BaseActivity activity, String tip) {
+                        MaleToast.showMessage(activity, tip);
+                    }
+
+                    @Override
+                    public void onException(BaseActivity activity, Throwable e) {
+                        MaleToast.showMessage(activity, "图片上传失败");
+                    }
+                });
+    }
+
+
+    @Override
+    public void finishActivity() {
+        Intent intent = new Intent();
+        if(mImages != null) {
+            intent.putExtra("album",mImages.toString());
+        }else {
+            intent.putExtra("album",album);
+        }
+        setResult(206,intent);
+        finish();
+    }
+}

app/src/main/java/com/xuebiping/bolizhuzi/view/settings/RealNameTwoActivity.java

@@ -137,8 +137,6 @@ public class RealNameTwoActivity extends BaseActivity implements UserAvatarManag
             @Override
             public void onClick(View view) {
                 if (checkIsEnable()) {
-                    //TODO 调接口提交
-
                     if (TextUtils.isEmpty(ed_name.getText().toString().trim())) {
                         ToastHelper.showToast(RealNameTwoActivity.this, "请输入真实姓名");
                         return;

app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment2.java

@@ -13,6 +13,7 @@ import android.view.ViewGroup;
 import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.Switch;
 import android.widget.TextView;
@@ -57,6 +58,7 @@ import com.xuebiping.bolizhuzi.view.base.BaseActivity;
 import com.xuebiping.bolizhuzi.view.base.BaseApplication;
 import com.xuebiping.bolizhuzi.view.base.BaseWebViewActivity;
 import com.xuebiping.bolizhuzi.view.base.utils.HttpUiCallBack;
+import com.xuebiping.bolizhuzi.view.main.MainActivity;
 import com.xuebiping.bolizhuzi.view.main.MainPageActivity;
 import com.xuebiping.bolizhuzi.view.main.dialog.ShaiXuanDialog;
 import com.xuebiping.bolizhuzi.view.rank.ZhiRankActivity;
@@ -131,6 +133,11 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener {
     private String mUsercode;
     private TextView mTv_go_open;
     private int mDo_not_disturb;
+    private ProgressBar mPb_intimacy;
+    private TextView mTv_jy_level;
+    private RelativeLayout rl_level;
+    private ImageView iv_level;
+    private TextView tv_level;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -201,6 +208,13 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener {
         ll_mine_video_chat = v.findViewById(R.id.ll_mine_video_chat);
         mTv_go_open = v.findViewById(R.id.tv_go_open);
 
+        rl_level = v.findViewById(R.id.rl_level);
+        iv_level = v.findViewById(R.id.iv_level);
+        tv_level = v.findViewById(R.id.tv_level);
+
+        mPb_intimacy = v.findViewById(R.id.pb_intimacy);
+        mTv_jy_level = v.findViewById(R.id.tv_jy_level);
+
         rl_user_info.setOnClickListener(this);
         ll_go_edit_layout.setOnClickListener(this);
         tv_go_homepage.setOnClickListener(this);
@@ -264,6 +278,55 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener {
                 tv_age.setText(result.getUserinfo().getAge() + "");
                 mUsercode = result.getUserinfo().getUsercode();
                 tv_qingyu_id.setText("ID:" + mUsercode);
+
+                int level = result.getUserinfo().getLevel();
+
+                tv_level.setText(level + "");
+                if (result.getUserinfo().getGender() == 1) {
+                    if (level > 0 && level <= 15) {
+                        rl_level.setBackgroundResource(R.mipmap.ic_modle_bg1);
+                        iv_level.setImageResource(R.mipmap.ic_modle_1);
+                    } else if (level > 15 && level <= 30) {
+                        rl_level.setBackgroundResource(R.mipmap.ic_modle_bg2);
+                        iv_level.setImageResource(R.mipmap.ic_modle_2);
+                    } else if (level > 30 && level <= 45) {
+                        rl_level.setBackgroundResource(R.mipmap.ic_modle_bg3);
+                        iv_level.setImageResource(R.mipmap.ic_modle_3);
+                    } else if (level > 45 && level <= 60) {
+                        rl_level.setBackgroundResource(R.mipmap.ic_modle_bg4);
+                        iv_level.setImageResource(R.mipmap.ic_modle_4);
+                    } else if (level > 60 && level <= 75) {
+                        rl_level.setBackgroundResource(R.mipmap.ic_modle_bg5);
+                        iv_level.setImageResource(R.mipmap.ic_modle_5);
+                    } else {
+                        rl_level.setBackgroundResource(R.mipmap.ic_modle_bg6);
+                        iv_level.setImageResource(R.mipmap.ic_modle_6);
+                    }
+                }else {
+                    if (level > 0 && level <= 15) {
+                        rl_level.setBackgroundResource(R.mipmap.ic_use_bg1);
+                        iv_level.setImageResource(R.mipmap.ic_use_1);
+                    } else if (level > 15 && level <= 30) {
+                        rl_level.setBackgroundResource(R.mipmap.ic_use_bg2);
+                        iv_level.setImageResource(R.mipmap.ic_use_2);
+                    } else if (level > 30 && level <= 45) {
+                        rl_level.setBackgroundResource(R.mipmap.ic_use_bg3);
+                        iv_level.setImageResource(R.mipmap.ic_use_3);
+                    } else if (level > 45 && level <= 60) {
+                        rl_level.setBackgroundResource(R.mipmap.ic_use_bg4);
+                        iv_level.setImageResource(R.mipmap.ic_use_4);
+                    } else if (level > 60 && level <= 75) {
+                        rl_level.setBackgroundResource(R.mipmap.ic_use_bg5);
+                        iv_level.setImageResource(R.mipmap.ic_use_5);
+                    } else {
+                        rl_level.setBackgroundResource(R.mipmap.ic_use_bg6);
+                        iv_level.setImageResource(R.mipmap.ic_use_6);
+                    }
+                }
+
+                mPb_intimacy.setProgress(result.getUserinfo().getLevel_percent());
+                mTv_jy_level.setText("距下一级还差" + result.getUserinfo().getNext_level_diff_wealth_value() + "财富值");
+
                 //1=超级会员 0=普通会员 2=没有会员
                 if (0 == result.getUserinfo().getVip()) {
                     isVip = true;
@@ -329,7 +392,11 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener {
                 mOptions1.add(SettingOptions.WALLET);
                 mOptions1.add(SettingOptions.TASK);
                 mOptions1.add(SettingOptions.MYMYINTIMACY);
+
+                if (result.getUserinfo().getGender() == 1) {
                     mOptions1.add(SettingOptions.UPAUTH);
+                }
+
                 mOptions1.add(SettingOptions.CUSTOMER);
                 mOptions1.add(SettingOptions.BEAUTY);
                 mOptions1.add(SettingOptions.SETTING);
@@ -444,6 +511,15 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener {
                     public void onSuccess(BaseActivity activity, MainPageAnchorBean result, String message) {
                         mDo_not_disturb = result.getDo_not_disturb();
 
+                        if (null != getActivity()) {
+                            MainActivity mainActivity = (MainActivity) getActivity();
+
+                            if (null != mainActivity) {
+                                mainActivity.getMainDisturb(mDo_not_disturb);
+                            }
+                        }
+
+
                         if (mDo_not_disturb == 1) {  //已开启勿扰模式
                             MaleToast.showMessage(activity, "勿扰模式开启成功");
                         }else {
@@ -679,10 +755,12 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener {
                     mLogo.setImageResource(R.drawable.ic_my_guide);
                     mName.setText("用户指南");
                     view.setOnClickListener(view14 -> {
-                        if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) {
+//                        if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) {
+//                            Intent intent = new Intent(getActivity(), UseCentreActivity.class);
+//                            startActivity(intent);
+//                        }
                         Intent intent = new Intent(getActivity(), UseCentreActivity.class);
                         startActivity(intent);
-                        }
                     });
                     break;
 
@@ -694,11 +772,14 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener {
                     }
                     mName.setText("账单明细");
                     view.setOnClickListener(view16 -> {
-                        if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) {
+//                        if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) {
+//                            Intent intent = new Intent(getActivity(), BillActivity.class);
+//                            intent.putExtra("type", 0);
+//                            startActivity(intent);
+//                        }
                         Intent intent = new Intent(getActivity(), BillActivity.class);
                         intent.putExtra("type", 0);
                         startActivity(intent);
-                        }
                     });
                     break;
                 case GODDESSPRIVILEGE:
@@ -707,11 +788,12 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener {
                     tv_option_hint2.setVisibility(View.GONE);
                     mArrow.setVisibility(View.VISIBLE);
                     mLogo.setImageResource(R.mipmap.ic_my_ntequan);
-                    mName.setText("up主认证");
+                    mName.setText("女神特权");
                     view.setOnClickListener(view19 -> {
-                        if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) {
+//                        if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) {
+//                            startActivity(new Intent(getActivity(), GoddessPrivilegeActivity.class));
+//                        }
                         startActivity(new Intent(getActivity(), GoddessPrivilegeActivity.class));
-                        }
                     });
                     break;
                 case VIOLATION:
@@ -722,11 +804,14 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener {
                     mLogo.setImageResource(R.mipmap.ic_wd_weigui);
                     mName.setText("违规公布");
                     view.setOnClickListener(view110 -> {
-                        if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) {
+//                        if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) {
+//                            Intent intent = new Intent(getActivity(), BaseWebViewActivity.class);
+//                            intent.putExtra("ClickUrl", ConstUrl.FORBID_LIST);
+//                            startActivity(intent);
+//                        }
                         Intent intent = new Intent(getActivity(), BaseWebViewActivity.class);
                         intent.putExtra("ClickUrl", ConstUrl.FORBID_LIST);
                         startActivity(intent);
-                        }
                     });
                     break;
                 case ADDWECHAT:
@@ -737,10 +822,12 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener {
                     mLogo.setImageResource(R.mipmap.ic_wd_addwechat);
                     mName.setText("微信设置");
                     view.setOnClickListener(view111 -> {
-                        if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) {
+//                        if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) {
+//                            Intent intent = new Intent(getActivity(), WXAccountActivity.class);
+//                            startActivity(intent);
+//                        }
                         Intent intent = new Intent(getActivity(), WXAccountActivity.class);
                         startActivity(intent);
-                        }
                     });
                     break;
                 case HELLOW:
@@ -751,9 +838,10 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener {
                     mLogo.setImageResource(R.mipmap.ic_wd_hellow_set);
                     mName.setText("招呼设置");
                     view.setOnClickListener(view112 -> {
-                        if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) {
+//                        if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) {
+//                            startActivity(new Intent(getActivity(), GreetingSettingActivity.class));
+//                        }
                         startActivity(new Intent(getActivity(), GreetingSettingActivity.class));
-                        }
                     });
                     break;
                 case ITEMS:
@@ -764,9 +852,10 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener {
                     mLogo.setImageResource(R.mipmap.ic_wd_items1);
                     mName.setText("红包卡券");
                     view.setOnClickListener(view113 -> {
-                        if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) {
+//                        if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) {
+//                            startActivity(new Intent(getActivity(), MyItemsActivity.class));
+//                        }
                         startActivity(new Intent(getActivity(), MyItemsActivity.class));
-                        }
                     });
                     break;
 

app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SuperMember2Fragment.java

@@ -189,11 +189,11 @@ public class SuperMember2Fragment extends Fragment implements View.OnClickListen
                         tv_member_open.setText("立即开通");
                     }
 
-                    if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 1) {
+//                    if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 1) {
-                        lin_member_bottom_btn.setVisibility(View.GONE);
+//                        lin_member_bottom_btn.setVisibility(View.GONE);
-                        tv_member_open.setVisibility(View.VISIBLE);
+//                        tv_member_open.setVisibility(View.VISIBLE);
-                        tv_member_open.setText("邀请好友开通");
+//                        tv_member_open.setText("邀请好友开通");
-                    }
+//                    }
 
                     List<MemberInfoList> list = result.getInfo().getList();
                     if (list != null && list.size() > 0) {
@@ -337,10 +337,23 @@ public class SuperMember2Fragment extends Fragment implements View.OnClickListen
             }
             showPay(goodsId);
         } else if (v == tv_member_open) {
-            if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 1) {
+//            if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 1) {
-                Intent intent = new Intent(getContext(), InvitationActivity.class);
+//                Intent intent = new Intent(getContext(), InvitationActivity.class);
-                startActivity(intent);
+//                startActivity(intent);
-            } else {
+//            } else {
+//                if (defaultType == 1) {
+//                    goodsId = goodsId2;
+//                    price = price2;
+//                } else if (defaultType == 2) {
+//                    goodsId = goodsId3;
+//                    price = price3;
+//                } else {
+//                    goodsId = goodsId1;
+//                    price = price1;
+//                }
+//                showPay(goodsId);
+//            }
+
             if (defaultType == 1) {
                 goodsId = goodsId2;
                 price = price2;
@@ -354,7 +367,6 @@ public class SuperMember2Fragment extends Fragment implements View.OnClickListen
             showPay(goodsId);
         }
     }
-    }
 
     /**
      * 支付方式

app/src/main/java/com/xuebiping/bolizhuzi/view/settings/UpPrivilegeActivity.java

@@ -34,6 +34,7 @@ import com.bigkoo.pickerview.view.TimePickerView;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.fengliyan.http.httprequest.UploadFile;
 import com.fengliyan.uikit.photopicker.MultiImageSelector;
+import com.fengliyan.uikit.title.Title;
 import com.fengliyan.uikit.toast.MaleToast;
 import com.google.gson.Gson;
 import com.hjq.permissions.OnPermissionCallback;
@@ -95,10 +96,11 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
     private RelativeLayout rl_tiz_layout;
     private RelativeLayout rl_xz_layout;
     private RelativeLayout rl_city_layout;
+    private TextView mRight;
     private PermissionDialog permissionDialog;
 
     private TimePickerView mAgePicker;
-    private String[] permissions = {Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.READ_PHONE_STATE};
+    private String[] permissions = {Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_PHONE_STATE};
 
     public static final int MULTI_SELECTOR_REQUEST = 200;
     public static final int VIDEO_COVER_REQUEST = 501;//封面视频
@@ -169,18 +171,38 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_up_privilege);
 
-        setRightCustomTextTitle("UP主认证", "准则", new View.OnClickListener() {
+//        setRightCustomTextTitle("UP主认证", "准则", new View.OnClickListener() {
-            @Override
+//            @Override
-            public void onClick(View view) {
+//            public void onClick(View view) {
+//
+//            }
+//        });
 
-            }
+        initTitle();
-        });
 
         mManager = new UserAvatarManager(this);
 
         initView();
     }
 
+    private void initTitle() {
+        setTitleName("UP主认证");
+        Title title = getCustomTitle();
+        mRight = (TextView) title.findViewById(R.id.right_text);
+        mRight.setText("准则");
+        mRight.setTextColor(getResources().getColor(R.color.mainColor));
+        mRight.setVisibility(View.VISIBLE);
+        mRight.setTextSize(17);
+        mRight.setEnabled(true);
+        mRight.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                MaleToast.showMessage(UpPrivilegeActivity.this, "开发中");
+            }
+        });
+
+    }
+
     private void initView() {
         rl_avatar_layout = findViewById(R.id.rl_avatar_layout);
         sd_avatar = findViewById(R.id.sd_avatar);
@@ -255,7 +277,7 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
 
             @Override
             public void afterTextChanged(Editable editable) {
-                if(editable.length() > 0) {
+                if (editable.length() > 0) {
                     up_auth_saveSign(editable.toString());
                 }
             }
@@ -274,7 +296,7 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
 
             @Override
             public void afterTextChanged(Editable editable) {
-                if(editable.length() > 0) {
+                if (editable.length() > 0) {
                     up_auth_saveJob(editable.toString());
                 }
             }
@@ -282,14 +304,14 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
 
     }
 
-    public void up_auth_detail(){
+    public void up_auth_detail() {
         SettingManager.up_auth_detail(this, new HttpUiCallBack<UpAuthDetailBean>() {
 
             @Override
             public void onSuccess(BaseActivity activity, UpAuthDetailBean result, String tips) {
-                if(result != null) {
+                if (result != null) {
                     formDTO = result.getForm();
-                    if(formDTO != null) {
+                    if (formDTO != null) {
                         sd_avatar.setImageURI(ConstUrl.IMAGE_URL + formDTO.getAvatar());
                         //sd_avatar.setImageURI("http://oss.jindashengkj.cn/uploads/album/202604/02/c0b2434c43939911a34f5dffb03f2101_.pic.jpg");
 
@@ -301,7 +323,7 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
 
                         avatarUrl = formDTO.getAvatar();
 
-                        sd_video_cover.setImageURI(ConstUrl.IMAGE_URL + formDTO.getVideo_url());
+                        sd_video_cover.setImageURI(ConstUrl.IMAGE_URL + formDTO.getVideo_cover_url());
                         video_verify_code = formDTO.getVideo_verify_code();
                         video_verify_text = formDTO.getVideo_verify_text();
 
@@ -316,51 +338,51 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
 
                         gender = formDTO.getGender();
 
-                        if(!TextUtils.isEmpty(formDTO.getBirthday())){
+                        if (!TextUtils.isEmpty(formDTO.getBirthday())) {
                             tv_birthday.setText(formDTO.getBirthday());
                         }
 
-                        if(formDTO.getWeight() > 0) {
+                        if (formDTO.getWeight() > 0) {
                             tizhong = formDTO.getWeight() + "KG";
-                            tv_tiz.setText(formDTO.getWeight()+"KG");
+                            tv_tiz.setText(formDTO.getWeight() + "KG");
                         }
 
-                        if(formDTO.getHeight() > 0) {
+                        if (formDTO.getHeight() > 0) {
-                            height = formDTO.getHeight() +"CM";
+                            height = formDTO.getHeight() + "CM";
-                            tv_height.setText(formDTO.getHeight()+"CM");
+                            tv_height.setText(formDTO.getHeight() + "CM");
                         }
 
-                        if(formDTO.getBust() > 0) {
+                        if (formDTO.getBust() > 0) {
-                            bust = formDTO.getBust()+"";
+                            bust = formDTO.getBust() + "";
                         }
 
-                        if(formDTO.getWaist() > 0) {
+                        if (formDTO.getWaist() > 0) {
                             waist = formDTO.getWaist() + "";
                         }
 
-                        if(formDTO.getHip() > 0) {
+                        if (formDTO.getHip() > 0) {
                             hip = formDTO.getHip() + "";
                         }
                         tv_sanwei.setText(formDTO.getBust() + " " + formDTO.getWaist() + " " + formDTO.getHip());
 
-                        if(!TextUtils.isEmpty(formDTO.getConstellation())){
+                        if (!TextUtils.isEmpty(formDTO.getConstellation())) {
                             xingzuo = formDTO.getConstellation();
                             tv_xz.setText(formDTO.getConstellation());
                         }
 
-                        if(!TextUtils.isEmpty(formDTO.getCity_name())){
+                        if (!TextUtils.isEmpty(formDTO.getCity_name())) {
-                            mCityId = formDTO.getCity_id()+"";
+                            mCityId = formDTO.getCity_id() + "";
                             tv_city.setText(formDTO.getCity_name());
                         }
 
-                        if(!TextUtils.isEmpty(formDTO.getWechat_no())){
+                        if (!TextUtils.isEmpty(formDTO.getWechat_no())) {
                             wxCode = formDTO.getWechat_no();
                             tv_wxcode.setText(formDTO.getWechat_no());
                         }
 
                         List<String> album_images = formDTO.getAlbum_images();
-                        if(album_images != null && album_images.size() > 0) {
+                        if (album_images != null && album_images.size() > 0) {
-                            album = album_images.toString().replace("]","").replace("[","");
+                            album = album_images.toString().replace("]", "").replace("[", "");
                             //Log.i("TAG666","相册 - == "+ album);
                             sd_photo.setImageURI(ConstUrl.IMAGE_URL + album_images.get(0));
                         }
@@ -370,43 +392,44 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
                     }
 
                     UpAuthDetailBean.SectionStatusDTO section_status = result.getSection_status();
-                    if(section_status != null) {
+                    if (section_status != null) {
                         UpAuthDetailBean.SectionStatusDTO.IdentityDTO identity = section_status.getIdentity();
                         tv_card.setText(identity.getText());
-                        if(identity.getStatus() == 2) {
+                        if (identity.getStatus() == 2) {
                             rl_card_layout.setEnabled(false);
-                        }else {
+                        } else {
                             rl_card_layout.setEnabled(true);
                         }
                     }
 
                     UpAuthDetailBean.SectionStatusDTO.VideoCoverDTO video_cover = section_status.getVideo_cover();
-                    if(video_cover != null) {
+                    if (video_cover != null) {
-                        if(video_cover.getStatus() == 2) {
+                        if (video_cover.getStatus() == 2) {
                             rl_video_cover_layout.setEnabled(false);
-                        }else {
+                        } else {
                             rl_video_cover_layout.setEnabled(true);
                         }
                     }
 
                     UpAuthDetailBean.SectionStatusDTO.VideoVerifyDTO video_verify = section_status.getVideo_verify();
-                    if(video_verify != null) {
+                    if (video_verify != null) {
-                        tv_video_rz.setText(video_cover.getText());
+                        tv_video_rz.setText(video_verify.getText());
-                        if(video_verify.getStatus() == 2) {
+                        if (video_verify.getStatus() == 2) {
                             rl_video_rz_layout.setEnabled(false);
-                        }else {
+                        } else {
                             rl_video_rz_layout.setEnabled(true);
                         }
                     }
 
 
-                    if(result.getStatus() == 2) {  //当前已审核通过
+                    if (result.getStatus() == 2) {  //当前已审核通过
                         submit_button.setText("已通过");
                         btnStatus(false);
-                    }if(result.getStatus() == 1) {
+                    }
+                    if (result.getStatus() == 1) {
                         submit_button.setText("审核中");
                         btnStatus(false);
-                    }else {
+                    } else {
                         btnStatus(true);
                     }
                 }
@@ -424,7 +447,7 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
         });
     }
 
-    public void btnStatus(boolean status){
+    public void btnStatus(boolean status) {
         tv_nikename.setEnabled(status);
         tv_sign.setEnabled(status);
         tv_zybq.setEnabled(status);
@@ -453,136 +476,134 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
             pvGenderttions.show();
         } else if (view.getId() == R.id.rl_cover_layout) {
             Intent intent = new Intent(this, UploadPhotoCoverActivity.class);
-            if(formDTO != null) {
+            if (formDTO != null) {
-                intent.putExtra("cover",formDTO.getCover_image());
+                intent.putExtra("cover", formDTO.getCover_image());
             }
-            startActivityForResult(intent,202);
+            startActivityForResult(intent, 202);
         } else if (view.getId() == R.id.rl_card_layout) {
             Intent intent = new Intent(this, RealNameTwoActivity.class);
-            if(formDTO != null) {
+            if (formDTO != null) {
-                intent.putExtra("real_name",formDTO.getReal_name());
+                intent.putExtra("real_name", formDTO.getReal_name());
-                intent.putExtra("ic_card_no",formDTO.getId_card_no());
+                intent.putExtra("ic_card_no", formDTO.getId_card_no());
-                intent.putExtra("ic_card_front",formDTO.getId_card_front());
+                intent.putExtra("ic_card_front", formDTO.getId_card_front());
-                intent.putExtra("ic_card_back",formDTO.getId_card_back());
+                intent.putExtra("ic_card_back", formDTO.getId_card_back());
-                intent.putExtra("ic_card_hold",formDTO.getId_card_hold());
+                intent.putExtra("ic_card_hold", formDTO.getId_card_hold());
             }
-            startActivityForResult(intent,203);
+            startActivityForResult(intent, 203);
         } else if (view.getId() == R.id.rl_video_rz_layout) {
             Intent intent = new Intent(this, VideoRenzhengActivity.class);
-            intent.putExtra("video_code",video_verify_code);
+            intent.putExtra("video_code", video_verify_code);
-            intent.putExtra("video_text",video_verify_text);
+            intent.putExtra("video_text", video_verify_text);
-            startActivityForResult(intent,204);
+            startActivityForResult(intent, 204);
         } else if (view.getId() == R.id.rl_birthday_layout) {
             mAgePicker.show();
         } else if (view.getId() == R.id.rl_wxcode_layout) {
             Intent intent = new Intent(this, WxCodeActivity.class);
-            if(formDTO != null) {
+            intent.putExtra("wxCode", wxCode);
-                intent.putExtra("wxCode",formDTO.getWechat_no());
-            }
             startActivityForResult(intent, 205);
         } else if (view.getId() == R.id.rl_sanwei_layout) {
             pvSanWeittions.show();
         } else if (view.getId() == R.id.rl_photo_layout) {
             Intent intent = new Intent(this, PhotoListActivity.class);
-            if(formDTO != null) {
+            if (formDTO != null) {
                 intent.putStringArrayListExtra("album", (ArrayList<String>) formDTO.getAlbum_images());
             }
-            startActivityForResult(intent,206);
+            startActivityForResult(intent, 206);
-        }else if (view.getId() == R.id.rl_height_layout) {
+        } else if (view.getId() == R.id.rl_height_layout) {
             pvHeighttions.show();
-        }else if (view.getId() == R.id.rl_tiz_layout) {
+        } else if (view.getId() == R.id.rl_tiz_layout) {
             pvTiZhongttions.show();
-        }else if (view.getId() == R.id.rl_xz_layout) {
+        } else if (view.getId() == R.id.rl_xz_layout) {
             pvXingZuottions.show();
-        }else if (view.getId() == R.id.rl_video_cover_layout) {
+        } else if (view.getId() == R.id.rl_video_cover_layout) {
             checkPermission(0);
-        }else if (view.getId() == R.id.rl_city_layout) {
+        } else if (view.getId() == R.id.rl_city_layout) {
             Intent intent = new Intent(this, CityPickerActivity.class);
             startActivityForResult(intent, 1001);
-        }else if (view.getId() == R.id.submit_button) {
+        } else if (view.getId() == R.id.submit_button) {
             //这个调提交接口
-            if(TextUtils.isEmpty(tv_nikename.getText().toString())){
+            if (TextUtils.isEmpty(tv_nikename.getText().toString())) {
-                ToastHelper.showToast(this,"未输入昵称");
+                ToastHelper.showToast(this, "未输入昵称");
                 return;
             }
 
-            if(TextUtils.isEmpty(avatarUrl)){
+            if (TextUtils.isEmpty(avatarUrl)) {
-                ToastHelper.showToast(this,"未上传头像");
+                ToastHelper.showToast(this, "未上传头像");
                 return;
             }
 
-            if(TextUtils.isEmpty(tv_sign.getText().toString().trim())){
+            if (TextUtils.isEmpty(tv_sign.getText().toString().trim())) {
-                ToastHelper.showToast(this,"未输入签名");
+                ToastHelper.showToast(this, "未输入签名");
                 return;
             }
 
-            if(TextUtils.isEmpty(tv_gender.getText().toString().trim())){
+            if (TextUtils.isEmpty(tv_gender.getText().toString().trim())) {
-                ToastHelper.showToast(this,"未选择性别");
+                ToastHelper.showToast(this, "未选择性别");
                 return;
             }
 
-            if(TextUtils.isEmpty(tv_zybq.getText().toString().trim())){
+            if (TextUtils.isEmpty(tv_zybq.getText().toString().trim())) {
-                ToastHelper.showToast(this,"未输入职业标签");
+                ToastHelper.showToast(this, "未输入职业标签");
                 return;
             }
 
-            if(TextUtils.isEmpty(cover)){
+            if (TextUtils.isEmpty(cover)) {
-                ToastHelper.showToast(this,"未选择封面图");
+                ToastHelper.showToast(this, "未选择封面图");
                 return;
             }
 
-            if(TextUtils.isEmpty(real_name)){
+            if (TextUtils.isEmpty(real_name)) {
-                ToastHelper.showToast(this,"未进行身份认证");
+                ToastHelper.showToast(this, "未进行身份认证");
                 return;
             }
 
-            if(TextUtils.isEmpty(videoRzUrl)){
+            if (TextUtils.isEmpty(videoRzUrl)) {
-                ToastHelper.showToast(this,"未进行视频认证");
+                ToastHelper.showToast(this, "未进行视频认证");
                 return;
             }
 
-            if(TextUtils.isEmpty(tv_birthday.getText().toString().trim())){
+            if (TextUtils.isEmpty(tv_birthday.getText().toString().trim())) {
-                ToastHelper.showToast(this,"未选择出生日期");
+                ToastHelper.showToast(this, "未选择出生日期");
                 return;
             }
 
-            if(TextUtils.isEmpty(wxCode)){
+            if (TextUtils.isEmpty(wxCode)) {
-                ToastHelper.showToast(this,"未添加微信号");
+                ToastHelper.showToast(this, "未添加微信号");
                 return;
             }
 
-            if(TextUtils.isEmpty(sanwwei)){
+            if (TextUtils.isEmpty(sanwwei)) {
-                ToastHelper.showToast(this,"未填写三围信息");
+                ToastHelper.showToast(this, "未填写三围信息");
                 return;
             }
 
-            if(TextUtils.isEmpty(album)){
+            if (TextUtils.isEmpty(album)) {
-                ToastHelper.showToast(this,"未上传相册");
+                ToastHelper.showToast(this, "未上传相册");
                 return;
             }
 
-            if(TextUtils.isEmpty(videoCoverUrl)){
+            if (TextUtils.isEmpty(videoCoverUrl)) {
-                ToastHelper.showToast(this,"未上传视频信息");
+                ToastHelper.showToast(this, "未上传视频信息");
                 return;
             }
 
-            if(TextUtils.isEmpty(height)){
+            if (TextUtils.isEmpty(height)) {
-                ToastHelper.showToast(this,"未填写身高");
+                ToastHelper.showToast(this, "未填写身高");
                 return;
             }
 
-            if(TextUtils.isEmpty(tizhong)){
+            if (TextUtils.isEmpty(tizhong)) {
-                ToastHelper.showToast(this,"未填写体重");
+                ToastHelper.showToast(this, "未填写体重");
                 return;
             }
 
-            if(TextUtils.isEmpty(xingzuo)){
+            if (TextUtils.isEmpty(xingzuo)) {
-                ToastHelper.showToast(this,"未填写星座");
+                ToastHelper.showToast(this, "未填写星座");
                 return;
             }
 
-            if(TextUtils.isEmpty(tv_city.getText().toString().trim())){
+            if (TextUtils.isEmpty(tv_city.getText().toString().trim())) {
-                ToastHelper.showToast(this,"未填写城市");
+                ToastHelper.showToast(this, "未填写城市");
                 return;
             }
 
@@ -734,40 +755,44 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
                             }
                         });
             }
-        }else if(requestCode == 202){  //上传封面图返回
+        } else if (requestCode == 202) {  //上传封面图返回
-            //TODO
+            if (data != null) {
-            if(data != null) {
-                String pathcover = data.getStringExtra("cover");
                 cover = data.getStringExtra("upload_cover");
-                sd_cover.setImageURI("file://" + pathcover);
+                if(!TextUtils.isEmpty(cover)) {
+                    sd_cover.setImageURI("file://" + cover);
+                    up_auth_detail();
                 }
-        }else if(requestCode == 203){ //修改身份认证状态
+            }
-            //TODO
+        } else if (requestCode == 203) { //修改身份认证状态
-            if(data != null) {
+            if (data != null) {
                 id_card_front = data.getStringExtra("id_card_front");
                 id_card_back = data.getStringExtra("id_card_back");
                 id_card_hold = data.getStringExtra("id_card_hold");
                 real_name = data.getStringExtra("real_name");
                 id_card_no = data.getStringExtra("id_card_no");
+                if (!TextUtils.isEmpty(id_card_no)
+                        && !TextUtils.isEmpty(real_name)
+                        && !TextUtils.isEmpty(id_card_front)
+                        && !TextUtils.isEmpty(id_card_back)
+                        && !TextUtils.isEmpty(id_card_hold))
                     tv_card.setText("已填写");
             }
-        }else if(requestCode == 204){ //视频认证结果
+        } else if (requestCode == 204) { //视频认证结果
-            //TODO
+            if (data != null) {
-            if(data != null) {
                 videoRzUrl = data.getStringExtra("videoUrl");
-                if(!TextUtils.isEmpty(videoRzUrl)){
+                if (!TextUtils.isEmpty(videoRzUrl)) {
                     tv_video_rz.setText("已填写");
                 }
             }
-        }else if(requestCode == 205){
+        } else if (requestCode == 205) {
-            if(data != null) {
+            if (data != null) {
                 wxCode = data.getStringExtra("wxCode");
                 tv_wxcode.setText(wxCode);
             }
-        }else if(requestCode == 206){
+        } else if (requestCode == 206) {
-            if(data != null) {
+            if (data != null) {
                 album = data.getStringExtra("album");
-                if(!TextUtils.isEmpty(album) && album.contains(",")) {
+                if (!TextUtils.isEmpty(album) && album.contains(",")) {
                     String[] split = album.split(",");
                     if (split.length > 0) {
                         sd_photo.setImageURI(ConstUrl.IMAGE_URL + split[0]);
@@ -830,12 +855,12 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
         }
     }
 
-    public List<String> heightLists=new ArrayList<>();
+    public List<String> heightLists = new ArrayList<>();
 
     private void initHeightOptionPicker() {//条件选择器初始化
         heightLists.clear();
         for (int i = 160; i < 191; i++) {
-            heightLists.add(i+"CM");
+            heightLists.add(i + "CM");
         }
         /**
          * 注意 ：如果是三级联动的数据(省市区等)，请参照 JsonDataActivity 类里面的写法。
@@ -871,12 +896,12 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
         }
     }
 
-    public List<String> tiZhongLists=new ArrayList<>();
+    public List<String> tiZhongLists = new ArrayList<>();
 
     private void initTiZhongOptionPicker() {//条件选择器初始化
         tiZhongLists.clear();
         for (int i = 40; i < 71; i++) {
-            tiZhongLists.add(i+"KG");
+            tiZhongLists.add(i + "KG");
         }
         /**
          * 注意 ：如果是三级联动的数据(省市区等)，请参照 JsonDataActivity 类里面的写法。
@@ -913,7 +938,7 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
     }
 
     private void initXingZuoOptionPicker() {//条件选择器初始化
-        List<String> xzuoLists=new ArrayList<>();
+        List<String> xzuoLists = new ArrayList<>();
         xzuoLists.clear();
         xzuoLists.add("水瓶座");
         xzuoLists.add("双鱼座");
@@ -962,17 +987,17 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
     }
 
     private void initSanWeiOptionPicker() {//条件选择器初始化
-        List<String> xwLists=new ArrayList<>();
+        List<String> xwLists = new ArrayList<>();
-        List<String> ywLists=new ArrayList<>();
+        List<String> ywLists = new ArrayList<>();
-        List<String> twLists=new ArrayList<>();
+        List<String> twLists = new ArrayList<>();
         for (int i = 70; i < 106; i++) {
-            xwLists.add(i+"");
+            xwLists.add(i + "");
         }
         for (int i = 50; i < 81; i++) {
-            ywLists.add(i+"");
+            ywLists.add(i + "");
         }
         for (int i = 80; i < 100; i++) {
-            twLists.add(i+"");
+            twLists.add(i + "");
         }
 
         /**
@@ -982,15 +1007,15 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
             @Override
             public void onOptionsSelect(int options1, int options2, int options3, View v) {
                 //返回的分别是三个级别的选中位置
-                if (xwLists.size() > 0 && ywLists.size()> 0 && twLists.size() > 0) {
+                if (xwLists.size() > 0 && ywLists.size() > 0 && twLists.size() > 0) {
                     String occupation = xwLists.get(options1);
-                    tv_sanwei.setText(occupation + " " + ywLists.get(options2) +" " + twLists.get(options3));
+                    tv_sanwei.setText(occupation + " " + ywLists.get(options2) + " " + twLists.get(options3));
-                    sanwwei = xwLists.get(options1) + " " + ywLists.get(options2) +" " + twLists.get(options3);
+                    sanwwei = xwLists.get(options1) + " " + ywLists.get(options2) + " " + twLists.get(options3);
                     bust = xwLists.get(options1);
                     waist = ywLists.get(options2);
                     hip = twLists.get(options3);
 
-                    up_auth_saveSanwei(bust,waist,hip);
+                    up_auth_saveSanwei(bust, waist, hip);
                 }
             }
         })
@@ -1008,13 +1033,13 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
                 })
                 .build();
 
-        if (xwLists.size() > 0 && ywLists.size()> 0 && twLists.size() > 0) {
+        if (xwLists.size() > 0 && ywLists.size() > 0 && twLists.size() > 0) {
-            pvSanWeittions.setNPicker(xwLists,ywLists,twLists);//二级选择器
+            pvSanWeittions.setNPicker(xwLists, ywLists, twLists);//二级选择器
         }
     }
 
     private void initGenderOptionPicker() {//条件选择器初始化
-        List<String> genderLists=new ArrayList<>();
+        List<String> genderLists = new ArrayList<>();
         genderLists.clear();
         genderLists.add("男");
         genderLists.add("女");
@@ -1077,14 +1102,14 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
                         String waist,
                         String hip,
                         String constellation,
-                         String city_id){
+                        String city_id) {
         SettingManager.up_auth_submit(this, avatar, nickname, signature, gender, job, cover_image, real_name,
                 id_card_no, id_card_front, id_card_back, id_card_hold, video_verify_code,
                 video_verify_text, video_verify_video, birthday, wechat_no, album_images, video_cover_url, video_url, height,
                 weight, bust, waist, hip, constellation, city_id, new HttpUiCallBack<Object>() {
                     @Override
                     public void onSuccess(BaseActivity activity, Object result, String tips) {
-                        ToastHelper.showToast(UpPrivilegeActivity.this,"UP主认证已提交");
+                        ToastHelper.showToast(UpPrivilegeActivity.this, "UP主认证已提交");
                         finishActivity();
                     }
 
@@ -1112,8 +1137,8 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
                             videoCoverUrl = result.get(0).getUrl();
                         }
 
-                        if(!TextUtils.isEmpty(videoCoverUrl) && !TextUtils.isEmpty(videoCoverPath)){
+                        if (!TextUtils.isEmpty(videoCoverUrl) && !TextUtils.isEmpty(videoCoverPath)) {
-                            up_auth_saveVideoCover(videoCoverUrl,videoCoverPath);
+                            up_auth_saveVideoCover(videoCoverUrl, videoCoverPath);
                         }
                     }
 
@@ -1140,8 +1165,8 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
                             videoCoverPath = result.get(0).getUrl();
                         }
 
-                        if(!TextUtils.isEmpty(videoCoverUrl) && !TextUtils.isEmpty(videoCoverPath)){
+                        if (!TextUtils.isEmpty(videoCoverUrl) && !TextUtils.isEmpty(videoCoverPath)) {
-                            up_auth_saveVideoCover(videoCoverUrl,videoCoverPath);
+                            up_auth_saveVideoCover(videoCoverUrl, videoCoverPath);
                         }
                     }
 
@@ -1157,7 +1182,7 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
                 });
     }
 
-    void up_auth_saveVideoCover(String video_cover_url,String video_url){
+    void up_auth_saveVideoCover(String video_cover_url, String video_url) {
         SettingManager.up_auth_saveVideoCover(this, video_cover_url, video_url, new HttpUiCallBack<Object>() {
             @Override
             public void onSuccess(BaseActivity activity, Object result, String tips) {
@@ -1202,8 +1227,8 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
                 });
     }
 
-    void up_auth_saveAvatar(String avatar){
+    void up_auth_saveAvatar(String avatar) {
-        SettingManager.up_auth_saveAvatar(this, avatar,new HttpUiCallBack<Object>() {
+        SettingManager.up_auth_saveAvatar(this, avatar, new HttpUiCallBack<Object>() {
             @Override
             public void onSuccess(BaseActivity activity, Object result, String tips) {
 
@@ -1221,8 +1246,8 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
         });
     }
 
-    void up_auth_saveSanwei(String bust,String waist,String hip){
+    void up_auth_saveSanwei(String bust, String waist, String hip) {
-        SettingManager.up_auth_saveSanwei(this, bust,waist,hip,new HttpUiCallBack<Object>() {
+        SettingManager.up_auth_saveSanwei(this, bust, waist, hip, new HttpUiCallBack<Object>() {
             @Override
             public void onSuccess(BaseActivity activity, Object result, String tips) {
 
@@ -1240,8 +1265,8 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
         });
     }
 
-    void up_auth_saveHeight(String height){
+    void up_auth_saveHeight(String height) {
-        SettingManager.up_auth_saveHeight(this, height,new HttpUiCallBack<Object>() {
+        SettingManager.up_auth_saveHeight(this, height, new HttpUiCallBack<Object>() {
             @Override
             public void onSuccess(BaseActivity activity, Object result, String tips) {
 
@@ -1259,8 +1284,8 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
         });
     }
 
-    void up_auth_saveWeight(String weight){
+    void up_auth_saveWeight(String weight) {
-        SettingManager.up_auth_saveWeight(this, weight,new HttpUiCallBack<Object>() {
+        SettingManager.up_auth_saveWeight(this, weight, new HttpUiCallBack<Object>() {
             @Override
             public void onSuccess(BaseActivity activity, Object result, String tips) {
 
@@ -1278,8 +1303,8 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
         });
     }
 
-    void up_auth_saveConstellation(String constellation){
+    void up_auth_saveConstellation(String constellation) {
-        SettingManager.up_auth_saveConstellation(this, constellation,new HttpUiCallBack<Object>() {
+        SettingManager.up_auth_saveConstellation(this, constellation, new HttpUiCallBack<Object>() {
             @Override
             public void onSuccess(BaseActivity activity, Object result, String tips) {
 
@@ -1297,8 +1322,8 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
         });
     }
 
-    void up_auth_saveCity(String city){
+    void up_auth_saveCity(String city) {
-        SettingManager.up_auth_saveCity(this, city,new HttpUiCallBack<Object>() {
+        SettingManager.up_auth_saveCity(this, city, new HttpUiCallBack<Object>() {
             @Override
             public void onSuccess(BaseActivity activity, Object result, String tips) {
 
@@ -1316,8 +1341,8 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
         });
     }
 
-    void up_auth_saveSign(String sign){
+    void up_auth_saveSign(String sign) {
-        SettingManager.up_auth_saveSign(this, sign,new HttpUiCallBack<Object>() {
+        SettingManager.up_auth_saveSign(this, sign, new HttpUiCallBack<Object>() {
             @Override
             public void onSuccess(BaseActivity activity, Object result, String tips) {
 
@@ -1335,8 +1360,8 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis
         });
     }
 
-    void up_auth_saveJob(String job){
+    void up_auth_saveJob(String job) {
-        SettingManager.up_auth_saveJob(this, job,new HttpUiCallBack<Object>() {
+        SettingManager.up_auth_saveJob(this, job, new HttpUiCallBack<Object>() {
             @Override
             public void onSuccess(BaseActivity activity, Object result, String tips) {
 

app/src/main/java/com/xuebiping/bolizhuzi/view/settings/UploadPhotoCoverActivity.java

@@ -94,7 +94,6 @@ public class UploadPhotoCoverActivity extends BaseActivity implements UserAvatar
         submit_button.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                //TODO 做上传操作并返回前个界面
 
                 if (TextUtils.isEmpty(avatarPath)) {
                     MaleToast.showMessage(UploadPhotoCoverActivity.this, "未上传封面图");
@@ -183,7 +182,6 @@ public class UploadPhotoCoverActivity extends BaseActivity implements UserAvatar
     @Override
     public void finishActivity() {
         Intent intent = new Intent();
-        intent.putExtra("cover", avatarPath);
         intent.putExtra("upload_cover", avatarUrl);
         setResult(202, intent);
         finish();

app/src/main/java/com/xuebiping/bolizhuzi/view/settings/WxCodeActivity.java

@@ -60,30 +60,46 @@ public class WxCodeActivity extends BaseActivity implements View.OnClickListener
     @Override
     public void finishActivity() {
 //        super.finishActivity();
-        if(TextUtils.isEmpty(mNickNameEdit.getText())){
+        /*if(TextUtils.isEmpty(mNickNameEdit.getText())){
             MaleToast.showMessage(WxCodeActivity.this, "输入你的微信号");
-        }else {
+        }else {*/
+        if(!TextUtils.isEmpty(mName)) {
             if (mName.equals(mNickNameEdit.getText().toString())) {  //相等
                 finish();
-            }else {
+            } else {
                 saveDialog();
             }
+        }else{
+            if(!TextUtils.isEmpty(mNickNameEdit.getText().toString())){
+                saveDialog();
+            }else {
+                finish();
             }
         }
+       // }
+    }
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if(keyCode ==KeyEvent.KEYCODE_BACK){
 
-            if(TextUtils.isEmpty(mNickNameEdit.getText())){
+            /*if(TextUtils.isEmpty(mNickNameEdit.getText())){
                 MaleToast.showMessage(WxCodeActivity.this, "输入你的微信号");
-            }else {
+            }else {*/
+            if(!TextUtils.isEmpty(mName)) {
                 if (mName.equals(mNickNameEdit.getText().toString())) {  //相等
                     finish();
-                }else {
+                } else {
                     saveDialog();
                 }
+            }else{
+                if(!TextUtils.isEmpty(mNickNameEdit.getText().toString())){
+                    saveDialog();
+                }else {
+                    finish();
                 }
+            }
+           // }
 
             return true;
 

app/src/main/java/com/xuebiping/bolizhuzi/view/settings/dialog/GirlAuthDialog.kt

@@ -10,6 +10,7 @@ import com.xuebiping.bolizhuzi.databinding.DialogGirlauthBinding
 import com.xuebiping.bolizhuzi.view.base.BaseActivity
 import com.xuebiping.bolizhuzi.view.base.BaseApplication
 import com.xuebiping.bolizhuzi.view.settings.CertificationActivity
+import com.xuebiping.bolizhuzi.view.settings.UpPrivilegeActivity
 
 class GirlAuthDialog(context: Context) : Dialog(context, R.style.CommonDialog) {
     var owner = context as BaseActivity
@@ -32,8 +33,10 @@ class GirlAuthDialog(context: Context) : Dialog(context, R.style.CommonDialog) {
             dismiss()
             BaseApplication.getInstance().topActivity.startActivity(
                 Intent(
+//                    BaseApplication.getInstance().topActivity,
+//                    CertificationActivity::class.java
                     BaseApplication.getInstance().topActivity,
-                    CertificationActivity::class.java
+                    UpPrivilegeActivity::class.java
                 )
             )
         }

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape><solid android:color="#e0e0e0"/> <corners android:radius="@dimen/dp10"/> </shape>
+    </item>
+    <item android:id="@android:id/progress"><clip>
+        <shape>
+        <gradient android:angle="0"
+        android:startColor="#EA6FEE"
+        android:endColor="#EB6969"/> <corners android:radius="@dimen/dp10"/></shape>
+    </clip>
+    </item>
+</layer-list>

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/nim_message_item_left.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white"/>
+
+    <corners android:topRightRadius="12dp" android:bottomLeftRadius="12dp" android:bottomRightRadius="12dp"/>
+
+</shape>

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+<!--    <solid android:color="#2aafed"/>-->
+    <gradient android:angle="270"
+        android:startColor="#249CF8"
+        android:endColor="#30E5F6"/>
+
+    <corners android:topLeftRadius="12dp" android:bottomLeftRadius="12dp" android:bottomRightRadius="12dp"/>
+
+</shape>

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

@@ -0,0 +1,24 @@
+<?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_20999999_r45_bg"></item>
+    <!-- 第二进度条样式，用不怎么到直接设置成了和背景色一样的颜色，隐藏起来 -->
+    <item android:id="@android:id/secondaryProgress" android:drawable="@drawable/shape_20999999_r45_bg">
+    </item>
+    <!-- 第一进度条样式，我想修改的，修改成简单的灰色 -->
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <!-- 圆角设置 -->
+                <corners android:radius="@dimen/dp16" />
+                 <gradient
+                     android:angle="180"
+                     android:endColor="#EFD73D"
+                     android:startColor="#FF902E" />
+<!--                <solid android:color="@color/yellow_ffd33e" />-->
+            </shape>
+        </clip>
+    </item>
+</layer-list>

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_20999999_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="#33999999"/>
+</shape>

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_r14_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="8dp" />
+    <solid android:color="#EFECEC"/>
+</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_f9fafc_r4_bg.xml

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

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

@@ -0,0 +1,15 @@
+<?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"/>-->
+
+    <gradient android:angle="0"
+        android:startColor="#65DAEC"
+        android:endColor="#6FF0B7"/>
+
+    <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>