Merge remote-tracking branch 'origin/master'

# Conflicts:
#	cms/src/main/java/com/zxhl/cms/router/RounterApi.kt

app/src/main/java/com/zhangxin/starlight/activity/MainActivity.java

@@ -58,6 +58,7 @@ import com.zxhl.cms.utils.UserDataUtils;
 import com.zxhl.cms.utils.Utils;
 import com.zxhl.cms.widget.ChatDialogUtils;
 import com.zxhl.cms.widget.LoadingDialog;
+import com.zxhl.main.page.fragment.ConstellationMachFragment;
 import com.zxhl.main.page.fragment.HomeFragment;
 import com.zxhl.main.page.fragment.VoiceRoomFragment;
 import com.zxhl.main.page.view.NavigationBottomView;
@@ -162,7 +163,7 @@ public class MainActivity extends BaseActivity implements NavigationBottomView.N
 
     private void initFragment() {
         fragments.add(new HomeFragment());
-        fragments.add(new VoiceRoomFragment());
+        fragments.add(new ConstellationMachFragment());
         fragments.add(new ChatFragment());
         fragments.add(new UserCenterFragment());
 
@@ -201,15 +202,15 @@ public class MainActivity extends BaseActivity implements NavigationBottomView.N
 
     @Override
     public void onNavigationClick(int vId) {
-        if (vId == com.zxhl.main.R.id.id_view_navigation_bottom_user) {
+        if (vId == com.zxhl.main.R.id.id_ll_bottom_user) {
             switchFragment(3);
             EventUtils.INSTANCE.onEvent("tab_imp", "user");
-        } else if (vId == com.zxhl.main.R.id.id_view_navigation_bottom_box) {
+        } else if (vId == com.zxhl.main.R.id.id_ll_bottom_shouye) {
             switchFragment(0);
             EventUtils.INSTANCE.onEvent("tab_imp", "home");
-        } else if (vId == R.id.id_view_navigation_bottom_voice_room) {
+        } else if (vId == R.id.id_ll_bottom_xingzuo) {
             switchFragment(1);
-        } else if (vId == R.id.id_view_navigation_bottom_msg) {
+        } else if (vId == R.id.id_ll_bottom_msg) {
             switchFragment(2);
         }
     }

chat/src/main/res/values/strings.xml

@@ -117,6 +117,10 @@
         <item>50万-100万</item>
         <item>100万以上</item>
     </string-array>
+    <string-array name="default_gender">
+        <item>Girl</item>
+        <item>Boy</item>
+    </string-array>
     <string-array name="default_occupation">
         <item>销售/业务</item>
         <item>人事/行政</item>

cms/src/main/java/com/zxhl/cms/common/NetConfig.java

@@ -202,9 +202,9 @@ public class NetConfig {
     }
 
     public static class H5 {
-        public static String WEB_URL_USER = "https://newspool.zhangxinhulian.com//sspapiNovel/su/custom/xgchat/user_service.html?version="+ Constant.Param.vn+"&appName=StarLight&company=北京志信博文科技发展有限公司";
+        public static String WEB_URL_USER = "https://newspool.zhangxinhulian.com/sspapiNovel/su/custom/xgchat/hk/StarlightTermsOfService.html?version="+ Constant.Param.vn+"&appName=StarLight&company=北京志信博文科技发展有限公司";
 
-        public static String WEB_URL_PRIVACY = "https://newspool.zhangxinhulian.com/sspapiNovel/su/custom/xgchat/privacy.html?version="+ Constant.Param.vn+"&appName=StarLight&company=北京志信博文科技发展有限公司";
+        public static String WEB_URL_PRIVACY = "https://newspool.zhangxinhulian.com/sspapiNovel/su/custom/xgchat/hk/StarlightPrivacyPolicy.html?version="+ Constant.Param.vn+"&appName=StarLight&company=北京志信博文科技发展有限公司";
 
         public static String WEB_URL_ABOUT_US = "https://newspool.zhangxinhulian.com/sspapiNovel/su/custom/xingyunmohe/aboutMe.html?version="+ Constant.Param.vn+"&appName=StarLight&company=北京志信博文科技发展有限公司";
 
@@ -243,7 +243,7 @@ public class NetConfig {
     }
 
     public static class StarLight {
-        public static final String HOME_STAR_LIGHT_LIST = "app/v1/game/star/pageList";//首页列表
+        public static final String HOME_STAR_LIGHT_LIST = "app/v1/hk/game/star/pageList";//首页列表
         public static final String HOME_STAR_LIGHT_USER_INFO = "app/v1/game/star/getUserInfo";//访问他人主页
         public static final String HOME_STAR_LIGHT_USER_LIKE = "app/v1/game/star/like";//喜欢/取消喜欢
         public static final String HOME_STAR_LIGHT_USER_FOLLOW = "app/v1/game/star/follow";//关注用户/取消关注

cms/src/main/java/com/zxhl/cms/net/model/box/HomeListEntity.kt

@@ -34,6 +34,7 @@ class HomeListEntity {
     var picturesList: List<String>? = null
     var ifchoose: Boolean = false
     var distance: String? = ""
-
+    var countryEn:String? = ""
     var isUpload = false
+
 }
\ No newline at end of file

cms/src/main/java/com/zxhl/cms/router/RounterApi.kt

@@ -219,6 +219,15 @@ interface RounterApi {
     @RounterUri(Constant.scheme + "://loginbefore")
     fun getIntentLoginBefore(): Intent
 
+    @RounterUri(Constant.scheme + "://blocklist")
+    fun getIntentBlockList(): Intent
+
+    @RounterUri(Constant.scheme + "://updatenickname")
+    fun getIntentUpdateNickName(): Intent
+
+    @RounterUri(Constant.scheme + "://updateintrodution")
+    fun getIntentUpdateIntrodution(): Intent
+
     @RounterUri(Constant.scheme + "://coin_store")
     fun getIntentCoinStore(): Intent
 

cms/src/main/java/com/zxhl/cms/utils/BirthdayToAgeUtil.java

+package com.zxhl.cms.utils;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+public class BirthdayToAgeUtil {
+
+    private static String birthday;
+    private static String ageStr;
+    private static int age;
+    //出生年、月、日
+    private static int year;
+    private static int month;
+    private static int day;
+    public static String BirthdayToAge(String birthday1) {
+        birthday = birthday1;
+        stringToInt(birthday, "yyyy-MM-dd");
+        // 得到当前时间的年、月、日
+        Calendar cal = Calendar.getInstance();
+        int yearNow = cal.get(Calendar.YEAR);
+        int monthNow = cal.get(Calendar.MONTH) + 1;
+        int dayNow = cal.get(Calendar.DATE);
+        // 用当前年月日减去出生年月日
+        int yearMinus = yearNow - year;
+        int monthMinus = monthNow - month;
+        int dayMinus = dayNow - day;
+        age = yearMinus;// 先大致赋值
+        if (yearMinus <= 0) {
+            age = 0;
+            ageStr = String.valueOf(age) ;
+            return ageStr;
+        }
+        if (monthMinus < 0) {
+            age = age - 1;
+        } else if (monthMinus == 0) {
+            if (dayMinus < 0) {
+                age = age - 1;
+            }
+        }
+        ageStr = String.valueOf(age);
+        return ageStr;
+    }
+
+    /**
+     * String类型转换成date类型
+     * strTime: 要转换的string类型的时间，
+     * formatType: 要转换的格式yyyy-MM-dd HH:mm:ss
+     * //yyyy年MM月dd日 HH时mm分ss秒，
+     * strTime的时间格式必须要与formatType的时间格式相同
+     */
+    private static Date stringToDate(String strTime, String formatType) {
+
+        try {
+            SimpleDateFormat formatter = new SimpleDateFormat(formatType);
+            Date date;
+            date = formatter.parse(strTime);
+            return date;
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    /**
+     * String类型转换为long类型
+     * .............................
+     * strTime为要转换的String类型时间
+     * formatType时间格式
+     * formatType格式为yyyy-MM-dd HH:mm:ss//yyyy年MM月dd日 HH时mm分ss秒
+     * strTime的时间格式和formatType的时间格式必须相同
+     */
+    private static void stringToInt(String strTime, String formatType) {
+        try {
+            //String类型转换为date类型
+            Calendar calendar = Calendar.getInstance();
+            Date date = stringToDate(strTime, formatType);
+            calendar.setTime(date);
+            if (date == null) {
+            } else {
+                //date类型转成long类型
+                year = calendar.get(Calendar.YEAR);
+                month = calendar.get(Calendar.MONTH) + 1;
+                day = calendar.get(Calendar.DAY_OF_MONTH);
+            }
+        } catch (Exception e) {
+
+        }
+    }
+}

cms/src/main/java/com/zxhl/cms/utils/JumpUtils.java

@@ -212,7 +212,33 @@ public class JumpUtils {
             Utils.showToast(AppContext.get(), "This version is not supported, please update the version!");
         }
     }
-
+    public static void BlockListJump() {
+        try {
+            Intent intent = RounterBus.getRounter(RounterApi.class).getIntentBlockList();
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            AppContext.get().startActivity(intent);
+        } catch (Exception e) {
+            Utils.showToast(AppContext.get(), "该版本暂不支持，请更新版本！");
+        }
+    }
+    public static void UpdateNickNameJump() {
+        try {
+            Intent intent = RounterBus.getRounter(RounterApi.class).getIntentUpdateNickName();
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            AppContext.get().startActivity(intent);
+        } catch (Exception e) {
+            Utils.showToast(AppContext.get(), "该版本暂不支持，请更新版本！");
+        }
+    }
+    public static void UpdateIntrodutionJump() {
+        try {
+            Intent intent = RounterBus.getRounter(RounterApi.class).getIntentUpdateIntrodution();
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            AppContext.get().startActivity(intent);
+        } catch (Exception e) {
+            Utils.showToast(AppContext.get(), "该版本暂不支持，请更新版本！");
+        }
+    }
 
     public static void UserInfoJump() {
         try {

cms/src/main/java/com/zxhl/cms/utils/Utils.java

@@ -1192,5 +1192,6 @@ public class Utils {
             return true;
         return false;
     }
+
 }
 

cms/src/main/res/layout/item_layout_photo.xml

 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/dp_75"
-    android:layout_height="@dimen/dp_75">
+    android:layout_width="match_parent"
+    android:layout_height="140dp">
 
     <ImageView
         android:id="@+id/id_img_show"
@@ -12,18 +12,17 @@
 
     <ImageView
         android:id="@+id/id_img_add"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:layout_centerInParent="true"
-        android:padding="12dp"
         android:background="@drawable/icon_add_photo" />
 
     <ImageView
         android:id="@+id/id_img_del"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
         android:padding="5dp"
+        android:layout_alignParentRight="true"
         android:src="@drawable/icon_guanbi_photo"
         android:visibility="gone" />
 </RelativeLayout>

moduleMain/src/main/AndroidManifest.xml

@@ -127,6 +127,33 @@
                     android:scheme="hwxg" />
             </intent-filter>
         </activity>
+        <activity android:name="com.zxhl.main.page.activity.BlockListActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data
+                    android:host="blocklist"
+                    android:scheme="hwxg" />
+            </intent-filter>
+        </activity>
+        <activity android:name="com.zxhl.main.page.activity.UpdateNickNameActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data
+                    android:host="updatenickname"
+                    android:scheme="hwxg" />
+            </intent-filter>
+        </activity>
+        <activity android:name="com.zxhl.main.page.activity.UpdateIntrodutionActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data
+                    android:host="updateintrodution"
+                    android:scheme="hwxg" />
+            </intent-filter>
+        </activity>
         <activity android:name="com.zxhl.main.page.activity.WinterBoxActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />

moduleMain/src/main/java/com/zxhl/main/page/activity/BlockListActivity.kt

+package com.zxhl.main.page.activity
+
+import android.view.View
+import com.zxhl.cms.AppContext
+import com.zxhl.cms.common.base.BaseActivity
+import com.zxhl.main.R
+import kotlinx.android.synthetic.main.activity_layout_block_list.*
+
+class BlockListActivity : BaseActivity() {
+    override fun init() {
+        id_img_back?.setOnClickListener {
+            finish()
+        }
+    }
+    override fun before() {
+        super.before()
+        setStatusBarBackground(AppContext.get().resources.getColor(R.color.transparent))
+    }
+
+    override fun onClick(v: View?) {
+
+    }
+
+    override fun layoutID(): Int {
+        return R.layout.activity_layout_block_list
+    }
+}
\ No newline at end of file

moduleMain/src/main/java/com/zxhl/main/page/activity/UpdateIntrodutionActivity.kt

+package com.zxhl.main.page.activity
+
+import android.view.View
+import com.zxhl.cms.AppContext
+import com.zxhl.cms.common.base.BaseActivity
+import com.zxhl.main.R
+
+class UpdateIntrodutionActivity : BaseActivity() {
+    override fun init() {
+
+    }
+
+    override fun before() {
+        super.before()
+        setStatusBarBackground(AppContext.get().resources.getColor(R.color.transparent))
+    }
+
+    override fun onClick(v: View?) {
+
+    }
+
+    override fun layoutID(): Int {
+        return R.layout.activity_layout_update_introdution
+    }
+}
\ No newline at end of file

moduleMain/src/main/java/com/zxhl/main/page/activity/UpdateNickNameActivity.kt

+package com.zxhl.main.page.activity
+
+import android.view.View
+import com.zxhl.cms.AppContext
+import com.zxhl.cms.common.base.BaseActivity
+import com.zxhl.main.R
+
+class UpdateNickNameActivity : BaseActivity() {
+    override fun init() {
+
+    }
+    override fun before() {
+        super.before()
+        setStatusBarBackground(AppContext.get().resources.getColor(R.color.transparent))
+    }
+    override fun onClick(v: View?) {
+
+    }
+
+    override fun layoutID(): Int {
+        return R.layout.activity_layout_update_nick_name
+    }
+}
\ No newline at end of file

moduleMain/src/main/java/com/zxhl/main/page/activity/UserInfoActivity.kt

@@ -8,13 +8,19 @@ import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.graphics.Color
 import android.graphics.drawable.Drawable
+import android.net.Uri
 import android.os.Build
 import android.text.Editable
 import android.text.TextUtils
 import android.text.TextWatcher
+import android.util.Log
 import android.view.View
+import android.widget.ImageView
 import android.widget.Toast
 import androidx.core.app.ActivityCompat
+import androidx.recyclerview.widget.GridLayoutManager
+import byc.imagewatcher.ImageWatcher
+import byc.imagewatcher.ImageWatcherHelper
 import com.bigkoo.pickerview.builder.OptionsPickerBuilder
 import com.bigkoo.pickerview.view.OptionsPickerView
 import com.bumptech.glide.Glide
@@ -27,6 +33,7 @@ import com.google.gson.Gson
 import com.luck.picture.lib.PictureSelector
 import com.luck.picture.lib.config.PictureConfig
 import com.luck.picture.lib.config.PictureMimeType
+import com.luck.picture.lib.decoration.GridSpacingItemDecoration
 import com.luck.picture.lib.entity.LocalMedia
 import com.zxhl.cms.AppContext
 import com.zxhl.cms.common.Const
@@ -35,14 +42,12 @@ import com.zxhl.cms.net.SettingPreference
 import com.zxhl.cms.net.model.uc.UserInfo
 import com.zxhl.cms.runtimepermission.NicePermission
 import com.zxhl.cms.runtimepermission.NicePermissionListener
-import com.zxhl.cms.utils.GetJsonDataUtil
-import com.zxhl.cms.utils.ImageUtils
-import com.zxhl.cms.utils.JumpUtils
-import com.zxhl.cms.utils.Utils
-import com.zxhl.cms.widget.ChatDialogUtils
-import com.zxhl.cms.widget.LoadingDialog
+import com.zxhl.cms.utils.*
+import com.zxhl.cms.widget.*
 import com.zxhl.main.R
 import com.zxhl.main.page.`interface`.*
+import com.zxhl.main.page.adapter.PhotoMoveListener
+import com.zxhl.main.page.adapter.PublishPhotoAdapter
 import com.zxhl.main.page.contract.EditUserInfoContract
 import com.zxhl.main.page.entity.JsonBean
 import com.zxhl.main.page.presenter.EditUserInfoPresenter
@@ -56,13 +61,21 @@ import java.io.File
 
 //个人信息页面
 class UserInfoActivity : BaseActivity(), EditUserInfoContract.View, ChooseDateCallBack,
-    ChooseHeightCallBack, ChooseWeightCallBack, ChooseIncomeCallBack,ChossoccupationCallBack{
+    ChooseHeightCallBack, ChooseWeightCallBack, ChooseIncomeCallBack, ChossoccupationCallBack,
+    ChooseGenderCallBack, OnRecycleItemClickListener<String>,
+    ImageWatcher.OnPictureLongPressListener, AdCallback<String>,
+    PhotoMoveListener {
     private var mPresenter: EditUserInfoPresenter? = null
     var selectList: List<LocalMedia>? = ArrayList()
     private var options1Items: ArrayList<JsonBean> = ArrayList() //省
     private val options2Items: ArrayList<ArrayList<String>> = ArrayList() //市
     private val options3Items: ArrayList<ArrayList<ArrayList<String>>> = ArrayList() //区
+    private var mAdapter: PublishPhotoAdapter? = null
+    private val COLUMN: Int = 3
     private var mLoading: LoadingDialog? = null
+    private var mImgUrlList = ArrayList<String>()
+    private var iwHelper: ImageWatcherHelper? = null
+    var isTranslucentStatus = false
     override fun onClick(v: View?) {
 
     }
@@ -78,6 +91,8 @@ class UserInfoActivity : BaseActivity(), EditUserInfoContract.View, ChooseDateCa
 
     override fun init() {
         initJsonData()
+        initPhoto()
+        updateView()
         mLoading = LoadingDialog.getLoadingDialog(
             this,
             getString(com.zxhl.cms.R.string.wait_ing),
@@ -121,6 +136,10 @@ class UserInfoActivity : BaseActivity(), EditUserInfoContract.View, ChooseDateCa
         id_rl_height?.setOnClickListener {
             DialogUtils.showchooseHeight(this, this)
         }
+        id_rl_gender?.setOnClickListener {
+            DialogUtils.showchooseGender(this, this)
+        }
+
         id_rl_weight?.setOnClickListener {
             DialogUtils.showchooseWeight(this, this)
         }
@@ -133,6 +152,54 @@ class UserInfoActivity : BaseActivity(), EditUserInfoContract.View, ChooseDateCa
         id_tv_sava_info?.setOnClickListener {
             saveInfo()
         }
+        id_rl_nick_name?.setOnClickListener {
+            JumpUtils.UpdateNickNameJump()
+        }
+        id_rl_introduction?.setOnClickListener {
+            JumpUtils.UpdateIntrodutionJump()
+        }
+    }
+
+    fun initPhoto() {
+        iwHelper =
+            ImageWatcherHelper.with(this, GlideSimpleLoader()) // 一般来讲， ImageWatcher 需要占据全屏的位置
+                .setTranslucentStatus(if (!isTranslucentStatus) Utils.calcStatusBarHeight(AppContext.get()) else 0) // 如果不是透明状态栏，你需要给ImageWatcher标记 一个偏移值，以修正点击ImageView查看的启动动画的Y轴起点的不正确
+                .setErrorImageRes(R.mipmap.error_picture) // 配置error图标 如果不介意使用lib自带的图标，并不一定要调用这个API
+                .setOnPictureLongPressListener(this)
+                .setOnStateChangedListener(object : ImageWatcher.OnStateChangedListener {
+                    override fun onStateChangeUpdate(
+                        imageWatcher: ImageWatcher,
+                        clicked: ImageView,
+                        position: Int,
+                        uri: Uri,
+                        animatedValue: Float,
+                        actionTag: Int
+                    ) {
+                        Log.e(
+                            "IW",
+                            "onStateChangeUpdate [$position][$uri][$animatedValue][$actionTag]"
+                        )
+                    }
+
+                    override fun onStateChanged(
+                        imageWatcher: ImageWatcher,
+                        position: Int,
+                        uri: Uri,
+                        actionTag: Int
+                    ) {
+                        if (actionTag == ImageWatcher.STATE_ENTER_DISPLAYING) {
+                            //  Toast.makeText(getApplicationContext(), "点击了图片 [" + position + "]" + uri + "", Toast.LENGTH_SHORT).show();
+                        } else if (actionTag == ImageWatcher.STATE_EXIT_HIDING) {
+                            //  Toast.makeText(getApplicationContext(), "退出了查看大图", Toast.LENGTH_SHORT).show();
+                        }
+                    }
+                })
+                .setIndexProvider(CustomDotIndexProvider()) //自定义页码指示器（默认数字）
+                .setLoadingUIProvider(CustomLoadingUIProvider()) // 自定义LoadingUI
+        mAdapter = PublishPhotoAdapter(mActivity, this, this)
+        id_rl_choose_photo?.layoutManager = GridLayoutManager(mActivity, COLUMN)
+        id_rl_choose_photo.addItemDecoration(GridSpacingItemDecoration(COLUMN, 20, false))
+        id_rl_choose_photo.setAdapter(mAdapter)
     }
 
     fun saveInfo() {
@@ -142,13 +209,13 @@ class UserInfoActivity : BaseActivity(), EditUserInfoContract.View, ChooseDateCa
                 id_edit_nickname?.text.toString()
             ) ||
             TextUtils.isEmpty(id_tv_zhiye?.text.toString()) || TextUtils.isEmpty(id_tv_address?.text.toString()) ||
-              TextUtils.isEmpty(id_tv_weight?.text.toString())
+            TextUtils.isEmpty(id_tv_weight?.text.toString())
         ) {
             showToast("请继续完善未填写项哦~")
             return
         }
-        var headImg: MultipartBody.Part?=null
-        if(!selectList.isNullOrEmpty()){
+        var headImg: MultipartBody.Part? = null
+        if (!selectList.isNullOrEmpty()) {
             val f = File(selectList!![0].compressPath)
             val requestFile = RequestBody.create("multipart/form-data".toMediaTypeOrNull(), f)
             headImg = MultipartBody.Part.createFormData("headImage", f.name, requestFile)
@@ -163,7 +230,7 @@ class UserInfoActivity : BaseActivity(), EditUserInfoContract.View, ChooseDateCa
                 id_tv_address.text.toString(),
                 id_tv_weight.text.toString()
             )
-        }else{
+        } else {
             mPresenter?.updateUserInfoNoHeadImg(
                 id_tv_birth?.text.toString(),
                 id_edit_desc?.text.toString(),
@@ -193,7 +260,7 @@ class UserInfoActivity : BaseActivity(), EditUserInfoContract.View, ChooseDateCa
             } else {
                 id_img_head.setImageResource(R.drawable.icon_user_photo_default)
             }
-            id_tv_birth?.text = result.birthday
+            id_tv_birth?.text = "${result.age}"
             if (!TextUtils.isEmpty(result.description)) {
                 id_edit_desc?.setText(result.description)
                 id_tv_length.text = (30 - result.description.length).toString()
@@ -230,14 +297,6 @@ class UserInfoActivity : BaseActivity(), EditUserInfoContract.View, ChooseDateCa
 
     }
 
-    override fun updateSuc() {
-        mLoading?.setResult(true, "修改成功", 1000)
-        finish()
-    }
-
-    override fun updateFail() {
-        mLoading?.setResult(false, "修改失败", 1000)
-    }
 
     fun showPickerView() {
         val pvOptions: OptionsPickerView<*> = OptionsPickerBuilder(
@@ -309,14 +368,15 @@ class UserInfoActivity : BaseActivity(), EditUserInfoContract.View, ChooseDateCa
             .freeStyleCropEnabled(false)// 裁剪框是否可拖拽 true or false
             .isDragFrame(false)
             .showCropGrid(false)// 是否显示裁剪矩形网格 圆形裁剪时建议设为false    true or false
-            .forResult(PictureConfig.CHOOSE_REQUEST)//结果回调onActivityResult code
+            .forResult(PictureConfig.REQUEST_CAMERA)//结果回调onActivityResult code
 
     }
 
+    private val mImgList = ArrayList<LocalMedia>()
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if (data != null && resultCode == -1) {
-            if (requestCode == PictureConfig.CHOOSE_REQUEST) {
+            if (requestCode == PictureConfig.REQUEST_CAMERA) {
                 selectList = PictureSelector.obtainMultipleResult(data)
                 val photoSize = Utils.dip2px(90)
                 Glide.with(this).asBitmap().load(selectList!![0].compressPath)
@@ -350,10 +410,74 @@ class UserInfoActivity : BaseActivity(), EditUserInfoContract.View, ChooseDateCa
                         }
                     }
                     )
+            } else if (requestCode == PictureConfig.CHOOSE_REQUEST) {
+                val selectList = PictureSelector.obtainMultipleResult(data)
+                if (mAdapter != null) {
+                    //   mPhtoList?.addAll(mAdapter?.list!!)
+                }
+                if (!selectList.isNullOrEmpty()) {
+                    mImgList?.clear()
+                    mImgList?.addAll(selectList)
+                    checkImgList(0)
+                }
             }
         }
     }
 
+    fun checkImgList(num: Int) {
+        if (mImgList.size > 0) {
+            val data = mImgList[0]
+            mImgList?.removeAt(0)
+            uploadFile(data, num)
+        } else {
+            uploadPhotoUrl()
+        }
+    }
+
+    //上传本地图片获取url
+    fun uploadFile(data: LocalMedia, num: Int) {
+        Log.e("MXL", "本地路径" + data.compressPath)
+        val f = File(data.compressPath)
+        val requestFile =
+            RequestBody.create("multipart/form-data".toMediaTypeOrNull(), f)
+        val fileBody =
+            MultipartBody.Part.createFormData("file", f.name, requestFile)
+        mLoading?.setLoading("上传中")
+        mLoading?.show()
+        mPresenter?.upload(fileBody)
+        //写上报地址获取url逻辑，成功or失败， 成功调 mImgUrlList.add(url)  checkImgList(0)
+        //失败
+//        if (num < 3) {
+//            val s = num + 1
+//            uploadFile(data, s)
+//        } else if (num == 3) {
+//            //重试了三次失败的。
+//            // data 做记录
+//            // checkImgList(0)
+//        } else {
+//            checkImgList(0)
+//        }
+    }
+
+    fun uploadPhotoUrl() {
+        if (mImgUrlList.size > 0) {
+            //走打包上报url逻辑
+            val sb = StringBuilder()
+            for (str in mImgUrlList!!) {
+                if (sb.length > 0) {
+                    sb.append(",")
+                }
+                sb.append(str)
+            }
+            Log.e("MXL", "参数" + sb.toString())
+            mPresenter?.pictures(sb.toString())
+
+        } else {
+            //删到最后一张了
+            mPresenter?.pictures("")
+        }
+    }
+
     override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<out String>,
@@ -477,5 +601,135 @@ class UserInfoActivity : BaseActivity(), EditUserInfoContract.View, ChooseDateCa
             id_tv_zhiye?.text = string
         }
     }
+    override fun chooseGender(string: String?) {
+        if (TextUtils.isEmpty(string)) {
+        } else {
+            id_tv_gender?.text = string
+        }
+    }
+    override fun onItemClick(view: View?, position: Int, data: String?) {
+        when (view?.id) {
+            R.id.id_img_add -> {
+                EventUtils.onEvent("UploadAlbumImage", "相册上传图")
+                PictureSelector.create(this)
+                    .openGallery(PictureConfig.TYPE_ALL)
+                    .imageSpanCount(4)// 每行显示个数 int
+                    .maxSelectNum(getSize())
+                    .selectionMode(PictureConfig.SINGLE)// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
+                    .isSingleDirectReturn(true)//PictureConfig.SINGLE模式下是否直接返回
+                    .previewImage(true)// 是否可预览图片 true or false
+                    .isCamera(true)// 是否显示拍照按钮 true or false
+                    .imageFormat(PictureMimeType.JPEG)// 拍照保存图片格式后缀,默认jpeg
+                    .isZoomAnim(true)// 图片列表点击 缩放效果 默认true
+                    .setOutputCameraPath(Const.getImgPath())// 自定义拍照保存路径,可不填
+                    .enableCrop(false)// 是否裁剪 true or false
+                    .compress(true)// 是否压缩 true or false
+                    .compressSavePath(Const.getImgPath())//压缩图片保存地址
+                    .showCropFrame(true)// 是否显示裁剪矩形边框 圆形裁剪时建议设为 false   true or false
+                    .showCropGrid(false)// 是否显示裁剪矩形网格 圆形裁剪时建议设为 false    true or false
+                    .rotateEnabled(false) // 裁剪是否可旋转图片 true or false
+                    .freeStyleCropEnabled(false)// 裁剪框是否可拖拽 true or false
+                    .showCropGrid(false)// 是否显示裁剪矩形网格 圆形裁剪时建议设为false    true or false
+                    .forResult(PictureConfig.CHOOSE_REQUEST)//结果回调onActivityResult code
+            }
+            R.id.id_img_del -> {
+                delet(position)
+            }
+            R.id.id_img_show -> {
+                iwHelper?.show(
+                    getImageUriList(mImgUrlList), position
+                )
+            }
+        }
+    }
+
+    fun getSize(): Int {
+        if (mAdapter == null) {
+            return 6
+        } else {
+            return 7 - mAdapter?.itemCount!!
+        }
+
+    }
+
+    fun getImageUriList(files: List<String?>?): List<Uri>? {
+        val imageUriList: MutableList<Uri> = java.util.ArrayList()
+        if (files != null && files.size > 0) {
+            for (str in files) {
+                imageUriList.add(Uri.parse(str))
+            }
+        }
+        return imageUriList
+    }
+
+    override fun onPictureLongPress(v: ImageView?, uri: Uri?, pos: Int) {
+
+    }
+
+    override fun moveFinish() {
+
+    }
+
+    override fun onResult(code: Int, result: String?) {
+        updateView()
+
+    }
+
+    fun updateView() {
+        val user = SettingPreference.getUserInfoData()
+        if (user == null) {
+            return
+        }
+        if (!user.picturesList.isNullOrEmpty()) {
+            mImgUrlList?.clear()
+            mImgUrlList?.addAll(user.picturesList)
+            if (mAdapter != null) {
+                mAdapter?.clear()
+            }
+            mAdapter?.appendToList(user.picturesList)
+            mAdapter?.notifyDataSetChanged()
+        } else {
+            if (mAdapter != null) {
+                mAdapter?.clear()
+            }
+        }
+    }
+
+    fun delet(position: Int) {
+        mImgUrlList?.removeAt(position)
+        mLoading?.setLoading("loading")
+        mLoading?.show()
+        uploadPhotoUrl()
+    }
+
+    override fun updateSuc() {
+        mLoading?.setResult(true, "修改成功", 1000)
+        finish()
+    }
+
+    override fun updateFail() {
+        mLoading?.setResult(false, "修改失败", 1000)
+    }
+
+    override fun uploadSuc(result: String) {
+        mImgUrlList.add(result)
+        checkImgList(0)
+    }
+
+    override fun uploadFail() {
+
+    }
+
+    override fun updatePicSuc() {
+        mImgUrlList.clear()
+        mLoading?.setResult(true, "Success", 1000)
+        UserDataUtils.updateUserInfo(this)
+
+    }
+
+    override fun updatePicFail() {
+        mLoading?.setResult(true, "Fail", 1000)
+    }
+
 
 }
\ No newline at end of file

moduleMain/src/main/java/com/zxhl/main/page/adapter/BlockAdapter.kt

+package com.zxhl.main.page.adapter
+
+import android.content.Context
+import android.text.TextUtils
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.RelativeLayout
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.resource.bitmap.CircleCrop
+import com.bumptech.glide.request.RequestOptions
+import com.zxhl.cms.AppContext
+import com.zxhl.cms.common.base.BaseRecyclerAdapter
+import com.zxhl.cms.net.model.chat.FollowEntity
+import com.zxhl.cms.utils.OnRecycleItemClickListener
+import com.zxhl.main.R
+
+class BlockAdapter : BaseRecyclerAdapter<FollowEntity, BlockAdapter.ViewHolder> {
+    private var mContext: Context? = null
+    private val listener: OnRecycleItemClickListener<FollowEntity>
+
+    constructor(
+        content: Context?,
+        listener: OnRecycleItemClickListener<FollowEntity>
+    ) : super() {
+        this.listener = listener
+        mContext = content
+    }
+
+    override fun onCreateViewHolder(holder: ViewGroup, p1: Int): ViewHolder {
+        return ViewHolder(
+            LayoutInflater.from(holder.context).inflate(R.layout.item_layout_fans, holder, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val data = mList[position]
+        holder.id_tv_name.text = data.nickname
+        if (!TextUtils.isEmpty(data.headImage)) {
+            Glide.with(AppContext.get()).load(data.headImage)
+                .apply(RequestOptions.bitmapTransform(CircleCrop()))
+                .into(holder.id_img_follow)
+        } else {
+            holder.id_img_follow.setImageResource(R.drawable.icon_user_photo_default)
+        }
+        holder.id_tv_look_time.text="${data.dateStr} 看过你"
+        if(TextUtils.equals(data.hasFollows,"0")){
+            holder.id_tv_if_follow.text="关注Ta"
+            holder.id_tv_if_follow.setBackgroundResource(R.drawable.shape_aa60ff_r3)
+            holder.id_tv_if_follow.setTextColor(AppContext.get().resources.getColor(R.color.white))
+        }else{
+            holder.id_tv_if_follow.text="互相关注"
+            holder.id_tv_if_follow.setBackgroundResource(R.drawable.shape_999999_r3)
+            holder.id_tv_if_follow.setTextColor(AppContext.get().resources.getColor(R.color.color_999999))
+        }
+
+    }
+
+    inner class ViewHolder : RecyclerView.ViewHolder {
+
+
+        var id_tv_name: TextView
+        var id_tv_look_time: TextView
+        var id_tv_if_follow: TextView
+        var id_img_follow: ImageView
+        var id_rl_item: RelativeLayout
+
+        constructor(itemView: View) : super(itemView) {
+            id_img_follow = itemView.findViewById(R.id.id_img_follow_head)
+            id_tv_name = itemView.findViewById(R.id.id_tv_follow_name)
+            id_tv_look_time = itemView.findViewById(R.id.id_tv_look_time)
+            id_tv_if_follow = itemView.findViewById(R.id.id_tv_if_follow)
+            id_rl_item = itemView.findViewById(R.id.id_rl_item)
+            id_tv_if_follow.setOnClickListener {
+                val pos = adapterPosition
+                if (pos >= 0 && pos < mList.size) {
+                    listener.onItemClick(it,pos,mList[pos])
+                }
+            }
+            id_rl_item.setOnClickListener {
+                val pos = adapterPosition
+                if (pos >= 0 && pos < mList.size) {
+                    listener.onItemClick(it,pos,mList[pos])
+                }
+            }
+
+        }
+    }
+}
\ No newline at end of file

moduleMain/src/main/java/com/zxhl/main/page/adapter/ItemTouchHelperAdapter.kt

+package com.zxhl.main.page.adapter
+
+import androidx.recyclerview.widget.RecyclerView
+
+
+interface ItemTouchHelperAdapter {
+    //数据交换
+    fun onItemMove(source: RecyclerView.ViewHolder?, target: RecyclerView.ViewHolder?)
+
+    //数据删除
+    fun onItemDissmiss(source: RecyclerView.ViewHolder?)
+
+    //drag或者swipe选中
+    fun onItemSelect(source: RecyclerView.ViewHolder?)
+
+    //状态清除
+    fun onItemClear(source: RecyclerView.ViewHolder?)
+}
\ No newline at end of file

moduleMain/src/main/java/com/zxhl/main/page/adapter/PhotoMoveListener.kt

+package com.zxhl.main.page.adapter
+
+interface PhotoMoveListener {
+    fun moveFinish()
+}
\ No newline at end of file

moduleMain/src/main/java/com/zxhl/main/page/adapter/PublishPhotoAdapter.kt

+package com.zxhl.main.page.adapter
+
+import android.content.Context
+import android.util.Log
+import android.util.SparseArray
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.resource.bitmap.CircleCrop
+import com.bumptech.glide.request.RequestOptions
+import com.zxhl.cms.AppContext
+import com.zxhl.cms.R
+import com.zxhl.cms.common.base.BaseRecyclerAdapter
+import com.zxhl.cms.utils.OnRecycleItemClickListener
+
+import java.util.*
+
+class PublishPhotoAdapter : BaseRecyclerAdapter<String, PublishPhotoAdapter.ViewHolder> ,
+    ItemTouchHelperAdapter {
+    private var mContext: Context? = null
+    private val listener: OnRecycleItemClickListener<String>
+    private val moveListener:PhotoMoveListener
+
+    constructor(
+        content: Context?,
+        listener: OnRecycleItemClickListener<String>,
+        moveListener:PhotoMoveListener
+    ) : super() {
+        mContext = content
+        this.listener = listener
+        this.moveListener=moveListener
+    }
+
+
+    override fun getItemCount(): Int {
+        val size = mList.size
+        if (size < 8) {
+            return size + 1
+        } else {
+            return size
+        }
+
+
+    }
+    private val mImageViews: SparseArray<ImageView?>? = null
+
+    fun getImageViews(): SparseArray<ImageView?>? {
+        return mImageViews
+    }
+
+    override fun getItem(position: Int): String {
+        return super.getItem(position)
+    }
+
+//    override fun getItem(position: Int): LocalMedia {
+//        return super.getItem(position)
+//    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+
+        if (position < list.size) {
+            var str = mList[position]
+            Glide.with(AppContext.mAppContext).load(str)
+                .into(holder?.item_img_show!!)
+                holder?.item_img_del?.visibility = View.VISIBLE
+            // holder?.item_img_show?.setLoadImageUrl(str, false)
+           // holder?.item_img_show?.setLoadImageUrl(Uri.parse(bean.compressPath))
+
+            holder?.item_img_add?.visibility = View.GONE
+        } else {
+            holder?.item_img_show?.setImageResource(R.color.color_ededed)
+            holder?.item_img_del?.visibility = View.GONE
+            holder?.item_img_add?.visibility = View.VISIBLE
+        }
+
+
+    }
+
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+
+        return ViewHolder(
+            LayoutInflater.from(AppContext.get())
+                .inflate(R.layout.item_layout_photo, parent, false)
+        )
+    }
+
+    inner class ViewHolder : RecyclerView.ViewHolder {
+
+        var item_img_add: ImageView?
+        var item_img_show: ImageView?
+        var item_img_del: ImageView?
+
+        constructor(
+            itemView: View
+        ) : super(itemView) {
+
+            item_img_add = itemView.findViewById<ImageView>(R.id.id_img_add)
+            item_img_show = itemView.findViewById<ImageView>(R.id.id_img_show)
+            item_img_del = itemView.findViewById<ImageView>(R.id.id_img_del)
+            item_img_show?.setOnClickListener {
+                val pos = adapterPosition
+                if (pos < mList.size) {
+                    listener.onItemClick(it, position, null)
+                }
+            }
+            item_img_add?.setOnClickListener {
+                val pos = adapterPosition
+                if (pos < mList.size) {
+
+                } else {
+                    listener.onItemClick(it, position, null)
+                }
+
+            }
+            item_img_del?.setOnClickListener {
+                val pos = adapterPosition
+                if (pos < mList.size) {
+                    listener.onItemClick(it, position, null)
+                } else {
+
+                }
+
+            }
+        }
+    }
+
+    override fun onItemMove(source: RecyclerView.ViewHolder?, target: RecyclerView.ViewHolder?) {
+        var fromPosition=source?.adapterPosition
+        var toPosition=target?.adapterPosition
+        if (fromPosition != null) {
+            if (toPosition != null) {
+                if(fromPosition<mList.size&&toPosition<mList.size){
+                    //交换数据位置
+                    Collections.swap(mList, fromPosition, toPosition)
+                    //刷新位置交换
+                    notifyItemMoved(fromPosition, toPosition)
+                    onItemClear(source)
+                    moveListener.moveFinish()
+                }
+            }
+        }
+    }
+
+    override fun onItemDissmiss(source: RecyclerView.ViewHolder?) {
+        var position = source?.adapterPosition
+        mList.remove(position) //移除数据
+        if (position != null) {
+            notifyItemRemoved(position)
+        }//刷新数据移除
+    }
+
+    override fun onItemSelect(source: RecyclerView.ViewHolder?) {
+        //当拖拽选中时放大选中的view
+        source?.itemView?.setScaleX(1.2f)
+        source?.itemView?.setScaleY(1.2f)
+    }
+
+    override fun onItemClear(source: RecyclerView.ViewHolder?) {
+        //拖拽结束后恢复view的状态
+        source?.itemView?.setScaleX(1.0f)
+        source?.itemView?.setScaleY(1.0f)
+    }
+
+}
\ No newline at end of file

moduleMain/src/main/java/com/zxhl/main/page/adapter/UserAdapter.kt

@@ -31,7 +31,7 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder>
     private val listener: OnRecycleItemClickListener<HomeListEntity>
     private var ifplay: Boolean = false
     private var lastpostion: Int = -1
-    private val HEAD = 1009
+    //private val HEAD = 1009
     private val CONTENT = 1000
     public val LOADMORE = 1001
     private val checkStatus: MutableMap<Int, Boolean> = HashMap()
@@ -56,38 +56,28 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder>
     }
 
     fun getLoadMore(): Boolean = isLoadMore
-    override fun getItemCount(): Int {
-        val size = mList.size + 1
-        if (size > 0) {
-            return if (isLoadMore) {
-                mList.size + 2
-            } else {
-                mList.size + 1
-            }
-        } else {
-            return size
-        }
-    }
-
     override fun getItemViewType(position: Int): Int {
         if (isLoadMore) {
-            if (position == mList.size + 1) {
+            if (position == mList.size) {
                 return LOADMORE
             } else {
-                if (position == 0) {
-
-                    return HEAD
-                }
-
                 return CONTENT
             }
         } else {
-            if (position == 0) {
+            return CONTENT
+        }
+    }
 
-                return HEAD
+    override fun getItemCount(): Int {
+        val size = mList.size
+        if (size > 0) {
+            return if (isLoadMore) {
+                mList.size + 1
+            } else {
+                mList.size
             }
-
-            return CONTENT
+        } else {
+            return size
         }
     }
 
@@ -102,31 +92,21 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder>
                     LayoutInflater.from(mContext).inflate(R.layout.item_load_more, holder, false)
                 )
             } else {
-                if (viewType == HEAD) {
-
-                    return HomeHeadHolder(
-                        LayoutInflater.from(mContext).inflate(R.layout.item_home_head, holder, false),
-                    )
-                }else{
-                    return ViewHolder(
-                        LayoutInflater.from(holder.context)
-                            .inflate(R.layout.item_layout_home, holder, false)
-                    )
-                }
-
-            }
-        } else {
-            if (viewType == HEAD) {
 
-                return HomeHeadHolder(
-                    LayoutInflater.from(mContext).inflate(R.layout.item_home_head, holder, false),
-                )
-            }else{
                 return ViewHolder(
                     LayoutInflater.from(holder.context)
                         .inflate(R.layout.item_layout_home, holder, false)
                 )
+
+
             }
+        } else {
+
+            return ViewHolder(
+                LayoutInflater.from(holder.context)
+                    .inflate(R.layout.item_layout_home, holder, false)
+            )
+
 
         }
 
@@ -187,26 +167,24 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder>
 //    }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        if (holder is HomeHeadHolder) {
-
-        }else if (holder is ViewHolder) {
-            val data = mList[position-1]
+        if (holder is ViewHolder) {
+            val data = mList[position]
             if (TextUtils.isEmpty(data.voice)) {
                 holder.id_rl_play_audio.visibility = View.GONE
             } else {
                 holder.id_rl_play_audio.visibility = View.VISIBLE
             }
             if (TextUtils.equals(data.onlineStatus, "1")) {
-                holder.id_img_online.visibility = View.VISIBLE
+                holder.id_img_online.visibility = View.GONE
             } else {
                 holder.id_img_online.visibility = View.GONE
             }
             if (TextUtils.isEmpty(data.distance)) {
-                holder.id_tv_chakan_juli.visibility = View.VISIBLE
+                holder.id_tv_chakan_juli.visibility = View.GONE
                 holder.id_tv_juli.visibility = View.GONE
             } else {
                 holder.id_tv_chakan_juli.visibility = View.GONE
-                holder.id_tv_juli.visibility = View.VISIBLE
+                holder.id_tv_juli.visibility = View.GONE
                 // var str: String = String.format("%.2f", distance.toDouble())
                 holder.id_tv_juli.text = "${data.distance}km"
             }
@@ -318,7 +296,7 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder>
                     val pos = adapterPosition
                     if (pos >= 0 && pos < mList.size) {
                         if (mList[pos].hasLikes.equals("0")) {
-                            listener.onItemClick(v, pos, mList[pos-1])
+                            listener.onItemClick(v, pos, mList[pos])
                         } else {
                             playAnimation(id_img_home_like, id_img_heart_gif)
                         }
@@ -332,7 +310,7 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder>
                     val pos = adapterPosition
                     Log.e("MXL","pos"+pos)
                     if (pos >= 0 && pos < mList.size) {
-                        listener.onItemClick(v, pos, mList[pos-1])
+                        listener.onItemClick(v, pos, mList[pos])
                     }
                 }
 
@@ -340,14 +318,14 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder>
             id_rl_play_audio.setOnClickListener {
                 val pos = adapterPosition
                 if (pos >= 0 && pos < mList.size) {
-                    listener.onItemClick(it, pos, mList[pos-1])
+                    listener.onItemClick(it, pos, mList[pos])
                 }
             }
             id_tv_chakan_juli.setOnClickListener(object: NoDoubleClickListener(){
                 override fun onNoDoubleClick(v: View?) {
                     val pos = adapterPosition
                     if (pos >= 0 && pos < mList.size) {
-                        listener.onItemClick(v, pos, mList[pos-1])
+                        listener.onItemClick(v, pos, mList[pos])
                     }
                 }
 
@@ -356,25 +334,14 @@ class UserAdapter : BaseRecyclerAdapter<HomeListEntity, RecyclerView.ViewHolder>
                 override fun onNoDoubleClick(v: View?) {
                     val pos = adapterPosition
                     if (pos >= 0 && pos < mList.size) {
-                        listener.onItemClick(v, pos-1, mList[pos-1])
+                        listener.onItemClick(v, pos, mList[pos])
                     }
                 }
             })
         }
     }
-    class HomeHeadHolder : RecyclerView.ViewHolder {
-
 
 
-
-        constructor(
-            itemView: View
-        ) : super(itemView) {
-
-        }
-
-    }
-
     inner class LoadMoreHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         val mImg: ImageView
 

moduleMain/src/main/java/com/zxhl/main/page/contract/EditUserInfoContract.kt

@@ -9,6 +9,10 @@ class EditUserInfoContract {
         fun setData(result: UserInfo?)
         fun updateSuc()
         fun updateFail()
+        fun uploadSuc(result: String)
+        fun uploadFail()
+        fun updatePicSuc()
+        fun updatePicFail()
     }
 
     interface Presenter {
@@ -36,5 +40,7 @@ class EditUserInfoContract {
             province: String,
             weight: String,
         )
+        fun upload(file: MultipartBody.Part?)
+        fun pictures(list:String?)
     }
 }
\ No newline at end of file

moduleMain/src/main/java/com/zxhl/main/page/fragment/ConstellationMachFragment.kt

+package com.zxhl.main.page.fragment
+
+import android.view.View
+import com.zxhl.cms.common.base.BaseFragment
+import com.zxhl.main.R
+
+class ConstellationMachFragment:BaseFragment() {
+    override fun layoutID(): Int {
+        return R.layout.fragment_layout_constellation_match
+    }
+
+    override fun init(view: View?) {
+
+    }
+}
\ No newline at end of file

moduleMain/src/main/java/com/zxhl/main/page/fragment/HomeFragment.kt

@@ -80,15 +80,10 @@ class HomeFragment : BaseFragment(), HomeContract.View, OnRecycleItemClickListen
         gridLayoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
             override fun getSpanSize(p0: Int): Int {
                 val type = mAdapter?.getItemViewType(p0)
-                if (p0 == 0) {
+                if(type==mAdapter?.LOADMORE){
                     return gridLayoutManager.spanCount
-                } else {
-                    if(type==mAdapter?.LOADMORE){
-                        return gridLayoutManager.spanCount
-                    }else{
-                        return 1
-                    }
-
+                }else{
+                    return 1
                 }
 
             }

moduleMain/src/main/java/com/zxhl/main/page/interface/ChooseGenderCallBack.kt

+package com.zxhl.main.page.`interface`
+
+interface ChooseGenderCallBack {
+    fun chooseGender(string: String?)
+}
\ No newline at end of file

moduleMain/src/main/java/com/zxhl/main/page/presenter/EditUserInfoPresenter.kt

@@ -5,6 +5,7 @@ import com.zxhl.cms.ad.upload.model.Response
 import com.zxhl.cms.net.ApiClient
 import com.zxhl.cms.net.RxSchedulers
 import com.zxhl.cms.net.callback.BaseObserver
+import com.zxhl.cms.net.model.chat.PictureEntity
 import com.zxhl.cms.net.model.uc.UserInfo
 import com.zxhl.main.page.contract.EditUserInfoContract
 import okhttp3.MultipartBody
@@ -98,5 +99,39 @@ class EditUserInfoPresenter : EditUserInfoContract.Presenter {
             })
     }
 
