From edd27d95bb600e5ba8b16515eecc09b01c9f1c40 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Thu, 6 Aug 2020 19:50:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=9B=B4=E5=A4=9Apagenum?=
 =?UTF-8?q?=E8=B5=8B=E5=80=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/adapter/V2XShareEventAdapter.java     |  5 +-
 .../entity/panel/ShareEventLoadMoreItem.java  |  9 +++
 .../v2x/fragment/V2XShareEventsFragment.java  | 18 +++---
 .../v2x/network/V2XShareNetworkModel.java     | 62 +++++++++++--------
 4 files changed, 58 insertions(+), 36 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
index 094b0b00d9..3e4d20987b 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
@@ -143,13 +143,14 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
         } else if (holder instanceof shareLoadStatusViewHolder) {
             ShareEventLoadMoreItem item = (ShareEventLoadMoreItem) dataArrayList.get(dataArrayList.size() - 1);
             ((shareLoadStatusViewHolder) holder).statusButton.setText(item.getStatusText());
+            ((shareLoadStatusViewHolder) holder).statusButton.setClickable(item.isClickable());
+
         }
 
     }
 
     @Override
     public int getItemCount() {
-        int size = dataArrayList.size();
         return dataArrayList.size();
     }
 
@@ -225,7 +226,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
 
         public shareLoadStatusViewHolder(@NonNull View itemView) {
             super(itemView);
-            statusButton = itemView.findViewById(R.id.event_share_load_status);
+            statusButton = itemView.findViewById(R.id.event_share_load_status);;
             statusButton.setOnClickListener(new View.OnClickListener() {
 
                 @Override
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/ShareEventLoadMoreItem.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/ShareEventLoadMoreItem.java
index 880b10c957..e5e93b5f3a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/ShareEventLoadMoreItem.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/ShareEventLoadMoreItem.java
@@ -10,6 +10,15 @@ import java.io.Serializable;
 public class ShareEventLoadMoreItem extends BaseData implements Serializable {
     private String statusText;
     private int viewType;
+    private boolean clickable = true;
+
+    public boolean isClickable() {
+        return clickable;
+    }
+
+    public void setClickable(boolean clickable) {
+        this.clickable = clickable;
+    }
 
     public int getViewType() {
         return viewType;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
index 4127633019..126ec88d54 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
@@ -123,21 +123,23 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
                     item.setViewType(ShareEventItemEnum.ITEM_TYPE_SHARE_EMPTY);
                     dataArrayList.add(item);
                 } else {
+                    if (dataArrayList.size() > 0) {
+                        Object data = dataArrayList.get(dataArrayList.size() - 1);
+                        if (data instanceof ShareEventLoadMoreItem || data instanceof ShareEventLoadMoreItem) {
+                            dataArrayList.remove(dataArrayList.size() - 1);
+                        }
+                    }
                     if (resultData.getResult().getPage().getContent().size() > 0) {
                         //当前页有数据
-                        if (dataArrayList.size() > 0) {
-                            Object data = dataArrayList.get(dataArrayList.size() - 1);
-                            if (data instanceof ShareEventLoadMoreItem) {
-                                dataArrayList.remove(dataArrayList.size() - 1);
-                            }
-                        }
                         dataArrayList.addAll(resultData.getResult().getPage().getContent());
                         item.setViewType(ShareEventItemEnum.ITEM_TYPE_LOAD_MORE_STATUS);
                         item.setStatusText("查看更早记录");
+                        item.setClickable(true);
                     } else {
                         //当前页没有数据
                         item.setViewType(ShareEventItemEnum.ITEM_TYPE_NO_MORE);
                         item.setStatusText("没有更多了");
+                        item.setClickable(false);
                     }
                     if (total > 10) {
                         dataArrayList.add(item);
@@ -194,7 +196,9 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
 
     @Override
     public void loadMoreShareEventList() {
-        v2XShareNetworkModel.getShareEventList(pageNum + 1, 10, new V2XRefreshCallback() {
+        Log.d(TAG,"page--"+pageNum);
+        pageNum+=1;
+        v2XShareNetworkModel.getShareEventList(pageNum, 10, new V2XRefreshCallback() {
             @Override
             public void onSuccess(Object result) {
                 loadSuccessWithShareEventList(result);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java
index 5fe35ea297..417a113edf 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java
@@ -42,39 +42,13 @@ public class V2XShareNetworkModel {
      * 2.分享列表
      * */
     public void getShareEventResponse(int page, int size, V2XRefreshCallback callback) {
-        final ParamsProvider.Builder builder = new ParamsProvider.Builder(mContext);
-        HashMap<String, Object> hashMap = new HashMap<>();
-        hashMap.put("sn", Utils.getSn());
-        builder.append("data", GsonUtil.jsonFromObject(hashMap));
-        Map<String, Object> parameters = builder.build();
 
         Observable<String> indexObservable = Observable.create(new ObservableOnSubscribe<String>() {
 
             @Override
             public void subscribe(ObservableEmitter<String> emitter) throws Exception {
                 try {
-                    //热心指数
-                    mRefreshApiService.getEnthusiasmIndex(parameters)
-                            .subscribeOn(Schedulers.io())
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(new SubscribeImpl<BaseData>(RequestOptions.create((mContext))) {
-                                @Override
-                                public void onSuccess(BaseData resultData) {
-                                    super.onSuccess(resultData);
-                                    if (callback != null) {
-                                        callback.onSuccess(resultData);
-                                    }
-                                }
-
-                                @Override
-                                public void onError(String message, int code) {
-                                    super.onError(message, code);
-                                    if (callback != null) {
-                                        callback.onFail(message);
-                                    }
-                                }
-
-                            });
+                    getShareIndex(callback);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -128,6 +102,40 @@ public class V2XShareNetworkModel {
                 });
     }
 
+    /*
+     * 热心指数
+     * */
+    public void getShareIndex(V2XRefreshCallback callback) {
+        final ParamsProvider.Builder builder = new ParamsProvider.Builder(mContext);
+        HashMap<String, Object> hashMap = new HashMap<>();
+        hashMap.put("sn", Utils.getSn());
+        builder.append("data", GsonUtil.jsonFromObject(hashMap));
+        Map<String, Object> parameters = builder.build();
+        //热心指数
+        mRefreshApiService.getEnthusiasmIndex(parameters)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SubscribeImpl<BaseData>(RequestOptions.create((mContext))) {
+                    @Override
+                    public void onSuccess(BaseData resultData) {
+                        super.onSuccess(resultData);
+                        if (callback != null) {
+                            callback.onSuccess(resultData);
+                        }
+                    }
+
+                    @Override
+                    public void onError(String message, int code) {
+                        super.onError(message, code);
+                        if (callback != null) {
+                            callback.onFail(message);
+                        }
+                    }
+
+                });
+
+    }
+
     /*
      * 分享列表
      * */