1:修改注冊的时候，年龄必选，并且更改默认年龄是18年前

2:修改创建房间，本地进行判断改为服务端进行判断
3:修改歌手认证bug
4:修改和用户相关的出现为空的错误
5:修改挚友在用户主页的位置，不丝滑的滑动问题
6:修改搜索页面展示全部房间，用户展示性别

MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java

@@ -227,7 +227,7 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter<EMMessageInfo, Ba
                     tvName.setEndColor(Color.parseColor(emMessage.getText().getFromUserInfo().getNickname_color()));
                     tvName.setShine(true);
                     tvName.setShineType(0);
-                }else {
+                } else {
                     tvName.setStartColor(Color.parseColor("#FFFFFFFF"));
                     tvName.setShineColor(Color.parseColor("#FFFFFFFF"));
                     tvName.setEndColor(Color.parseColor("#FFFFFFFF"));
@@ -245,7 +245,7 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter<EMMessageInfo, Ba
                 LinearLayout ll_images = helper.getView(com.xscm.moduleutil.R.id.line);
                 ll_images.removeAllViews();
                 for (String url : images) {
-                    if (url.contains("http")) {
+                    if (url != null && url.contains("http")) {
                         ImageView imageView = new ImageView(helper.itemView.getContext());
                         LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
                                 helper.itemView.getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_57),
@@ -264,7 +264,7 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter<EMMessageInfo, Ba
                 String bubbleId = emMessage.getRoomId() + "_" + helper.getLayoutPosition() + "_bubble";
                 View bubbleView = helper.getView(com.xscm.moduleutil.R.id.bubble);
                 bubbleView.setTag(bubbleId);
-                
+
                 if (emMessage.getText().getFromUserInfo().getChat_bubble() != null && !emMessage.getText().getFromUserInfo().getChat_bubble().isEmpty()) {
                     // 使用 Glide 加载图片并设置名称
                     String imageUrl = emMessage.getText().getFromUserInfo().getChat_bubble();

MainModule/src/main/java/com/xscm/modulemain/adapter/ExpandColumnAdapter.java

@@ -51,10 +51,10 @@ public class ExpandColumnAdapter extends BaseQuickAdapter<ExpandColumnBean, Base
     @Override
     protected void convert(BaseViewHolder helper, ExpandColumnBean item) {
         helper.addOnClickListener(R.id.dy_head_image);
-        ImageView iv_sex=helper.getView(R.id.iv_user_sex);
+        ImageView iv_sex = helper.getView(R.id.iv_user_sex);
         //先让单图，多图，音频的布局显示
         helper.getView(R.id.dy_image_recyc).setVisibility(View.VISIBLE);
-        helper.setText(R.id.tv_agree,TimeUtils.getAgeByBirthDay(item.getBirthday())+"岁");
+        helper.setText(R.id.tv_agree, TimeUtils.getAgeByBirthDay(item.getBirthday()) + "岁");
         //昵称
         helper.setText(com.xscm.moduleutil.R.id.dy_name_text, item.getNickname());
         ShineTextView tvName = helper.getView(com.xscm.moduleutil.R.id.dy_name_text);
@@ -64,7 +64,7 @@ public class ExpandColumnAdapter extends BaseQuickAdapter<ExpandColumnBean, Base
             tvName.setEndColor(Color.parseColor(item.getNickname_color()));
             tvName.setShine(true);
             tvName.setShineType(0);
-        }else {
+        } else {
             tvName.setStartColor(Color.BLACK);
             tvName.setShineColor(Color.BLACK);
             tvName.setEndColor(Color.BLACK);
@@ -73,9 +73,9 @@ public class ExpandColumnAdapter extends BaseQuickAdapter<ExpandColumnBean, Base
         }
 //        helper.setTextColor(R.id.dy_name_text,(item.getNickname_color()!=null && !item.getNickname_color().isEmpty())? Color.parseColor(item.getNickname_color()):Color.parseColor("#333333"));
         helper.setText(R.id.tv_address, item.getLoginip());
-        if (item.getUser_id().equals(SpUtil.getUserId()+"")){
+        if (item.getUser_id().equals(SpUtil.getUserId() + "")) {
             helper.setVisible(R.id.gensui, false);
-        }else {
+        } else {
             helper.setVisible(R.id.gensui, true);
         }
 
@@ -119,7 +119,7 @@ public class ExpandColumnAdapter extends BaseQuickAdapter<ExpandColumnBean, Base
             recyclerView.setOnItemClickListener((parent, view, position, id) -> {
                 FullScreenUtil.showFullScreenDialog(mContext, position, oneImageYuanJiaoAdapter.getList_adapter());
             });
-        }else {
+        } else {
             helper.getView(R.id.dy_image_recyc).setVisibility(View.GONE);
         }
 
@@ -129,7 +129,7 @@ public class ExpandColumnAdapter extends BaseQuickAdapter<ExpandColumnBean, Base
         List<String> images = item.getIcon(); // 获取图片列表
 
         for (String url : images) {
-            if (url.contains("http")) {
+            if (url != null && url.contains("http")) {
 
                 ImageView imageView = new ImageView(mContext);
                 LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(

MainModule/src/main/java/com/xscm/modulemain/adapter/PlaceholderFragment.java

@@ -224,12 +224,10 @@ public class PlaceholderFragment extends BaseMvpFragment<PlaceholderPresenter,
                     ImageUtils.loadHeadCC(item.getUser_avatar(), helper.getView(R.id.iv_three_cp1_head));
                     ImageUtils.loadHeadCC(item.getUser_avatar1(), helper.getView(R.id.iv_three_cp2_head));
 
-//                    helper.setText(R.id.tv_charm, item.getNumber());
                     helper.setText(R.id.tv_name, item.getNickname());
                     helper.setVisible( R.id.tv_cp_name,true).setText(R.id.tv_cp_name, item.getNickname1());
                     helper.setText(R.id.tv_no, String.valueOf(item.getRank()));
-//                    ((BeautifulNameView) helper.getView(R.id.bnv_rank_list)).setTextColor(!TextUtils.isEmpty(item.getId_color()) ? Color.parseColor(item.getId_color()) : getResources().getColor(R.color.color_FF333333));
-//                    ((BeautifulNameView) helper.getView(R.id.bnv_rank_list)).setText(item.getNickname2());
+                    helper.setText(R.id.tv_charm, "Lv "+item.getTotal());
                 } else if (index == 1 || index == 2) {
                     rl.setVisibility(View.GONE);
                     helper.getView(R.id.riv_avatar).setVisibility(View.VISIBLE);

MainModule/src/main/java/com/xscm/modulemain/adapter/RoomOnlineAdapter.java

@@ -102,9 +102,9 @@ public class RoomOnlineAdapter extends BaseMultiItemQuickAdapter<RoomOnlineBean,
 //        }else if (item.getType() == 1 && item.getType_pit() == 0){
 //            textView.setVisibility(GONE);
 //        }
-            if(item.getType() == 1) {
+            if (item.getType() == 1) {
                 textView.setText(item.getPit_number() != 0 ? (item.getPit_number() == 9 ? "主持" : (item.getPit_number() == 10 ? "嘉宾" : item.getPit_number() + "号麦")) : "");
-            }else {
+            } else {
                 textView.setText("抱麦");
             }
 
@@ -116,7 +116,7 @@ public class RoomOnlineAdapter extends BaseMultiItemQuickAdapter<RoomOnlineBean,
             List<String> images = item.getIcon(); // 获取图片列表
 
             for (String url : images) {
-                if (url.contains("http")) {
+                if (url != null && url.contains("http")) {
                     ImageView imageView1 = new ImageView(helper.itemView.getContext());
                     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
                             LinearLayout.LayoutParams.WRAP_CONTENT,
@@ -128,7 +128,7 @@ public class RoomOnlineAdapter extends BaseMultiItemQuickAdapter<RoomOnlineBean,
                     imageView1.setScaleType(ImageView.ScaleType.FIT_START);
 
                     // 使用 Glide 加载图片
-                    ImageUtils.loadHeadCC(url, imageView1,params);
+                    ImageUtils.loadHeadCC(url, imageView1, params);
                     llContainer.addView(imageView1);
                 }
             }

MainModule/src/main/java/com/xscm/modulemain/adapter/SearchUserResultAdapter.java

@@ -38,7 +38,7 @@ public class SearchUserResultAdapter extends BaseQuickAdapter<UserResultResp, Ba
         helper.setText(R.id.dy_name_text, KeyWordUtil.matcherSearchTitle(Color.parseColor("#FFBC00"), item.getNickname(), keyWord));
         helper.setText(R.id.tv_id, "ID:" + item.getUser_code());
         MeHeadView headView = helper.getView(R.id.dy_head_image);
-        headView.setData(item.getHead_picture(), "", "");
+        headView.setSex(item.getSex(),item.getAvatar(), "");
 //        if (item.getUser_id().equals(SpUtil.getUserId() + "")) {
 //            helper.setVisible(R.id.gensui, false);
 //        } else {