+    override fun upload(file: MultipartBody.Part?) {
+        ApiClient.homeApi.upload(file)
+            .compose(RxSchedulers.observableIO2Main())
+            .subscribe(object : BaseObserver<PictureEntity>() {
+                override fun onSuccess(result: PictureEntity?) {
+                    if (result != null) {
+                        mView.uploadSuc(result.url.toString())
+                    }
+                }
+
+                override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
+                    Log.e("MXL", "ERROR" + code + errorMsg)
+                    mView.uploadFail()
+                }
+            })
+    }
+
+    override fun pictures(list: String?) {
+        ApiClient.homeApi.updatePictures(list)
+            .compose(RxSchedulers.observableIO2Main())
+            .subscribe(object : BaseObserver<Any>() {
+                override fun onSuccess(result: Any?) {
+                    if (result != null) {
+                        mView.updatePicSuc()
+                    }
+                }
+
+                override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
+                    Log.e("MXL", "ERROR" + code + errorMsg)
+                    mView.updatePicFail()
+                }
+            })
+    }
+
 
 }
\ No newline at end of file

moduleMain/src/main/java/com/zxhl/main/page/view/DialogUtils.kt

@@ -16,6 +16,7 @@ import com.cncoderx.wheelview.WheelView
 import com.loper7.date_time_picker.DateTimePicker
 import com.loper7.date_time_picker.StringUtils
 import com.zxhl.cms.AppContext
