From 0f51527a92dc42331f459e7fbf97c3eef3051b9c Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Wed, 10 Jan 2024 19:41:56 +0800
Subject: [PATCH] 111

---
 .../com/kanglai/push/ui/activity/InstantActivity.java |  8 +++++---
 .../kanglai/push/ui/adapter/SoloChatRoomAdapter.java  | 11 +++++++----
 .../java/com/kanglai/push/ui/vm/InstantViewModel.java | 11 +++--------
 app/src/main/res/layout/activity_instant.xml          |  7 ++-----
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/kanglai/push/ui/activity/InstantActivity.java b/app/src/main/java/com/kanglai/push/ui/activity/InstantActivity.java
index 4f6a432..3cf6bd0 100644
--- a/app/src/main/java/com/kanglai/push/ui/activity/InstantActivity.java
+++ b/app/src/main/java/com/kanglai/push/ui/activity/InstantActivity.java
@@ -68,15 +68,18 @@ public class InstantActivity extends BaseActivity<ActivityInstantBinding, Instan
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.mViewModel.mActivity = this;
-        mAdapter = new SoloChatRoomAdapter();
+        mViewModel.localPushChatMsg = getIntent().getParcelableExtra(CommonConstant.INSTANT_LAUNCHER_RESULT_KEY);
+        mAdapter = new SoloChatRoomAdapter(mViewModel.localPushChatMsg);
         RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(this);
         mRecyclerView = findViewById(R.id.instant_recycler);
         mRecyclerView.setLayoutManager(mLayoutManager);
         mRecyclerView.setAdapter(mAdapter);
         refreshLayout = findViewById(R.id.instant_smart_refresh);
+        refreshLayout.setEnableRefresh(false);
+        refreshLayout.setEnableAutoLoadMore(true);
+        refreshLayout.setEnableNestedScroll(false);
         refreshLayout.setEnableScrollContentWhenLoaded(true);
         refreshLayout.setOnLoadMoreListener(mViewModel::loadMore);
-        refreshLayout.setDisableContentWhenRefresh(true);
         input_box = findViewById(R.id.instant_input_box);
         input_box.setFilters(new InputFilter[]{ViewFilterUtil.getNoSpecialCharactersFilter()});
         more_line = findViewById(R.id.iv_more_line);
@@ -85,7 +88,6 @@ public class InstantActivity extends BaseActivity<ActivityInstantBinding, Instan
         more_fill.setOnClickListener(view -> changBottomType());
         bottom_grid = findViewById(R.id.instant_grid);
         layout_footer = findViewById(R.id.layout_footer);
