Browse Source

修改bug

Pq 3 years ago
parent
commit
4131177075

+ 1 - 1
rong_im/common_im_ui/src/main/AndroidManifest.xml

@@ -7,7 +7,7 @@
             android:name="com.common.im.ui.activity.SelectScoreChatActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustResize" />
+            android:windowSoftInputMode="adjustPan" />
         <activity
             android:name="com.common.im.ui.activity.CreateGroupActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"

+ 2 - 2
rong_im/common_im_ui/src/main/java/com/common/im/adapter/MineScoreAdapter.java

@@ -30,8 +30,8 @@ import java.util.List;
  */
 public class MineScoreAdapter extends BaseQuickAdapter<MusicSheetListBean.RowsBean, BaseViewHolder> implements LoadMoreModule {
 
-    public MineScoreAdapter(List<MusicSheetListBean.RowsBean> data) {
-        super(R.layout.cl_layout_mine_score_item, data);
+    public MineScoreAdapter() {
+        super(R.layout.cl_layout_mine_score_item);
     }
 
 

+ 0 - 5
rong_im/common_im_ui/src/main/java/com/common/im/presenter/SelectScoreChatPresenter.java

@@ -39,11 +39,6 @@ public class SelectScoreChatPresenter extends BasePresenter<SelectScoreChatContr
                 }
             }
 
-            @Override
-            public void onComplete() {
-                super.onComplete();
-                getView().hideLoading();
-            }
 
             @Override
             public void onError(Throwable e) {

+ 20 - 7
rong_im/common_im_ui/src/main/java/com/common/im/ui/activity/SelectScoreChatActivity.java

@@ -1,9 +1,11 @@
 package com.common.im.ui.activity;
 
+import android.os.Bundle;
 import android.util.Base64;
 import android.view.View;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -22,6 +24,8 @@ import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.common.im.adapter.MineScoreAdapter;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
+import com.cooleshow.base.widgets.EmptyViewLayout;
 import com.rong.io.live.manager.RCChatRoomMessageManager;
 import com.scwang.smart.refresh.layout.SmartRefreshLayout;
 import com.scwang.smart.refresh.layout.api.RefreshLayout;
@@ -56,7 +60,7 @@ public class SelectScoreChatActivity extends BaseMVPActivity<ActivitySelectScore
             queryScore(true);
         } else if (view.getId() == com.cooleshow.base.R.id.tv_right_text) {
             //发送曲谱到聊天室
-            for (MusicSheetListBean.RowsBean rowsBean : dataList) {
+            for (MusicSheetListBean.RowsBean rowsBean : mineScoreAdapter.getData()) {
                 if (rowsBean.isSelect) {
                     sendMessage(rowsBean);
                     break;
@@ -70,10 +74,15 @@ public class SelectScoreChatActivity extends BaseMVPActivity<ActivitySelectScore
     private SmartRefreshLayout refreshLayout;
     private RecyclerView recyclerView;
     private MineScoreAdapter mineScoreAdapter;
-    List<MusicSheetListBean.RowsBean> dataList = new ArrayList<>();
     private String targetId = "";
 
     @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
+    }
+
+    @Override
     protected void initView() {
         targetId = getIntent().getStringExtra("targetId");
         initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "曲谱");
@@ -92,7 +101,10 @@ public class SelectScoreChatActivity extends BaseMVPActivity<ActivitySelectScore
             }
         });
 
-        mineScoreAdapter = new MineScoreAdapter(dataList);
+        mineScoreAdapter = new MineScoreAdapter();
+        EmptyViewLayout emptyViewLayout = new EmptyViewLayout(this);
+        emptyViewLayout.setContent(R.drawable.icon_empty_content, "暂无曲谱");
+        mineScoreAdapter.setEmptyView(emptyViewLayout);
 //        mAdapter.getLoadMoreModule().setEnableLoadMoreIfNotFullPage(false);
         mineScoreAdapter.getLoadMoreModule().setOnLoadMoreListener(new OnLoadMoreListener() {
             @Override
@@ -126,7 +138,7 @@ public class SelectScoreChatActivity extends BaseMVPActivity<ActivitySelectScore
             public void onItemClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
                 MusicSheetListBean.RowsBean item = (MusicSheetListBean.RowsBean) adapter.getItem(position);
                 if (!item.isSelect) {
-                    for (MusicSheetListBean.RowsBean rowsBean : dataList) {
+                    for (MusicSheetListBean.RowsBean rowsBean : mineScoreAdapter.getData()) {
                         if (rowsBean.id == item.id) {
                             rowsBean.isSelect = true;
                         } else {
@@ -214,15 +226,16 @@ public class SelectScoreChatActivity extends BaseMVPActivity<ActivitySelectScore
     public void queryMusicListSuccess(int page, MusicSheetListBean data) {
         if (data != null) {
             if (page == 1) {
-                dataList.clear();
+                mineScoreAdapter.getData().clear();
+                mineScoreAdapter.notifyDataSetChanged();
                 viewBinding.refreshLayout.finishRefresh();
                 if (data.rows != null && data.rows.size() > 0) {
                     checkHasNext(data.rows.size());
-                    dataList.addAll(data.rows);
+                    mineScoreAdapter.setNewInstance(data.rows);
                 }
-                mineScoreAdapter.notifyDataSetChanged();
             } else {
                 if (data.rows != null && data.rows.size() > 0) {
+                    mineScoreAdapter.addData(data.rows);
                     mineScoreAdapter.getLoadMoreModule().loadMoreComplete();
                     checkHasNext(data.rows.size());
                 } else {

BIN
rong_im/common_im_ui/src/main/res/drawable-xhdpi/icon_empty_content.png


BIN
rong_im/common_im_ui/src/main/res/drawable-xxhdpi/icon_empty_content.png


+ 2 - 3
rong_im/common_im_ui/src/main/res/layout/activity_select_score_chat.xml

@@ -3,8 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/color_f6f8f9"
-    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
     <include
@@ -13,6 +11,7 @@
 
 
     <LinearLayout
+        android:layout_marginTop="10dp"
         android:layout_width="match_parent"
         android:layout_height="35dp"
         android:layout_marginLeft="@dimen/dp_14"
@@ -36,7 +35,7 @@
             android:layout_weight="1"
             android:background="@null"
             android:ellipsize="end"
-            android:hint="请输入学员名称"
+            android:hint="请输入曲谱名称"
             android:inputType="text"
             android:maxLines="1"
             android:paddingLeft="8dp"