+import com.zxhl.cms.utils.BirthdayToAgeUtil
 import com.zxhl.cms.utils.PhoneUtils
 import com.zxhl.main.R
 import com.zxhl.main.page.*
@@ -128,8 +129,8 @@ object DialogUtils {
         val datePicker = mDialogView.findViewById<DateTimePicker>(R.id.dateTimePicker)
         val _MAX_TIME = (365*24* 60 * 60 * 13 * 1000L)+(366*24* 60 * 60 * 5 * 1000L)
         val curTime = System.currentTimeMillis()
-        val maxTime: Long = curTime - _MAX_TIME
-        datePicker?. setDefaultMillisecond(959788800000)
+        val maxTime: Long = curTime
+        datePicker?. setDefaultMillisecond(curTime)
         datePicker?.setMaxMillisecond(maxTime)
         val tvsure = mDialogView.findViewById<TextView>(R.id.id_tv_sure)
         val tvquxiao = mDialogView.findViewById<TextView>(R.id.id_tv_quxiao)
@@ -140,7 +141,8 @@ object DialogUtils {
             }
         })
         tvsure?.setOnClickListener {
-            chooseDatalistener?.chooseData(chooseDate)
+
+            chooseDatalistener?.chooseData(BirthdayToAgeUtil.BirthdayToAge(chooseDate))
             mDialog.dismiss()
         }
         tvquxiao?.setOnClickListener {
@@ -151,6 +153,7 @@ object DialogUtils {
 
         val array = intArrayOf(0, 1, 2)
         datePicker?.setDisplayType(array)
+        datePicker?.showLabel(false)
         mDialog.setCanceledOnTouchOutside(true)
         mDialog.setCancelable(true)
         mDialog?.show()
@@ -315,7 +318,45 @@ object DialogUtils {
         mDialog.setCancelable(true)
         mDialog?.show()
     }
+    fun showchooseGender(
+        context: Activity,
+        chooseDatalistener: ChooseGenderCallBack
+    ) {
+        if (context == null) return
+        val mDialog = Dialog(context, R.style.CenterCompatDialogTheme)
+        val mDialogView =
+            showBottomDialog(
+                R.layout.dialog_layout_gender,
+                context,
+                mDialog,
+                0,
+                Gravity.BOTTOM
+            )
+        var chooseData: String? = "Girl"
+        val wheelview = mDialogView.findViewById<WheelView>(R.id.wheel3d)
+        val tvsure = mDialogView.findViewById<TextView>(R.id.id_tv_sure)
+        val tvquxiao = mDialogView.findViewById<TextView>(R.id.id_tv_quxiao)
+        wheelview.setOnWheelChangedListener(object : OnWheelChangedListener {
+            override fun onChanged(view: WheelView?, oldIndex: Int, newIndex: Int) {
+                chooseData = view!!.getItem(newIndex).toString()
+                Log.e("MXL", "chooseData:" + chooseData)
+            }
 
+        })
+        tvsure?.setOnClickListener {
+            chooseDatalistener?.chooseGender(chooseData)
+            mDialog.dismiss()
+        }
+        tvquxiao?.setOnClickListener {
+            chooseData = ""
+            chooseDatalistener?.chooseGender(chooseData)
+            mDialog.dismiss()
+        }
+
+        mDialog.setCanceledOnTouchOutside(true)
+        mDialog.setCancelable(true)
+        mDialog?.show()
+    }
     fun showMemberTrip(
         context: Activity
     ) {

moduleMain/src/main/java/com/zxhl/main/page/view/NavigationBottomView.kt

@@ -5,12 +5,8 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.RelativeLayout
 import android.widget.TextView
-import com.zxhl.cms.AppContext
-import com.zxhl.cms.router.RounterApi
-import com.zxhl.cms.router.RounterBus
-import com.zxhl.cms.utils.JumpUtils
 import com.zxhl.main.R
-import org.jetbrains.anko.startActivity
+import kotlinx.android.synthetic.main.view_navigation_bottom.view.*
 
 /**
  * Created by gaoleichao on 2018/12/28
@@ -36,174 +32,76 @@ class NavigationBottomView : RelativeLayout {
     private var mVideoText: TextView? = null
     private var mWarehouseText: TextView? = null
     private var mVoiceroomText: TextView? = null
+
     private var navifationCallback: NavifationCallback? = null
 
     private fun init() {
         LayoutInflater.from(context).inflate(R.layout.view_navigation_bottom, this)
-        mUserText = findViewById(R.id.id_view_navigation_bottom_user)
-        mWarehouseText = findViewById(R.id.id_view_navigation_bottom_msg)
-        mVideoText = findViewById(R.id.id_view_navigation_bottom_box)
-        mVoiceroomText = findViewById(R.id.id_view_navigation_bottom_voice_room)
-        mUserText?.setOnClickListener {
+        id_ll_bottom_user?.setOnClickListener {
+            id_view_navigation_bottom_user?.setImageResource(R.drawable.icon_my_click)
+            id_view_navigation_bottom_msg?.setImageResource(R.drawable.icon_xiaoxi_default)
+            id_view_navigation_bottom_xingzuo?.setImageResource(R.drawable.icon_xingzuo_default)
+            id_view_navigation_bottom_shouye?.setImageResource(R.drawable.icon_shouye_default)
 //            if(true){
 //                JumpUtils.activityJump(RounterBus.getRounter(RounterApi::class.java).getIntentActivityLogin())
 //            } else {
-            mVideoText?.setTextColor(resources.getColor(R.color.color_666666))
-            mUserText?.setTextColor(resources.getColor(R.color.color_aa60ff))
-            mWarehouseText?.setTextColor(resources.getColor(R.color.color_666666))
-            mVoiceroomText?.setTextColor(resources.getColor(R.color.color_666666))
-            val voiceDrawable = getResources().getDrawable(R.drawable.icon_yuyin_default)
-            voiceDrawable.setBounds(
-                0,
-                0,
-                voiceDrawable.getMinimumWidth(),
-                voiceDrawable.getMinimumHeight()
-            )
-            val userDrawable = getResources().getDrawable(R.drawable.icon_my_click_xinzeng)
-            userDrawable.setBounds(
-                0,
-                0,
-                userDrawable.getMinimumWidth(),
-                userDrawable.getMinimumHeight()
-            )
-            val videoDrawable = getResources().getDrawable(R.drawable.icon_shouye_default)
-            videoDrawable.setBounds(
-                0,
-                0,
-                videoDrawable.getMinimumWidth(),
-                videoDrawable.getMinimumHeight()
-            )
-            val warehouseDrawable = getResources().getDrawable(R.drawable.icon_xiaoxi_default)
-            warehouseDrawable.setBounds(
-                0,
-                0,
-                videoDrawable.getMinimumWidth(),
-                videoDrawable.getMinimumHeight()
-            )
-            mVoiceroomText?.setCompoundDrawables(null,voiceDrawable,null,null)
-            mUserText?.setCompoundDrawables(null, userDrawable, null, null)
-            mVideoText?.setCompoundDrawables(null, videoDrawable, null, null)
-            mWarehouseText?.setCompoundDrawables(null, warehouseDrawable, null, null)
+//            mVideoText?.setTextColor(resources.getColor(R.color.color_666666))
+//            mUserText?.setTextColor(resources.getColor(R.color.color_aa60ff))
+//            mWarehouseText?.setTextColor(resources.getColor(R.color.color_666666))
+//            mVoiceroomText?.setTextColor(resources.getColor(R.color.color_666666))
+//            val voiceDrawable = getResources().getDrawable(R.drawable.icon_xingzuo_default)
+//            voiceDrawable.setBounds(
+//                0,
+//                0,
+//                voiceDrawable.getMinimumWidth(),
+//                voiceDrawable.getMinimumHeight()
+//            )
+//            val userDrawable = getResources().getDrawable(R.drawable.icon_my_click_xinzeng)
+//            userDrawable.setBounds(
+//                0,
+//                0,
+//                userDrawable.getMinimumWidth(),
+//                userDrawable.getMinimumHeight()
+//            )
+//            val videoDrawable = getResources().getDrawable(R.drawable.icon_shouye_default)
+//            videoDrawable.setBounds(
+//                0,
+//                0,
+//                videoDrawable.getMinimumWidth(),
+//                videoDrawable.getMinimumHeight()
+//            )
+//            val warehouseDrawable = getResources().getDrawable(R.drawable.icon_xiaoxi_default)
+//            warehouseDrawable.setBounds(
+//                0,
+//                0,
+//                videoDrawable.getMinimumWidth(),
+//                videoDrawable.getMinimumHeight()
+//            )
+//            mVoiceroomText?.setCompoundDrawables(null, voiceDrawable, null, null)
+//            mUserText?.setCompoundDrawables(null, userDrawable, null, null)
+//            mVideoText?.setCompoundDrawables(null, videoDrawable, null, null)
+//            mWarehouseText?.setCompoundDrawables(null, warehouseDrawable, null, null)
             navifationCallback?.onNavigationClick(it.id)
-//            }
         }
-        mVoiceroomText?.setOnClickListener {
-            mVoiceroomText?.setTextColor(resources.getColor(R.color.color_aa60ff))
-            mVideoText?.setTextColor(resources.getColor(R.color.color_666666))
-            mUserText?.setTextColor(resources.getColor(R.color.color_666666))
-            mWarehouseText?.setTextColor(resources.getColor(R.color.color_666666))
-            val voiceDrawable = getResources().getDrawable(R.drawable.icon_yuyin_click)
-            voiceDrawable.setBounds(
-                0,
-                0,
-                voiceDrawable.getMinimumWidth(),
-                voiceDrawable.getMinimumHeight()
-            )
-            val userDrawable = getResources().getDrawable(R.drawable.icon_my_default)
-            userDrawable.setBounds(
-                0,
-                0,
-                userDrawable.getMinimumWidth(),
-                userDrawable.getMinimumHeight()
-            );
-
-            val videoDrawable = getResources().getDrawable(R.drawable.icon_shouye_default)
-            videoDrawable.setBounds(
-                0,
-                0,
-                videoDrawable.getMinimumWidth(),
-                videoDrawable.getMinimumHeight()
-            )
-            val warehouseDrawable = getResources().getDrawable(R.drawable.icon_xiaoxi_default)
-            warehouseDrawable.setBounds(
-                0,
-                0,
-                videoDrawable.getMinimumWidth(),
-                videoDrawable.getMinimumHeight()
-            )
-            mVoiceroomText?.setCompoundDrawables(null,voiceDrawable,null,null)
-            mUserText?.setCompoundDrawables(null, userDrawable, null, null)
-            mVideoText?.setCompoundDrawables(null, videoDrawable, null, null)
-            mWarehouseText?.setCompoundDrawables(null, warehouseDrawable, null, null)
+        id_ll_bottom_shouye?.setOnClickListener {
+            id_view_navigation_bottom_user?.setImageResource(R.drawable.icon_my_default)
+            id_view_navigation_bottom_msg?.setImageResource(R.drawable.icon_xiaoxi_default)
+            id_view_navigation_bottom_xingzuo?.setImageResource(R.drawable.icon_xingzuo_default)
+            id_view_navigation_bottom_shouye?.setImageResource(R.drawable.icon_shouye_click)
             navifationCallback?.onNavigationClick(it.id)
         }
-        mVideoText?.setOnClickListener {
-            mVideoText?.setTextColor(resources.getColor(R.color.color_aa60ff))
-            mUserText?.setTextColor(resources.getColor(R.color.color_666666))
-            mWarehouseText?.setTextColor(resources.getColor(R.color.color_666666))
-            mVoiceroomText?.setTextColor(resources.getColor(R.color.color_666666))
-            val voiceDrawable = getResources().getDrawable(R.drawable.icon_yuyin_default)
-            voiceDrawable.setBounds(
-                0,
-                0,
-                voiceDrawable.getMinimumWidth(),
-                voiceDrawable.getMinimumHeight()
-            )
-            val userDrawable = getResources().getDrawable(R.drawable.icon_my_default)
-            userDrawable.setBounds(
-                0,
-                0,
-                userDrawable.getMinimumWidth(),
-                userDrawable.getMinimumHeight()
-            )
-
-            val videoDrawable = getResources().getDrawable(R.drawable.icon_shouye_click)
-            videoDrawable.setBounds(
-                0,
-                0,
-                videoDrawable.getMinimumWidth(),
-                videoDrawable.getMinimumHeight()
-            )
-            val warehouseDrawable = getResources().getDrawable(R.drawable.icon_xiaoxi_default)
-            warehouseDrawable.setBounds(
-                0,
-                0,
-                videoDrawable.getMinimumWidth(),
-                videoDrawable.getMinimumHeight()
-            )
-            mVoiceroomText?.setCompoundDrawables(null,voiceDrawable,null,null)
-            mUserText?.setCompoundDrawables(null, userDrawable, null, null)
-            mVideoText?.setCompoundDrawables(null, videoDrawable, null, null)
-            mWarehouseText?.setCompoundDrawables(null, warehouseDrawable, null, null)
+        id_ll_bottom_xingzuo?.setOnClickListener {
+            id_view_navigation_bottom_user?.setImageResource(R.drawable.icon_my_default)
+            id_view_navigation_bottom_msg?.setImageResource(R.drawable.icon_xiaoxi_default)
+            id_view_navigation_bottom_xingzuo?.setImageResource(R.drawable.icon_xingzuo_click)
+            id_view_navigation_bottom_shouye?.setImageResource(R.drawable.icon_shouye_default)
             navifationCallback?.onNavigationClick(it.id)
         }
-        mWarehouseText?.setOnClickListener {
-            mVideoText?.setTextColor(resources.getColor(R.color.color_666666))
-            mUserText?.setTextColor(resources.getColor(R.color.color_666666))
-            mWarehouseText?.setTextColor(resources.getColor(R.color.color_aa60ff))
-            mVoiceroomText?.setTextColor(resources.getColor(R.color.color_666666))
-            val voiceDrawable = getResources().getDrawable(R.drawable.icon_yuyin_default)
-            voiceDrawable.setBounds(
-                0,
-                0,
-                voiceDrawable.getMinimumWidth(),
-                voiceDrawable.getMinimumHeight()
-            )
-            val userDrawable = getResources().getDrawable(R.drawable.icon_my_default)
-            userDrawable.setBounds(
-                0,
-                0,
-                userDrawable.getMinimumWidth(),
-                userDrawable.getMinimumHeight()
-            )
-            val videoDrawable = getResources().getDrawable(R.drawable.icon_shouye_default)
-            videoDrawable.setBounds(
-                0,
-                0,
-                videoDrawable.getMinimumWidth(),
-                videoDrawable.getMinimumHeight()
-            )
-            val warehouseDrawable = getResources().getDrawable(R.drawable.icon_xiaoxi_click)
-            warehouseDrawable.setBounds(
-                0,
-                0,
-                videoDrawable.getMinimumWidth(),
-                videoDrawable.getMinimumHeight()
-            )
-            mVoiceroomText?.setCompoundDrawables(null,voiceDrawable,null,null)
-            mUserText?.setCompoundDrawables(null, userDrawable, null, null)
-            mVideoText?.setCompoundDrawables(null, videoDrawable, null, null)
-            mWarehouseText?.setCompoundDrawables(null, warehouseDrawable, null, null)
+        id_ll_bottom_msg?.setOnClickListener {
+            id_view_navigation_bottom_user?.setImageResource(R.drawable.icon_my_default)
+            id_view_navigation_bottom_msg?.setImageResource(R.drawable.icon_xiaoxi_click)
+            id_view_navigation_bottom_xingzuo?.setImageResource(R.drawable.icon_xingzuo_default)
+            id_view_navigation_bottom_shouye?.setImageResource(R.drawable.icon_shouye_default)
             navifationCallback?.onNavigationClick(it.id)
         }
     }

moduleMain/src/main/res/drawable/shape_03c160_rectangle.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+
+    <solid android:color="#ff03c160" />
+    <item android:name="android:shadowColor">#99000000</item>
+    <item android:name="android:shadowDx">1</item>
+    <item android:name="android:shadowDy">1</item>
+
+
+</shape>
\ No newline at end of file

moduleMain/src/main/res/drawable/shape_50000000_r10.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="#7F000000" />
+    <corners android:radius="20dp" />
+
+</shape>
\ No newline at end of file

moduleMain/src/main/res/drawable/shape_824fff_r16.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+            <solid android:color="#ff824fff" />
+            <corners android:radius="16dp" />
+</shape>
\ No newline at end of file

moduleMain/src/main/res/drawable/shape_boy_bg.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="#ff488fff" />
+    <corners
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="8dp"
+        android:topLeftRadius="8dp"
+        android:topRightRadius="8dp" />
+
+</shape>
\ No newline at end of file

moduleMain/src/main/res/drawable/shape_girl_bg.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="#ffff3b95" />
+    <corners
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="8dp"
+        android:topLeftRadius="8dp"
+        android:topRightRadius="8dp" />
+
+</shape>
\ No newline at end of file

moduleMain/src/main/res/layout/activity_layout_block_list.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#F6F6F6"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/id_rl_title"
+        android:layout_width="match_parent"
+        android:layout_height="78dp"
+        android:background="@color/white">
+
+        <ImageView
+            android:id="@+id/id_img_back"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:padding="15dp"
+            android:src="@drawable/icon_fanhui_hei" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="12dp"
+            android:includeFontPadding="false"
+            android:text="Blacklist"
+            android:textColor="@color/color_333333"
+            android:textSize="18sp" />
+    </RelativeLayout>
+
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+</LinearLayout>

moduleMain/src/main/res/layout/activity_layout_update_introdution.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#F6F6F6"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/id_rl_title"
+        android:layout_width="match_parent"
+        android:layout_height="68dp"
+        android:background="@color/white">
+
+        <ImageView
+            android:id="@+id/id_img_back"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:padding="15dp"
+            android:src="@drawable/icon_fanhui_hei" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="12dp"
+            android:includeFontPadding="false"
+            android:text="Introduction"
+            android:textColor="@color/color_333333"
+            android:textSize="18sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true"
+            android:padding="10dp"
+            android:text="SAVE"
+            android:textColor="@color/color_824fff"
+            android:textSize="15sp"
+            android:textStyle="bold" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="180dp"
+        android:layout_margin="10dp"
+        android:background="@drawable/shape_ffffff_r5">
+
+        <EditText
+            android:id="@+id/id_edit_introdution"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@null"
+            android:gravity="left"
+            android:maxLength="140"
+            android:textColor="@color/color_999999"
+            android:textColorHint="#CCCCCC"
+            android:textCursorDrawable="@color/color_824fff"
+            android:textSize="@dimen/sp_13" />
+
+        <TextView
+            android:id="@+id/id_tv_length"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginRight="10dp"
+            android:layout_marginBottom="10dp"
+            android:text="0/140"
+            android:textColor="@color/color_999999"
+            android:textSize="15sp" />
+    </RelativeLayout>
+
+</LinearLayout>

moduleMain/src/main/res/layout/activity_layout_update_nick_name.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#F6F6F6"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/id_rl_title"
+        android:layout_width="match_parent"
+        android:layout_height="68dp"
+        android:background="@color/white">
+
+        <ImageView
+            android:id="@+id/id_img_back"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:padding="15dp"
+            android:src="@drawable/icon_fanhui_hei" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="12dp"
+            android:includeFontPadding="false"
+            android:text="Nick name"
+            android:textColor="@color/color_333333"
+            android:textSize="18sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true"
+            android:padding="10dp"
+            android:text="SAVE"
+            android:textColor="@color/color_824fff"
+            android:textSize="15sp"
+            android:textStyle="bold" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="70dp"
+        android:layout_margin="10dp"
+        android:background="@drawable/shape_ffffff_r5">
+
+        <EditText
+            android:id="@+id/id_edit_nickname"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@null"
+            android:gravity="left"
+            android:padding="10dp"
+            android:textColor="@color/color_999999"
+            android:textColorHint="#CCCCCC"
+            android:textCursorDrawable="@color/color_824fff"
+            android:textSize="@dimen/sp_13" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:padding="5dp"
+            android:src="@drawable/icon_edit_clear" />
+    </RelativeLayout>
+
+</LinearLayout>

moduleMain/src/main/res/layout/activity_layout_user_info.xml

@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#F6F6F6">
+    android:background="@color/white">
 
     <RelativeLayout
         android:id="@+id/id_rl_title"
@@ -25,15 +25,23 @@
             android:layout_centerHorizontal="true"
             android:layout_marginBottom="12dp"
             android:includeFontPadding="false"
-            android:text="个人信息"
+            android:text="Profile"
             android:textColor="@color/color_333333"
             android:textSize="18sp" />
     </RelativeLayout>
 
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/id_rl_choose_photo"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/id_rl_title"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp" />
+
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@+id/id_rl_title">
+        android:layout_below="@+id/id_rl_choose_photo">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -43,6 +51,7 @@
             android:layout_marginBottom="@dimen/dp_20"
             android:orientation="vertical">
 
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -51,13 +60,15 @@
                 android:layout_marginBottom="@dimen/dp_10"
                 android:text="填写个人信息,让大家更了解你~"
                 android:textColor="@color/color_999999"
-                android:textSize="13sp" />
+                android:textSize="13sp"
+                android:visibility="gone" />
 
             <RelativeLayout
                 android:id="@+id/id_rl_voice"
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
-                android:background="@drawable/shape_ffffff_r5">
+                android:background="@drawable/shape_ffffff_r5"
+                android:visibility="gone">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -80,11 +91,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_10"
-                android:background="@drawable/shape_ffffff_r5"
-                android:orientation="vertical"
-                android:paddingLeft="@dimen/dp_10"
-                android:paddingRight="@dimen/dp_10">
+                android:orientation="vertical">
 
                 <RelativeLayout
                     android:layout_width="match_parent"
@@ -94,9 +101,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
-                        android:text="头像"
+                        android:text="Portrait"
                         android:textColor="@color/color_333333"
-                        android:textSize="@dimen/sp_13" />
+                        android:textSize="15sp" />
 
                     <ImageView
                         android:id="@+id/id_img_head"
@@ -113,6 +120,7 @@
                     android:background="#EDEDED" />
 
                 <RelativeLayout
+                    android:id="@+id/id_rl_nick_name"
                     android:layout_width="match_parent"
                     android:layout_height="50dp">
 
@@ -120,23 +128,23 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
-                        android:text="昵称"
+                        android:text="Nick name"
                         android:textColor="@color/color_333333"
-                        android:textSize="@dimen/sp_13" />
+                        android:textSize="15sp" />
 
-                    <EditText
+                    <TextView
                         android:id="@+id/id_edit_nickname"
                         android:layout_width="150dp"
                         android:layout_height="match_parent"
                         android:layout_alignParentRight="true"
                         android:background="@null"
+                        android:drawableRight="@drawable/icon_edit_right"
+                        android:drawablePadding="10dp"
+                        android:ellipsize="end"
                         android:gravity="right|center_vertical"
                         android:maxLength="10"
                         android:textColor="@color/color_999999"
-                        android:textColorHint="#CCCCCC"
-                        android:textCursorDrawable="@null"
-                        android:hint="@string/no_write"
-                        android:textSize="@dimen/sp_13" />
+                        android:textSize="15sp" />
                 </RelativeLayout>
 
                 <View
@@ -146,7 +154,8 @@
 
                 <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="114dp">
+                    android:layout_height="114dp"
+                    android:visibility="gone">
 
                     <TextView
                         android:id="@+id/id_tv_qianming"
@@ -193,10 +202,39 @@
                 android:layout_marginTop="@dimen/dp_10"
                 android:background="@drawable/shape_ffffff_r5"
                 android:orientation="vertical"
-                android:paddingLeft="@dimen/dp_10"
-                android:paddingRight="@dimen/dp_10"
                 android:visibility="visible">
 
+                <RelativeLayout
+                    android:id="@+id/id_rl_gender"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_50">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:text="Gender"
+                        android:textColor="@color/color_333333"
+                        android:textSize="15sp" />
+
+                    <TextView
+                        android:id="@+id/id_tv_gender"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:drawableRight="@drawable/icon_edit_right"
+                        android:drawablePadding="10dp"
+                        android:textColor="@color/color_999999"
+                        android:textColorHint="#CCCCCC"
+                        android:textSize="15sp" />
+                </RelativeLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0.5dp"
+                    android:background="#EDEDED" />
+
                 <RelativeLayout
                     android:id="@+id/id_rl_birth"
                     android:layout_width="match_parent"
@@ -206,9 +244,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
-                        android:text="生日"
+                        android:text="Age"
                         android:textColor="@color/color_333333"
-                        android:textSize="@dimen/sp_13" />
+                        android:textSize="15sp" />
 
                     <TextView
                         android:id="@+id/id_tv_birth"
@@ -216,10 +254,11 @@
                         android:layout_height="wrap_content"
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
+                        android:drawableRight="@drawable/icon_edit_right"
+                        android:drawablePadding="10dp"
                         android:textColor="@color/color_999999"
                         android:textColorHint="#CCCCCC"
-                        android:textSize="@dimen/sp_13"
-                        android:hint="@string/no_choose"/>
+                        android:textSize="15sp" />
                 </RelativeLayout>
 
                 <View
@@ -230,7 +269,8 @@
                 <RelativeLayout
                     android:id="@+id/id_rl_height"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/dp_50">
+                    android:layout_height="@dimen/dp_50"
+                    android:visibility="gone">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -255,12 +295,14 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="0.5dp"
-                    android:background="#EDEDED" />
+                    android:background="#EDEDED"
+                    android:visibility="gone" />
 
                 <RelativeLayout
                     android:id="@+id/id_rl_weight"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/dp_50">
+                    android:layout_height="@dimen/dp_50"
+                    android:visibility="gone">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -281,6 +323,82 @@
                         android:textColorHint="#CCCCCC"
                         android:textSize="@dimen/sp_13" />
                 </RelativeLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0.5dp"
+                    android:background="#EDEDED"
+                    android:visibility="gone" />
+
+                <RelativeLayout
+                    android:id="@+id/id_rl_location"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_50"
+                    android:visibility="visible">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:text="Location"
+                        android:textColor="@color/color_333333"
+                        android:textSize="@dimen/sp_13" />
+
+                    <TextView
+                        android:id="@+id/id_tv_location"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:drawableRight="@drawable/icon_edit_right"
+                        android:drawablePadding="10dp"
+                        android:visibility="invisible"
+                        android:textColor="@color/color_999999"
+                        android:textColorHint="#CCCCCC"
+                        android:textSize="15sp" />
+                </RelativeLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0.5dp"
+                    android:background="#EDEDED"
+                    android:visibility="visible" />
+
+                <RelativeLayout
+                    android:id="@+id/id_rl_introduction"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="15dp"
+                    android:visibility="visible">
+
+                    <TextView
+                        android:id="@+id/id_tv_title_trip"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:text="Introduction"
+                        android:textColor="@color/color_333333"
+                        android:textSize="@dimen/sp_13" />
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:layout_marginTop="18dp"
+                        android:src="@drawable/icon_edit_right" />
+
+                    <TextView
+                        android:id="@+id/id_tv_introduction"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:layout_below="@+id/id_tv_title_trip"
+                        android:textColor="@color/color_999999"
+                        android:textSize="15sp" />
+                </RelativeLayout>
+
+
             </LinearLayout>
 
             <LinearLayout
@@ -290,7 +408,8 @@
                 android:background="@drawable/shape_ffffff_r5"
                 android:orientation="vertical"
                 android:paddingLeft="@dimen/dp_10"
-                android:paddingRight="@dimen/dp_10">
+                android:paddingRight="@dimen/dp_10"
+                android:visibility="gone">
 
                 <RelativeLayout
                     android:id="@+id/id_rl_city"
@@ -311,9 +430,9 @@
                         android:layout_height="wrap_content"
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
+                        android:hint="@string/no_choose"
                         android:textColor="@color/color_999999"
                         android:textColorHint="#CCCCCC"
-                        android:hint="@string/no_choose"
                         android:textSize="@dimen/sp_13" />
                 </RelativeLayout>
 
@@ -377,6 +496,7 @@
                         android:textSize="@dimen/sp_13" />
                 </RelativeLayout>
             </LinearLayout>
+
             <TextView
                 android:id="@+id/id_tv_sava_info"
                 android:layout_width="match_parent"
@@ -387,7 +507,8 @@
                 android:text="保存信息"
                 android:textColor="@color/white"
                 android:textSize="18sp"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                android:visibility="gone" />
         </LinearLayout>
 
 

moduleMain/src/main/res/layout/dialog_layout_date.xml

@@ -18,7 +18,7 @@
             android:paddingTop="10dp"
             android:paddingRight="15dp"
             android:paddingBottom="10dp"
-            android:text="取消"
+            android:text="Cancel"
             android:textColor="@color/color_333333"
             android:textSize="@dimen/sp_15"
             android:textStyle="bold" />
@@ -31,7 +31,7 @@
             android:paddingTop="10dp"
             android:paddingRight="15dp"
             android:paddingBottom="10dp"
-            android:text="选择生日"
+            android:text="Select age"
             android:textColor="@color/color_333333"
             android:textSize="@dimen/sp_15"
             android:textStyle="bold" />
@@ -45,7 +45,7 @@
             android:paddingTop="10dp"
             android:paddingRight="15dp"
             android:paddingBottom="10dp"
-            android:text="确定"
+            android:text="Confirm"
             android:textColor="@color/color_aa60ff"
             android:textSize="@dimen/sp_15" />
     </RelativeLayout>

moduleMain/src/main/res/layout/dialog_layout_gender.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/id_tv_quxiao"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="15dp"
+            android:paddingTop="10dp"
+            android:paddingRight="15dp"
+            android:paddingBottom="10dp"
+            android:text="Cancel"
+            android:textColor="@color/color_333333"
+            android:textSize="@dimen/sp_15"
+            android:textStyle="bold" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:paddingLeft="15dp"
+            android:paddingTop="10dp"
+            android:paddingRight="15dp"
+            android:paddingBottom="10dp"
+            android:text="Select gender"
+            android:textColor="@color/color_333333"
+            android:textSize="@dimen/sp_15"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/id_tv_sure"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:paddingLeft="15dp"
+            android:paddingTop="10dp"
+            android:paddingRight="15dp"
+            android:paddingBottom="10dp"
+            android:text="Confirm"
+            android:textColor="@color/color_aa60ff"
+            android:textSize="@dimen/sp_15" />
+    </RelativeLayout>
+
+    <com.cncoderx.wheelview.Wheel3DView
+        android:id="@+id/wheel3d"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_30"
+        app:wheelCyclic="true"
+        app:wheelEntries="@array/default_gender"
+        app:wheelItemCount="9"
+        app:wheelItemWidth="160dp"
+        app:wheelItemHeight="40dp"
+        app:wheelTextSize="18sp"
+        app:wheelTextColor="@color/c1c1c1"
+        app:wheelSelectedTextColor="@color/color_333333"
+        app:wheelDividerColor="@color/ededed"
+        app:wheelHighlightColor="@color/wheel_highlight_color" />
+</LinearLayout>

moduleMain/src/main/res/layout/fragment_layout_constellation_match.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/bj_xingzuo"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="35dp"
+        android:text=" Horoscope love match"
+        android:textColor="@color/white"
+        android:textSize="18sp"
+        android:textStyle="bold" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="30dp">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:src="@drawable/icon_xingzuo" />
+
+
+    </RelativeLayout>
+
+</LinearLayout>

moduleMain/src/main/res/layout/item_layout_home.xml

@@ -30,16 +30,39 @@
         android:paddingBottom="3dp"
         android:textColor="@color/white"
         android:textSize="11sp"
-        android:textStyle="bold" />
+        android:textStyle="bold"
+        android:visibility="gone" />
+
+    <LinearLayout
+        android:layout_width="58dp"
+        android:layout_height="20dp"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="5dp"
+        android:layout_marginRight="5dp"
+        android:background="@drawable/shape_50000000_r10"
+        android:gravity="center">
+
+        <View
+            android:layout_width="5dp"
+            android:layout_height="5dp"
+            android:layout_marginRight="4dp"
+            android:background="@drawable/shape_03c160_rectangle" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Online"
+            android:textColor="#03C160"
+            android:textSize="12sp" />
+    </LinearLayout>
 
     <ImageView
         android:id="@+id/id_img_online"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/id_tv_satus"
-        android:layout_marginLeft="5dp"
-        android:layout_marginTop="5dp"
-        android:src="@drawable/icon_zaixian" />
+        android:layout_alignParentRight="true"
+        android:src="@drawable/icon_zaixian"
+        android:visibility="gone" />
 
     <TextView
         android:id="@+id/id_tv_chakan_juli"
@@ -56,7 +79,7 @@
         android:text="查看距离"
         android:textColor="@color/white"
         android:textSize="11sp"
-        android:visibility="visible" />
+        android:visibility="gone" />
 
     <TextView
         android:id="@+id/id_tv_juli"
@@ -87,19 +110,50 @@
         android:orientation="vertical"
         android:paddingBottom="11.5dp">
 
-        <TextView
-            android:id="@+id/id_tv_user_nick_name"
-            android:layout_width="80dp"
+        <LinearLayout
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
-            android:ellipsize="end"
-            android:maxLength="10"
-            android:shadowColor="#99000000"
-            android:shadowDx="1.0"
-            android:shadowDy="1.0"
-            android:shadowRadius="3.0"
-            android:textColor="@color/white"
-            android:textSize="11sp" />
+            android:gravity="center_vertical">
+
+            <TextView
+                android:id="@+id/id_tv_user_nick_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:ellipsize="end"
+                android:includeFontPadding="false"
+                android:lines="1"
+                android:maxWidth="65dp"
+                android:maxLength="10"
+                android:shadowColor="#99000000"
+                android:shadowDx="1.0"
+                android:shadowDy="1.0"
+                android:shadowRadius="3.0"
+                android:textColor="@color/white"
+                android:textSize="13sp" />
+
+            <LinearLayout
+                android:layout_width="36dp"
+                android:layout_height="16dp"
+                android:layout_marginLeft="5dp"
+                android:background="@drawable/shape_girl_bg"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/id_tv_age"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:drawableLeft="@drawable/icon_little_nv"
+                    android:drawablePadding="3dp"
+                    android:includeFontPadding="false"
+                    android:text="0"
+                    android:textColor="@color/white"
+                    android:textSize="11sp" />
+
+            </LinearLayout>
+
+        </LinearLayout>
 
 
         <RelativeLayout
@@ -109,7 +163,7 @@
             android:layout_marginLeft="5dp"
             android:layout_marginTop="5dp"
             android:background="@drawable/shape_000000_r5"
-            android:visibility="visible">
+            android:visibility="gone">
 
             <ImageView
                 android:id="@+id/id_img_voice"
@@ -150,8 +204,17 @@
         android:layout_height="40dp"
         android:layout_above="@+id/id_ll_bottom_right"
         android:layout_alignParentRight="true"
-        android:layout_marginBottom="-10dp"
-        android:layout_marginRight="18dp" />
+        android:layout_marginRight="18dp"
+        android:layout_marginBottom="-10dp" />
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="5dp"
+        android:layout_marginRight="5dp"
+        android:src="@drawable/icon_shipin" />
 
     <LinearLayout
         android:id="@+id/id_ll_bottom_right"
@@ -162,7 +225,8 @@
         android:layout_marginBottom="5dp"
         android:gravity="center_horizontal"
         android:orientation="vertical"
-        android:padding="5dp">
+        android:padding="5dp"
+        android:visibility="gone">
 
         <ImageView
             android:id="@+id/id_img_home_like"

moduleMain/src/main/res/layout/layout_item_block_list.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="10dp"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:src="@drawable/item_head" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_weight="1"
+        android:ellipsize="end"
+        android:lines="1"
+        android:text="Mike"
+        android:textColor="@color/color_333333"
+        android:textSize="15sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/shape_824fff_r16"
+        android:paddingLeft="10dp"
+        android:paddingTop="5dp"
+        android:paddingRight="10dp"
+        android:paddingBottom="5dp"
+        android:text="Remove Blacklist"
+        android:textColor="@color/white"
+        android:textSize="15sp" />
+</LinearLayout>

moduleMain/src/main/res/layout/view_navigation_bottom.xml

@@ -12,83 +12,78 @@
         android:gravity="bottom"
         android:orientation="horizontal">
 
-        <TextView
-            android:id="@+id/id_view_navigation_bottom_box"
+        <LinearLayout
+            android:id="@+id/id_ll_bottom_shouye"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
+            android:layout_height="match_parent"
             android:layout_weight="1"
-            android:drawableTop="@drawable/icon_shouye_click"
-            android:drawablePadding="2dp"
-            android:gravity="center"
-            android:includeFontPadding="false"
-            android:text="首页"
-            android:textColor="@color/color_aa60ff"
-            android:textSize="11sp" />
-        <TextView
-            android:id="@+id/id_view_navigation_bottom_voice_room"
+            android:gravity="center">
+
+            <ImageView
+                android:id="@+id/id_view_navigation_bottom_shouye"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/icon_shouye_click" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/id_ll_bottom_xingzuo"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
+            android:layout_height="match_parent"
             android:layout_weight="1"
-            android:drawableTop="@drawable/icon_yuyin_default"
-            android:drawablePadding="2dp"
-            android:gravity="center"
-            android:includeFontPadding="false"
-            android:text="语音房"
-            android:textColor="@color/color_666666"
-            android:textSize="11sp" />
+            android:gravity="center">
+
+            <ImageView
+                android:id="@+id/id_view_navigation_bottom_xingzuo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/icon_xingzuo_default" />
+        </LinearLayout>
 
         <RelativeLayout
+            android:id="@+id/id_ll_bottom_msg"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1">
 
-            <TextView
+            <ImageView
                 android:id="@+id/id_view_navigation_bottom_msg"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
-                android:layout_gravity="center_vertical"
-                android:drawableTop="@drawable/icon_xiaoxi_default"
-                android:drawablePadding="2dp"
+                android:src="@drawable/icon_xiaoxi_default" />
+
+            <TextView
+                android:id="@+id/id_tv_msg_num"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignTop="@+id/id_view_navigation_bottom_msg"
+                android:layout_marginLeft="-7dp"
+                android:layout_toRightOf="@+id/id_view_navigation_bottom_msg"
+                android:background="@drawable/icon_3"
                 android:gravity="center"
                 android:includeFontPadding="false"
-                android:text="消息"
-                android:textColor="@color/color_666666"
-                android:textSize="11sp"
-                />
-
-
-                <TextView
-                    android:id="@+id/id_tv_msg_num"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:includeFontPadding="false"
-                    android:textColor="@color/white"
-                    android:layout_alignTop="@+id/id_view_navigation_bottom_msg"
-                    android:layout_toRightOf="@+id/id_view_navigation_bottom_msg"
-                    android:background="@drawable/icon_3"
-                    android:visibility="gone"
-                    android:textSize="10sp"
-                    android:gravity="center"
-                    android:layout_marginLeft="-7dp"
-                    android:textStyle="bold"
-                    android:text="99+"/>
+                android:textColor="@color/white"
+                android:textSize="10sp"
+                android:textStyle="bold"
+                android:visibility="gone" />
 
         </RelativeLayout>
 
-        <TextView
-            android:id="@+id/id_view_navigation_bottom_user"
+        <LinearLayout
+            android:id="@+id/id_ll_bottom_user"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
+            android:layout_height="match_parent"
             android:layout_weight="1"
-            android:drawableTop="@drawable/icon_my_default"
-            android:drawablePadding="2dp"
-            android:gravity="center"
-            android:text="我的"
-            android:textColor="@color/color_666666"
-            android:textSize="11sp" />
+            android:gravity="center">
+
+            <ImageView
+                android:id="@+id/id_view_navigation_bottom_user"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/icon_my_default" />
+        </LinearLayout>
+
+
     </LinearLayout>
 </merge>
\ No newline at end of file

moduleUc/src/main/java/com/zxhl/uc/page/fragment/SettingActivity.kt

@@ -36,11 +36,14 @@ class SettingActivity : BaseActivity(), UpdateCallback {
         id_img_back?.setOnClickListener {
             finish()
         }
+        id_rl_black_list?.setOnClickListener {
+            JumpUtils.BlockListJump()
+        }
         id_rl_yinsizhengce?.setOnClickListener {
-            JumpUtils.webJump("隐私政策", NetConfig.H5.WEB_URL_PRIVACY)
+            JumpUtils.webJump("Privacy policy", NetConfig.H5.WEB_URL_PRIVACY)
         }
         id_rl_yonghu_xieyi?.setOnClickListener {
-            JumpUtils.webJump("用户服务协议", NetConfig.H5.WEB_URL_USER)
+            JumpUtils.webJump("Terms of service", NetConfig.H5.WEB_URL_USER)
         }
         id_rl_zenzhi_xieyi?.setOnClickListener {
             JumpUtils.webJump("增值服务协议", NetConfig.H5.WEB_URL_BUYER_KNOW)

moduleUc/src/main/java/com/zxhl/uc/page/fragment/UserCenterFragment.kt

@@ -58,15 +58,6 @@ class UserCenterFragment : BaseFragment(), AdCallback<String>,
     private var iwHelper: ImageWatcherHelper? = null
     var isTranslucentStatus = false
     override fun init(view: View?) {
-        if (TextUtils.equals(
-                Utils.getChannel(mActivity),
-                "vivo"
-            )
-        ) {
-            id_rl_zaixiankefu.visibility=View.VISIBLE
-        }else{
-            id_rl_zaixiankefu.visibility=View.GONE
-        }
         mLoading = LoadingDialog.getLoadingDialog(
             mActivity,
             getString(com.zxhl.cms.R.string.wait_ing),
@@ -129,7 +120,7 @@ class UserCenterFragment : BaseFragment(), AdCallback<String>,
             JumpUtils.UserInfoJump()
         }
         id_rl_zaixiankefu?.setOnClickListener {
-            JumpUtils.webJump("在线客服", NetConfig.H5.WEB_URL_CUSTOMER_SERVICE)
+            JumpUtils.webJump("Customer Service", NetConfig.H5.WEB_URL_CUSTOMER_SERVICE)
         }
         id_ll_my_follow?.setOnClickListener {
             JumpUtils.MyFollowJump()
@@ -141,14 +132,14 @@ class UserCenterFragment : BaseFragment(), AdCallback<String>,
             EventUtils.onEvent("CheckLikedMe", "查看喜欢我")
             JumpUtils.MyLikesJump()
         }
-        id_rl_jiyijan?.setOnClickListener {
-            JumpUtils.FeedBackJump()
-        }
+//        id_rl_jiyijan?.setOnClickListener {
+//            JumpUtils.FeedBackJump()
+//        }
         id_rl_setting?.setOnClickListener {
             JumpUtils.SettingJump()
         }
         id_rl_about_us?.setOnClickListener {
-            JumpUtils.webJump("关于我们", NetConfig.H5.WEB_URL_ABOUT_US)
+            JumpUtils.webJump("About us", NetConfig.H5.WEB_URL_ABOUT_US)
         }
 
 
@@ -201,28 +192,34 @@ class UserCenterFragment : BaseFragment(), AdCallback<String>,
         if (user == null) {
             return
         }
+        id_tv_yu_e_trip?.text = "${user.starBalance}"
         if (user.memberType == 0) {
-            id_tv_vip_trip?.text = "立即升级"
-            id_tv_vip_trip?.setTextColor(AppContext.get().resources.getColor(R.color.white))
-            id_tv_vip_trip.setBackgroundResource(R.drawable.shape_ffa211_r15_stoke)
-        } else {
-            id_tv_vip_trip?.text = "立即续费"
-            id_tv_vip_trip?.setTextColor(AppContext.get().resources.getColor(R.color.ffa211))
-            id_tv_vip_trip.setBackgroundResource(R.drawable.shape_ffffff_ffa211_r15)
-        }
-
-        if (user.noRecharged) {
-            //未充值过
-            id_tv_yu_e_trip?.text = "充值星币获取超多玩法"
-            id_tv_coin_trip?.text = "立即充值"
-            id_tv_coin_trip?.setTextColor(AppContext.get().resources.getColor(R.color.white))
-            id_tv_coin_trip.setBackgroundResource(R.drawable.shape_ffc217_r15)
+            id_tv_member_date.visibility = View.GONE
+            id_tv_privileage?.visibility = View.VISIBLE
+            id_tv_member?.text = "Open VIP to unlock"
+            id_tv_privileage?.text = "privilege"
+//            id_tv_vip_trip?.setTextColor(AppContext.get().resources.getColor(R.color.white))
+//            id_tv_vip_trip.setBackgroundResource(R.drawable.shape_ffa211_r15_stoke)
         } else {
-            id_tv_yu_e_trip?.text = "星币余额：${user.starBalance}"
-            id_tv_coin_trip?.text = "继续充值"
-            id_tv_coin_trip?.setTextColor(AppContext.get().resources.getColor(R.color.ffc217))
-            id_tv_coin_trip.setBackgroundResource(R.drawable.shape_ffffff_ffc217_r15)
+            id_tv_member_date.visibility = View.VISIBLE
+            id_tv_privileage?.visibility = View.GONE
+            id_tv_member?.text = "VIP Expiration Date"
+            id_tv_member_date?.text = "${user.memberEndTime}"
+//            id_tv_vip_trip?.setTextColor(AppContext.get().resources.getColor(R.color.ffa211))
+//            id_tv_vip_trip.setBackgroundResource(R.drawable.shape_ffffff_ffa211_r15)
         }
+//        if (user.noRecharged) {
+//            //未充值过
+//            id_tv_yu_e_trip?.text = "充值星币获取超多玩法"
+//            id_tv_coin_trip?.text = "立即充值"
+//            id_tv_coin_trip?.setTextColor(AppContext.get().resources.getColor(R.color.white))
+//            id_tv_coin_trip.setBackgroundResource(R.drawable.shape_ffc217_r15)
+//        } else {
+//            id_tv_yu_e_trip?.text = "星币余额：${user.starBalance}"
+//            id_tv_coin_trip?.text = "继续充值"
+//            id_tv_coin_trip?.setTextColor(AppContext.get().resources.getColor(R.color.ffc217))
+//            id_tv_coin_trip.setBackgroundResource(R.drawable.shape_ffffff_ffc217_r15)
+//        }
         id_fragment_user_center_name?.text = user.nickname
         id_fragment_user_center_id?.text = "ID:" + user.uid
         if (!TextUtils.isEmpty(user.headImage)) {

moduleUc/src/main/res/drawable/shape_bd8aff_662cf5_r15.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <gradient
+        android:angle="180"
+        android:endColor="#ff662cf5"
+        android:startColor="#ffbd8aff"
+        android:type="linear"
+        android:useLevel="true" />
+    <corners android:radius="15dp" />
+
+</shape>
\ No newline at end of file

moduleUc/src/main/res/drawable/shape_f4ebff_f5edff.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <gradient
+        android:angle="135"
+        android:centerColor="#fff5edff"
+        android:endColor="#ffeef4ff"
+        android:startColor="#fff4ebff"
+        android:type="linear"
+        android:useLevel="true" />
+
+</shape>
\ No newline at end of file

moduleUc/src/main/res/drawable/shape_ffffff_r5.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-            <solid android:color="#ffffffff" />
-            <corners android:radius="5dp" />
+    <solid android:color="#ffffffff" />
+    <corners android:radius="10dp" />
 
 </shape>
\ No newline at end of file

moduleUc/src/main/res/layout/activity_layout_setting.xml

@@ -25,7 +25,7 @@
             android:layout_centerHorizontal="true"
             android:layout_marginBottom="12dp"
             android:includeFontPadding="false"
-            android:text="设置"
+            android:text="Settings"
             android:textColor="@color/color_333333"
             android:textSize="18sp" />
     </RelativeLayout>
@@ -49,7 +49,7 @@
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="15dp"
                 android:drawablePadding="10dp"
-                android:text="隐私政策"
+                android:text="Privacy policy"
                 android:textColor="@color/color_333333"
                 android:textSize="15sp" />
 
@@ -59,7 +59,8 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:layout_marginRight="15dp"
-                android:src="@drawable/icon_tuijin" />
+                android:src="@drawable/icon_user_center_right"
+                android:visibility="gone"/>
         </RelativeLayout>
 
         <View
@@ -80,7 +81,7 @@
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="15dp"
                 android:drawablePadding="10dp"
-                android:text="用户服务协议"
+                android:text="Terms of service"
                 android:textColor="@color/color_333333"
                 android:textSize="15sp" />
 
@@ -90,7 +91,8 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:layout_marginRight="15dp"
-                android:src="@drawable/icon_tuijin" />
+                android:src="@drawable/icon_user_center_right"
+                android:visibility="gone"/>
         </RelativeLayout>
 
         <View
@@ -103,7 +105,8 @@
         <RelativeLayout
             android:id="@+id/id_rl_zenzhi_xieyi"
             android:layout_width="match_parent"
-            android:layout_height="48dp">
+            android:layout_height="48dp"
+            android:visibility="gone">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -121,7 +124,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:layout_marginRight="15dp"
-                android:src="@drawable/icon_tuijin" />
+                android:src="@drawable/icon_user_center_right" />
         </RelativeLayout>
 
         <View
@@ -134,7 +137,8 @@
         <RelativeLayout
             android:id="@+id/id_rl_update"
             android:layout_width="match_parent"
-            android:layout_height="48dp">
+            android:layout_height="48dp"
+            android:visibility="gone">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -152,7 +156,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:layout_marginRight="15dp"
-                android:src="@drawable/icon_tuijin" />
+                android:src="@drawable/icon_user_center_right" />
         </RelativeLayout>
 
         <View
@@ -165,7 +169,8 @@
         <RelativeLayout
             android:id="@+id/id_rl_about_us"
             android:layout_width="match_parent"
-            android:layout_height="48dp">
+            android:layout_height="48dp"
+            android:visibility="gone">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -183,12 +188,13 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:layout_marginRight="15dp"
-                android:src="@drawable/icon_tuijin" />
+                android:src="@drawable/icon_user_center_right" />
         </RelativeLayout>
         <RelativeLayout
             android:id="@+id/id_rl_account_out"
             android:layout_width="match_parent"
-            android:layout_height="48dp">
+            android:layout_height="48dp"
+            android:visibility="gone">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -206,16 +212,40 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:layout_marginRight="15dp"
-                android:src="@drawable/icon_tuijin" />
+                android:src="@drawable/icon_user_center_right" />
         </RelativeLayout>
+        <RelativeLayout
+            android:id="@+id/id_rl_black_list"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:visibility="visible">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="15dp"
+                android:drawablePadding="10dp"
+                android:text="Blacklist"
+                android:textColor="@color/color_333333"
+                android:textSize="15sp" />
 
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="15dp"
+                android:src="@drawable/icon_user_center_right"
+                android:visibility="gone"/>
+        </RelativeLayout>
     </LinearLayout>
 
     <LinearLayout
         android:id="@+id/id_ll_login_out"
         android:layout_width="match_parent"
         android:layout_height="50dp"
-        android:background="@drawable/shape_ffffff_r5_shadow_color"
+        android:background="@drawable/shape_ffffff_r5"
         android:layout_alignParentBottom="true"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
@@ -225,8 +255,8 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="退出登录"
-            android:textColor="@color/color_333333"
+            android:text="Logout"
+            android:textColor="@color/color_824fff"
             android:textSize="18sp"
             android:textStyle="bold"/>
 

moduleUc/src/main/res/layout/fragment_user_center.xml

@@ -5,18 +5,28 @@
     android:background="#F6F6F6"
     android:orientation="vertical">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="124dp"
+        android:background="@drawable/shape_f4ebff_f5edff" />
+
     <RelativeLayout
         android:id="@+id/id_rl_top"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/bj_wode">
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="74dp"
+        android:layout_marginRight="10dp"
+        android:background="@drawable/shape_ffffff_r5"
+        android:visibility="visible">
 
         <ImageView
             android:id="@+id/id_fragment_user_center_photo"
             android:layout_width="60dp"
             android:layout_height="60dp"
             android:layout_marginLeft="15dp"
-            android:layout_marginTop="40dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="20dp"
             android:src="@drawable/icon_user_photo_default" />
 
         <LinearLayout
@@ -24,7 +34,8 @@
             android:layout_height="60dp"
             android:layout_below="@+id/id_fragment_user_center_photo"
             android:layout_marginRight="20dp"
-            android:gravity="center">
+            android:gravity="center"
+            android:visibility="gone">
 
             <LinearLayout
                 android:id="@+id/id_ll_my_follow"
@@ -110,17 +121,17 @@
             android:id="@+id/id_ll_info"
             android:layout_width="match_parent"
             android:layout_height="60dp"
-            android:layout_marginLeft="15dp"
-            android:layout_marginTop="40dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginTop="20dp"
             android:layout_toRightOf="@+id/id_fragment_user_center_photo"
             android:gravity="center_vertical"
             android:orientation="vertical">
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:gravity="center_vertical"
-                android:layout_marginBottom="5dp">
+                android:orientation="vertical">
 
                 <TextView
                     android:id="@+id/id_fragment_user_center_name"
@@ -129,7 +140,8 @@
                     android:ellipsize="end"
                     android:includeFontPadding="false"
                     android:lines="1"
-                    android:maxWidth="156dp"
+                    android:maxWidth="160dp"
+                    android:text="Mike"
                     android:textColor="@color/color_333333"
                     android:textSize="15sp"
                     android:textStyle="bold" />
@@ -138,9 +150,10 @@
                     android:id="@+id/id_fragment_user_center_id"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
+                    android:layout_marginTop="5dp"
                     android:lines="1"
-                    android:textColor="#999999"
+                    android:text="ID:9201280"
+                    android:textColor="@color/color_666666"
                     android:textSize="12sp" />
             </LinearLayout>
 
@@ -151,94 +164,148 @@
                 android:layout_marginRight="15dp"
                 android:ellipsize="end"
                 android:includeFontPadding="false"
+                android:textColor="@color/color_333333"
                 android:textSize="12sp"
-                android:textColor="@color/color_333333"/>
+                android:visibility="gone" />
         </LinearLayout>
 
 
     </RelativeLayout>
 
+
     <LinearLayout
         android:id="@+id/id_ll_vip"
         android:layout_width="match_parent"
-        android:layout_height="128dp"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/id_rl_top"
         android:layout_marginLeft="10dp"
-        android:layout_marginTop="171dp"
+        android:layout_marginTop="12dp"
         android:layout_marginRight="10dp"
-        android:background="@drawable/shape_ffffff_r5">
+        android:background="@drawable/shape_ffffff_r5"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+        android:visibility="visible">
 
         <LinearLayout
-            android:id="@+id/id_ll_pay_vip"
+            android:id="@+id/id_ll_star_coin"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:gravity="center"
+            android:gravity="center_horizontal"
             android:orientation="vertical">
 
             <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/icon_mumber_wode" />
-
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:src="@drawable/icon_xingbi_big" />
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="60dp"
+            android:orientation="vertical"
+            android:gravity="center_horizontal">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5dp"
                 android:layout_marginBottom="5dp"
-                android:text="升级会员获取超多权益"
+                android:includeFontPadding="false"
+                android:text="Coins Store"
+                android:textColor="@color/color_333333"
+                android:textSize="14sp"
+                android:textStyle="bold" />
+            <TextView
+                android:id="@+id/id_tv_yu_e_trip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:includeFontPadding="false"
+                android:text="0"
                 android:textColor="@color/color_666666"
-                android:textSize="12sp" />
+                android:textSize="15sp"
+                android:textStyle="bold" />
+        </LinearLayout>
 
             <TextView
-                android:id="@+id/id_tv_vip_trip"
+                android:id="@+id/id_tv_coin_trip"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/shape_ffffff_ffa211_r15"
+                android:background="@drawable/shape_bd8aff_662cf5_r15"
                 android:paddingLeft="30dp"
                 android:paddingTop="4dp"
                 android:paddingRight="30dp"
                 android:paddingBottom="4dp"
-                android:text="立即升级"
-                android:textColor="#FFA211"
-                android:textSize="15sp" />
+                android:text="Get coins"
+                android:textColor="@color/white"
+                android:textSize="15sp"
+                android:textStyle="bold" />
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/id_ll_star_coin"
+            android:id="@+id/id_ll_pay_vip"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:gravity="center"
+            android:gravity="center_horizontal"
             android:orientation="vertical">
 
             <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/icon_xingbi_big" />
-
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:src="@drawable/icon_mumber_wode" />
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="60dp"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
             <TextView
-                android:id="@+id/id_tv_yu_e_trip"
+                android:id="@+id/id_tv_member"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5dp"
                 android:layout_marginBottom="5dp"
-                android:text="充值星币获取超多玩法"
+                android:gravity="center"
+                android:includeFontPadding="false"
+                android:text="Open VIP to unlock"
+                android:textColor="@color/color_333333"
+                android:textSize="14sp"
+                android:textStyle="bold" />
+            <TextView
+                android:id="@+id/id_tv_privileage"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                android:gravity="center"
+                android:includeFontPadding="false"
+                android:text="privilege"
+                android:textColor="@color/color_333333"
+                android:textSize="14sp"
+                android:textStyle="bold" />
+            <TextView
+                android:id="@+id/id_tv_member_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp"
+                android:includeFontPadding="false"
+                android:text="2022-04-17"
                 android:textColor="@color/color_666666"
-                android:textSize="12sp" />
-
+                android:textSize="15sp"
+                android:visibility="gone" />
+        </LinearLayout>
             <TextView
-                android:id="@+id/id_tv_coin_trip"
+                android:id="@+id/id_tv_vip_trip"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/shape_ffffff_ffa211_r15"
-                android:paddingLeft="30dp"
+                android:background="@drawable/shape_bd8aff_662cf5_r15"
+                android:paddingLeft="50dp"
                 android:paddingTop="4dp"
-                android:paddingRight="30dp"
+                android:paddingRight="50dp"
                 android:paddingBottom="4dp"
-                android:text="立即充值"
-                android:textColor="#FFA211"
-                android:textSize="15sp" />
+                android:text="Go"
+                android:textColor="@color/white"
+                android:textSize="15sp"
+                android:textStyle="bold" />
         </LinearLayout>
+
+
     </LinearLayout>
 
     <LinearLayout
@@ -248,7 +315,8 @@
         android:layout_below="@+id/id_ll_vip"
         android:layout_margin="10dp"
         android:background="@drawable/shape_ffffff_r5"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:visibility="gone">
 
         <TextView
             android:layout_width="wrap_content"
@@ -271,8 +339,9 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/id_ll_photo"
+        android:layout_below="@+id/id_ll_vip"
         android:layout_marginLeft="10dp"
+        android:layout_marginTop="10dp"
         android:layout_marginRight="10dp"
         android:background="@drawable/shape_r5_ffffff"
         android:orientation="vertical"
@@ -282,18 +351,18 @@
             android:id="@+id/id_rl_zaixiankefu"
             android:layout_width="match_parent"
             android:layout_height="48dp"
-            android:visibility="gone">
+            android:visibility="visible">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="15dp"
+                android:drawableLeft="@drawable/icon_kefu"
                 android:drawablePadding="10dp"
-                android:text="在线客服"
+                android:text="Customer Service"
                 android:textColor="@color/color_333333"
-                android:textSize="15sp"
-                android:textStyle="bold" />
+                android:textSize="15sp" />
 
             <ImageView
                 android:layout_width="wrap_content"
@@ -301,7 +370,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:layout_marginRight="15dp"
-                android:src="@drawable/icon_tuijin" />
+                android:src="@drawable/icon_user_center_right" />
         </RelativeLayout>
 
         <View
@@ -310,8 +379,9 @@
             android:layout_marginLeft="15dp"
             android:layout_marginRight="15dp"
             android:background="#EDEDED" />
+
         <RelativeLayout
-            android:id="@+id/id_rl_jiyijan"
+            android:id="@+id/id_rl_about_us"
             android:layout_width="match_parent"
             android:layout_height="48dp">
 
@@ -320,11 +390,11 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="15dp"
+                android:drawableLeft="@drawable/icon_wo"
                 android:drawablePadding="10dp"
-                android:text="意见反馈"
+                android:text="About us"
                 android:textColor="@color/color_333333"
-                android:textSize="15sp"
-                android:textStyle="bold" />
+                android:textSize="15sp" />
 
             <ImageView
                 android:layout_width="wrap_content"
@@ -332,7 +402,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:layout_marginRight="15dp"
-                android:src="@drawable/icon_tuijin" />
+                android:src="@drawable/icon_user_center_right" />
         </RelativeLayout>
 
         <View
@@ -352,11 +422,11 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="15dp"
+                android:drawableLeft="@drawable/icon_shezhi"
                 android:drawablePadding="10dp"
-                android:text="设置"
+                android:text="Settings"
                 android:textColor="@color/color_333333"
-                android:textSize="15sp"
-                android:textStyle="bold" />
+                android:textSize="15sp" />
 
             <ImageView
                 android:layout_width="wrap_content"
@@ -364,34 +434,10 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:layout_marginRight="15dp"
-                android:src="@drawable/icon_tuijin" />
+                android:src="@drawable/icon_user_center_right" />
         </RelativeLayout>
 
-        <RelativeLayout
-            android:id="@+id/id_rl_about_us"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:visibility="gone">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="15dp"
-                android:drawableLeft="@drawable/icon_guanyu"
-                android:drawablePadding="10dp"
-                android:text="关于我们"
-                android:textColor="@color/color_333333"
-                android:textSize="15sp" />
 
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="15dp"
-                android:src="@drawable/icon_jinru" />
-        </RelativeLayout>
         <RelativeLayout
             android:id="@+id/id_rl_voice_room"
             android:layout_width="match_parent"