-        mViewModel.localPushChatMsg = getIntent().getParcelableExtra(CommonConstant.INSTANT_LAUNCHER_RESULT_KEY);
         mViewModel.setTitleText(mViewModel.localPushChatMsg.getUserName());
         if ("2".equals(mViewModel.localPushChatMsg.getUserType()) || "5".equals(mViewModel.localPushChatMsg.getUserType()) || "0".equals(mViewModel.localPushChatMsg.getUserType())){
             layout_footer.setVisibility(View.INVISIBLE);
diff --git a/app/src/main/java/com/kanglai/push/ui/adapter/SoloChatRoomAdapter.java b/app/src/main/java/com/kanglai/push/ui/adapter/SoloChatRoomAdapter.java
index 79214aa..1eb6a27 100644
--- a/app/src/main/java/com/kanglai/push/ui/adapter/SoloChatRoomAdapter.java
+++ b/app/src/main/java/com/kanglai/push/ui/adapter/SoloChatRoomAdapter.java
@@ -10,6 +10,7 @@ import com.blankj.utilcode.util.StringUtils;
 import com.bumptech.glide.Glide;
 import com.kanglai.push.R;
 import com.kanglai.push.constant.CacheConstant;
+import com.kanglai.push.entity.LocalPushChatMsg;
 import com.kanglai.push.entity.PushChatMessage;
 import com.kanglai.push.entity.User;
 
@@ -25,12 +26,15 @@ public class SoloChatRoomAdapter extends ChatRoomListRecyclerAdapter{
     public ArrayList<PushChatMessage> mItemList = new ArrayList<>();
 
     public User user = CacheDiskUtils.getInstance().getParcelable(CacheConstant.USER_INFO, com.kanglai.push.entity.User.CREATOR, new User());   // 当前登录用户的数据
+    public LocalPushChatMsg friendData;
 
-    public SoloChatRoomAdapter() {
+    public SoloChatRoomAdapter(LocalPushChatMsg friendData) {
+        this.friendData = friendData;
     }
 
-    public SoloChatRoomAdapter(ArrayList<PushChatMessage> mItemList) {
+    public SoloChatRoomAdapter(ArrayList<PushChatMessage> mItemList, LocalPushChatMsg friendData) {
         this.mItemList = mItemList;
+        this.friendData = friendData;
     }
 
     @Override
@@ -75,8 +79,7 @@ public class SoloChatRoomAdapter extends ChatRoomListRecyclerAdapter{
     private void onItemBindingOther(ViewHolder holder, PushChatMessage item) {
         holder.right_layout.setVisibility(View.GONE);
         holder.left_layout.setVisibility(View.VISIBLE);
-        //后端需要设置头像值
-        //loadAvatar(holder.right_avatar, user.getAvatar());
+        loadAvatar(holder.left_avatar, friendData.getAvatar());
         holder.chatting_left_img.setVisibility(View.VISIBLE);
         holder.left_text.setText(item.getText());
     }
diff --git a/app/src/main/java/com/kanglai/push/ui/vm/InstantViewModel.java b/app/src/main/java/com/kanglai/push/ui/vm/InstantViewModel.java
index 28d9c66..a5af036 100644
--- a/app/src/main/java/com/kanglai/push/ui/vm/InstantViewModel.java
+++ b/app/src/main/java/com/kanglai/push/ui/vm/InstantViewModel.java
@@ -168,15 +168,12 @@ public class InstantViewModel extends ToolbarViewModel<InstantActivity>{
                         if (!CollectionUtils.isEmpty(data)) {
                             Collections.reverse(data);
                             mActivity.mAdapter.refresh(data);
+                            mActivity.mRecyclerView.scrollToPosition(mActivity.mAdapter.getItemCount() - 1);
                         }
-                    } else {
-                        refresh.finishRefresh(false);
-                        ToastUtil.showBottomWarn(R.getMsg());
-                    }
+                    } else ToastUtil.showBottomWarn(R.getMsg());
                 }
                 @Override
                 public void onError(Throwable e) {
-                    refresh.finishRefresh(false);
                     ExceptionHandle.baseExceptionMsg(e);
                 }
                 @Override
@@ -209,9 +206,7 @@ public class InstantViewModel extends ToolbarViewModel<InstantActivity>{
                         }
                         Collections.reverse(pushChatMessages);
                         mActivity.mAdapter.loadMore(msgVo.getData());
-                        if (mActivity.mAdapter.getItemCount() < R.getTotal()) {
-                            layout.finishLoadMore();
-                        } else layout.finishLoadMoreWithNoMoreData();
+                        layout.finishLoadMore();
                     } else ToastUtil.show(R.getMsg());
                 }
 
diff --git a/app/src/main/res/layout/activity_instant.xml b/app/src/main/res/layout/activity_instant.xml
index a5c6b7a..2e4244e 100644
--- a/app/src/main/res/layout/activity_instant.xml
+++ b/app/src/main/res/layout/activity_instant.xml
@@ -21,10 +21,7 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:scaleY="-1"
-            app:srlEnableRefresh="false"
-            app:srlEnableAutoLoadMore="false"
-            app:srlEnableNestedScrolling="false">
+            android:scaleY="-1">
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/instant_recycler"
                 android:layout_width="match_parent"
@@ -37,7 +34,7 @@
                 tools:itemCount="1"
                 android:scaleY="-1"
                 tools:listitem="@layout/item_chat_room"/>
-            <com.scwang.smart.refresh.header.ClassicsHeader
+            <com.scwang.smart.refresh.footer.ClassicsFooter
                 android:id="@+id/instant_smart_header"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"