1.修改历史搜索

modulevoice/src/main/java/com/example/modulevoice/activity/SearchActivity.java

@@ -152,14 +152,20 @@ public class SearchActivity extends BaseMvpActivity<SearchPresenter, ActivitySea
         mSearchUserResultAdapter.setOnItemClickListener(new SearchUserResultAdapter.OnItemClickListener() {
             @Override
             public void onGnsClick(UserResultResp item) {
-                if (item.getRoom_id() != null) {
+                if (item.getRoom_id() != null && !item.getRoom_id().isEmpty() && !"0".equals(item.getRoom_id())) {
-                    RoomManager.getInstance().fetchRoomDataAndEnter(getApplicationContext(), item.getRoom_id() + "", "");
+
+                    RoomManager.getInstance().fetchRoomDataAndEnter(SearchActivity.this, item.getRoom_id() + "", "");
 
-//                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getRoom_id()+"").navigation();
                 } else {
-                    ChatLauncher.getInstance().launchC2CChat(getApplicationContext(), item.getUser_id() + "");
+                    ChatLauncher.getInstance().launchC2CChat(SearchActivity.this, item.getUser_id() + "");
                 }
             }
+
+            @Override
+            public void onHeadImageClick(UserResultResp item) {
+                ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).withString("userId", item.getUser_id() + "").navigation();
+//
+            }
         });
         //房间列表点击时事件
         mSearchRoomResultAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {

modulevoice/src/main/java/com/example/modulevoice/adapter/SearchRoomResultAdapter.java

@@ -39,16 +39,16 @@ public class SearchRoomResultAdapter extends BaseQuickAdapter<RoomSearchResp, Ba
         helper.setText(R.id.tv_num, formatHotValue(Integer.parseInt(item.getHot_value()!=null ? item.getHot_value() : "0")));
         ImageUtils.loadHeadCC(item.getLabel_icon(), helper.getView(R.id.iv_type));
 
-        helper.itemView.setOnClickListener(new View.OnClickListener() {
+//        helper.setOnClickListener(R.id.iv_play,new View.OnClickListener() {
-            @Override
+//            @Override
-            public void onClick(View v) {
+//            public void onClick(View v) {
-                RoomManager.getInstance().fetchRoomDataAndEnter(mContext.getApplicationContext(), item.getRoom_id() ,"");
+//                RoomManager.getInstance().fetchRoomDataAndEnter(mContext.getApplicationContext(), item.getRoom_id() ,"");
-
+//
-//                ARouter.getInstance().build(ARouteConstants.LIVE_ROOM).withString("form","首页热门列表").withString("roomId", item.getId()).navigation();
+////                ARouter.getInstance().build(ARouteConstants.LIVE_ROOM).withString("form","首页热门列表").withString("roomId", item.getId()).navigation();
-//                ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getId()).navigation();
+////                ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页热门列表").withString("roomId", item.getId()).navigation();
-
+//
-            }
+//            }
-        });
+//        });
     }
         private String formatHotValue(int hotValue) {
             if (hotValue > 10000) {

modulevoice/src/main/java/com/example/modulevoice/adapter/SearchUserResultAdapter.java

@@ -3,11 +3,13 @@ package com.example.modulevoice.adapter;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
+import android.view.View;
 import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.example.modulevoice.R;
+import com.xscm.moduleutil.bean.CircleListBean;
 import com.xscm.moduleutil.bean.ExpandColumnBean;
 import com.xscm.moduleutil.bean.UserResultResp;
 import com.xscm.moduleutil.utils.ImageUtils;
@@ -25,9 +27,11 @@ public class SearchUserResultAdapter extends BaseQuickAdapter<UserResultResp, Ba
     public void setOnItemClickListener(OnItemClickListener listener) {
         this.mListener = listener;
     }
+
     public interface OnItemClickListener {
 
         void onGnsClick(UserResultResp item);
+        void onHeadImageClick(UserResultResp item);
     }
 
     private String keyWord = "";
@@ -38,23 +42,34 @@ public class SearchUserResultAdapter extends BaseQuickAdapter<UserResultResp, Ba
 
     @Override
     protected void convert(BaseViewHolder helper, UserResultResp item) {
+
         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());
+        helper.setText(R.id.tv_id, "ID:" + item.getUser_code());
         MeHeadView headView = helper.getView(R.id.dy_head_image);
         headView.setData(item.getHead_picture(), "", item.getSex());
-        if (item.getUser_id().equals(SpUtil.getUserId()+"")){
+//        if (item.getUser_id().equals(SpUtil.getUserId() + "")) {
-            helper.setVisible(R.id.gensui, false);
+//            helper.setVisible(R.id.gensui, false);
-        }else {
+//        } else {
-            helper.setVisible(R.id.gensui, true);
+//            helper.setVisible(R.id.gensui, true);
-        }
+//        }
-        if (item.getRoom_id()!=null&&!item.getRoom_id().equals("")&&!item.getRoom_id().equals("0")) {
+            // 先判断不为null，再判断不是空字符串，且不是"0"（三个条件需同时满足）
+
+        if (item.getRoom_id() != null && !item.getRoom_id().isEmpty() && !"0".equals(item.getRoom_id())) {
             helper.getView(R.id.gensui).setBackgroundResource(com.xscm.moduleutil.R.mipmap.gsui);
         } else {
             helper.getView(R.id.gensui).setBackgroundResource(com.xscm.moduleutil.R.mipmap.six);
         }
+        helper.getView(R.id.dy_head_image).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mListener != null) mListener.onHeadImageClick(item);
+            }
+        });
 
         helper.getView(R.id.gensui).setOnClickListener(v -> {
-            if (mListener != null) mListener.onGnsClick(item);
+            if (mListener!=null){
+                mListener.onGnsClick(item);
+            }
         });
     }
 

modulevoice/src/main/res/layout/index_item_search_user_result.xml

@@ -45,7 +45,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:scaleType="fitCenter"
-        android:src="@mipmap/no_follow"
         android:layout_marginEnd="@dimen/dp_16"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"