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 1/3] =?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);
+                        }
+                    }
+
+                });
+
+    }
+
     /*
      * 分享列表
      * */

From 4d0c30a905922e77ad98667caaa1d53e48a70933 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Thu, 6 Aug 2020 19:54:15 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/adapter/V2XShareEventAdapter.java     | 34 +++++++++----------
 ...ion.java => V2XShareEventDescription.java} |  2 +-
 ...eEventItem.java => V2XShareEventItem.java} |  4 +--
 ...emEnum.java => V2XShareEventItemEnum.java} |  2 +-
 ...em.java => V2XShareEventLoadMoreItem.java} |  2 +-
 .../v2x/fragment/V2XShareEventsFragment.java  | 29 ++++++++--------
 .../module/v2x/network/V2XApiService.java     |  8 ++---
 7 files changed, 40 insertions(+), 41 deletions(-)
 rename modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/{ShareEventDescription.java => V2XShareEventDescription.java} (98%)
 rename modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/{ShareEventItem.java => V2XShareEventItem.java} (98%)
 rename modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/{ShareEventItemEnum.java => V2XShareEventItemEnum.java} (84%)
 rename modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/{ShareEventLoadMoreItem.java => V2XShareEventLoadMoreItem.java} (90%)

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 3e4d20987b..dc358c09d9 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
@@ -13,10 +13,10 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.module.v2x.R;
-import com.mogo.module.v2x.entity.panel.ShareEventDescription;
-import com.mogo.module.v2x.entity.panel.ShareEventItem;
-import com.mogo.module.v2x.entity.panel.ShareEventItemEnum;
-import com.mogo.module.v2x.entity.panel.ShareEventLoadMoreItem;
+import com.mogo.module.v2x.entity.panel.V2XShareEventDescription;
+import com.mogo.module.v2x.entity.panel.V2XShareEventItem;
+import com.mogo.module.v2x.entity.panel.V2XShareEventItemEnum;
+import com.mogo.module.v2x.entity.panel.V2XShareEventLoadMoreItem;
 import com.mogo.module.v2x.fragment.V2XEventPanelFragment;
 import com.mogo.module.v2x.listener.AdapterCallback;
 import com.mogo.service.IMogoServiceApis;
@@ -44,17 +44,17 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         //根据viewType创建自定义布局
-        if (viewType == ShareEventItemEnum.ITEM_TYPE_NUM_DES) {
+        if (viewType == V2XShareEventItemEnum.ITEM_TYPE_NUM_DES) {
             View v = shareLayoutInflater.inflate(R.layout.module_v2x_event_share_description, parent,
                     false);
             shareDescriptionViewHolder holder = new shareDescriptionViewHolder(v);
             return holder;
-        } else if (viewType == ShareEventItemEnum.ITEM_TYPE_SHARE_LIST) {
+        } else if (viewType == V2XShareEventItemEnum.ITEM_TYPE_SHARE_LIST) {
             View v = shareLayoutInflater.inflate(R.layout.module_v2x_event_share_item, parent,
                     false);
             shareItemViewHolder holder = new shareItemViewHolder(v);
             return holder;
-        } else if (viewType == ShareEventItemEnum.ITEM_TYPE_SHARE_EMPTY) {
+        } else if (viewType == V2XShareEventItemEnum.ITEM_TYPE_SHARE_EMPTY) {
             View v = shareLayoutInflater.inflate(R.layout.module_v2x_event_share_empty, parent,
                     false);
             shareEmptyViewHolder holder = new shareEmptyViewHolder(v);
@@ -98,7 +98,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
         if (holder instanceof shareDescriptionViewHolder) {
             //分享次数,车友认同次数,热心指数
             if (dataArrayList.size() > position) {
-                ShareEventDescription.ResultBean.EnthusiasmIndexBean data = (ShareEventDescription.ResultBean.EnthusiasmIndexBean) dataArrayList.get(position);
+                V2XShareEventDescription.ResultBean.EnthusiasmIndexBean data = (V2XShareEventDescription.ResultBean.EnthusiasmIndexBean) dataArrayList.get(position);
                 if (data != null) {
                     String shareNum = String.valueOf(data.getShareNum());
                     String likeNum = String.valueOf(data.getLikeNum());
@@ -115,7 +115,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
         } else if (holder instanceof shareItemViewHolder) {
             //分享列表
             if (dataArrayList.size() > position) {
-                ShareEventItem.ResultBean.PageBean.ContentBean data = (ShareEventItem.ResultBean.PageBean.ContentBean) dataArrayList.get(position);
+                V2XShareEventItem.ResultBean.PageBean.ContentBean data = (V2XShareEventItem.ResultBean.PageBean.ContentBean) dataArrayList.get(position);
                 if (data != null) {
                     String poitype = data.getPoiType();
                     String address = data.getUploadAddress();
@@ -141,7 +141,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
 
             }
         } else if (holder instanceof shareLoadStatusViewHolder) {
-            ShareEventLoadMoreItem item = (ShareEventLoadMoreItem) dataArrayList.get(dataArrayList.size() - 1);
+            V2XShareEventLoadMoreItem item = (V2XShareEventLoadMoreItem) dataArrayList.get(dataArrayList.size() - 1);
             ((shareLoadStatusViewHolder) holder).statusButton.setText(item.getStatusText());
             ((shareLoadStatusViewHolder) holder).statusButton.setClickable(item.isClickable());
 
@@ -157,14 +157,14 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
     @Override
     public int getItemViewType(int position) {
         Object item = dataArrayList.get(position);
-        if (item instanceof ShareEventDescription.ResultBean.EnthusiasmIndexBean) {
-            return ShareEventItemEnum.ITEM_TYPE_NUM_DES;
-        } else if (item instanceof ShareEventItem.ResultBean.PageBean.ContentBean) {
-            return ShareEventItemEnum.ITEM_TYPE_SHARE_LIST;
-        } else if (item instanceof ShareEventLoadMoreItem) {
-            return ((ShareEventLoadMoreItem) dataArrayList.get(position)).getViewType();
+        if (item instanceof V2XShareEventDescription.ResultBean.EnthusiasmIndexBean) {
+            return V2XShareEventItemEnum.ITEM_TYPE_NUM_DES;
+        } else if (item instanceof V2XShareEventItem.ResultBean.PageBean.ContentBean) {
+            return V2XShareEventItemEnum.ITEM_TYPE_SHARE_LIST;
+        } else if (item instanceof V2XShareEventLoadMoreItem) {
+            return ((V2XShareEventLoadMoreItem) dataArrayList.get(position)).getViewType();
         }
-        return ShareEventItemEnum.ITEM_TYPE_SHARE_LIST;
+        return V2XShareEventItemEnum.ITEM_TYPE_SHARE_LIST;
     }
 
     /*
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/ShareEventDescription.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventDescription.java
similarity index 98%
rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/ShareEventDescription.java
rename to modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventDescription.java
index cd0fe1d10a..d659de3141 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/ShareEventDescription.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventDescription.java
@@ -4,7 +4,7 @@ import com.mogo.commons.data.BaseData;
 
 import java.io.Serializable;
 
-public class ShareEventDescription extends BaseData implements Serializable {
+public class V2XShareEventDescription extends BaseData implements Serializable {
 
     /**
      * detailMsg :
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/ShareEventItem.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventItem.java
similarity index 98%
rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/ShareEventItem.java
rename to modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventItem.java
index b4b437b734..444ad06bb9 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/ShareEventItem.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventItem.java
@@ -5,7 +5,7 @@ import com.mogo.commons.data.BaseData;
 import java.io.Serializable;
 import java.util.List;
 
-public class ShareEventItem extends BaseData implements Serializable {
+public class V2XShareEventItem extends BaseData implements Serializable {
 
     private String detailMsg;
     private ResultBean result;
@@ -114,7 +114,7 @@ public class ShareEventItem extends BaseData implements Serializable {
                             '}';
                 }
 
-                private int viewType = ShareEventItemEnum.ITEM_TYPE_SHARE_LIST;
+                private int viewType = V2XShareEventItemEnum.ITEM_TYPE_SHARE_LIST;
                 private Long uploadTimestamp;
                 private long timeout;
                 private String uploadAddress;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/ShareEventItemEnum.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventItemEnum.java
similarity index 84%
rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/ShareEventItemEnum.java
rename to modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventItemEnum.java
index a7446411c0..0436a54c83 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/ShareEventItemEnum.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventItemEnum.java
@@ -1,6 +1,6 @@
 package com.mogo.module.v2x.entity.panel;
 
-public interface ShareEventItemEnum {
+public interface V2XShareEventItemEnum {
 
     int ITEM_TYPE_NUM_DES = 0;
     int ITEM_TYPE_SHARE_LIST = 1;
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/V2XShareEventLoadMoreItem.java
similarity index 90%
rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/ShareEventLoadMoreItem.java
rename to modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventLoadMoreItem.java
index e5e93b5f3a..a6ddc288dd 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/V2XShareEventLoadMoreItem.java
@@ -7,7 +7,7 @@ import java.io.Serializable;
 /*
  * 没有任何分享,去分享/加载更多/没有更多了
  * */
-public class ShareEventLoadMoreItem extends BaseData implements Serializable {
+public class V2XShareEventLoadMoreItem extends BaseData implements Serializable {
     private String statusText;
     private int viewType;
     private boolean clickable = true;
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 126ec88d54..6a2b63de71 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
@@ -1,6 +1,5 @@
 package com.mogo.module.v2x.fragment;
 
-import android.nfc.Tag;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -17,10 +16,10 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.mogo.commons.mvp.MvpFragment;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.adapter.V2XShareEventAdapter;
-import com.mogo.module.v2x.entity.panel.ShareEventDescription;
-import com.mogo.module.v2x.entity.panel.ShareEventItem;
-import com.mogo.module.v2x.entity.panel.ShareEventItemEnum;
-import com.mogo.module.v2x.entity.panel.ShareEventLoadMoreItem;
+import com.mogo.module.v2x.entity.panel.V2XShareEventDescription;
+import com.mogo.module.v2x.entity.panel.V2XShareEventItem;
+import com.mogo.module.v2x.entity.panel.V2XShareEventItemEnum;
+import com.mogo.module.v2x.entity.panel.V2XShareEventLoadMoreItem;
 import com.mogo.module.v2x.listener.AdapterCallback;
 import com.mogo.module.v2x.network.V2XRefreshCallback;
 import com.mogo.module.v2x.network.V2XShareNetworkModel;
@@ -88,15 +87,15 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
         v2XShareNetworkModel.getShareEventResponse(pageNum, 10, new V2XRefreshCallback() {
             @Override
             public void onSuccess(Object result) {
-                if (result instanceof ShareEventDescription) {
-                    ShareEventDescription resultData = (ShareEventDescription) result;
+                if (result instanceof V2XShareEventDescription) {
+                    V2XShareEventDescription resultData = (V2XShareEventDescription) result;
 
                     if (resultData != null && resultData.getResult() != null
                             && resultData.getResult().getEnthusiasmIndex() != null) {
                         dataArrayList.add(resultData.getResult().getEnthusiasmIndex());
                         Log.d(TAG, "热心指数:" + resultData.getResult().getEnthusiasmIndex());
                     }
-                } else if (result instanceof ShareEventItem) {
+                } else if (result instanceof V2XShareEventItem) {
                     loadSuccessWithShareEventList(result);
                 }
             }
@@ -113,31 +112,31 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
      * 我的分享列表数据处理
      * */
     private void loadSuccessWithShareEventList(Object result) {
-        ShareEventItem resultData = (ShareEventItem) result;
-        ShareEventLoadMoreItem item = new ShareEventLoadMoreItem();
+        V2XShareEventItem resultData = (V2XShareEventItem) result;
+        V2XShareEventLoadMoreItem item = new V2XShareEventLoadMoreItem();
         if (resultData != null && resultData.getResult() != null) {
             if (resultData.getResult().getPage() != null) {
                 int total = resultData.getResult().getPage().getTotal();
                 if (total == 0) {
                     //空白
-                    item.setViewType(ShareEventItemEnum.ITEM_TYPE_SHARE_EMPTY);
+                    item.setViewType(V2XShareEventItemEnum.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) {
+                        if (data instanceof V2XShareEventLoadMoreItem || data instanceof V2XShareEventLoadMoreItem) {
                             dataArrayList.remove(dataArrayList.size() - 1);
                         }
                     }
                     if (resultData.getResult().getPage().getContent().size() > 0) {
                         //当前页有数据
                         dataArrayList.addAll(resultData.getResult().getPage().getContent());
-                        item.setViewType(ShareEventItemEnum.ITEM_TYPE_LOAD_MORE_STATUS);
+                        item.setViewType(V2XShareEventItemEnum.ITEM_TYPE_LOAD_MORE_STATUS);
                         item.setStatusText("查看更早记录");
                         item.setClickable(true);
                     } else {
                         //当前页没有数据
-                        item.setViewType(ShareEventItemEnum.ITEM_TYPE_NO_MORE);
+                        item.setViewType(V2XShareEventItemEnum.ITEM_TYPE_NO_MORE);
                         item.setStatusText("没有更多了");
                         item.setClickable(false);
                     }
@@ -149,7 +148,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
             Log.d(TAG, "分享列表:" + dataArrayList.get(0));
         } else {
             //空白
-            item.setViewType(ShareEventItemEnum.ITEM_TYPE_SHARE_EMPTY);
+            item.setViewType(V2XShareEventItemEnum.ITEM_TYPE_SHARE_EMPTY);
             dataArrayList.add(item);
         }
         adapter.notifyDataSetChanged();
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XApiService.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XApiService.java
index 45db4f5fc9..78710b8999 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XApiService.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XApiService.java
@@ -8,8 +8,8 @@ import com.mogo.module.v2x.entity.net.V2XLivePushVoRes;
 import com.mogo.module.v2x.entity.net.V2XSeekHelpRes;
 import com.mogo.module.v2x.entity.net.V2XStrategyPushRes;
 import com.mogo.module.v2x.entity.net.V2XUserInfoRes;
-import com.mogo.module.v2x.entity.panel.ShareEventDescription;
-import com.mogo.module.v2x.entity.panel.ShareEventItem;
+import com.mogo.module.v2x.entity.panel.V2XShareEventDescription;
+import com.mogo.module.v2x.entity.panel.V2XShareEventItem;
 import com.mogo.module.v2x.entity.panel.SurroundingResponse;
 
 import java.util.Map;
@@ -117,14 +117,14 @@ public interface V2XApiService {
      */
     @FormUrlEncoded
     @POST("/deva/poiInfoFabulous/car/poi/no/queryEnthusiasmIndex/v1")
-    Observable<ShareEventDescription> getEnthusiasmIndex(@FieldMap Map<String, Object> parames);
+    Observable<V2XShareEventDescription> getEnthusiasmIndex(@FieldMap Map<String, Object> parames);
 
     /**
      * 我的分享-列表
      */
     @FormUrlEncoded
     @POST("/deva/car/pathAndPoi/no/queryInfo")
-    Observable<ShareEventItem> getShareEventList(@FieldMap Map<String, Object> parames);
+    Observable<V2XShareEventItem> getShareEventList(@FieldMap Map<String, Object> parames);
 
     /*
      * 周边列表

From 557adf82bd4ef45c1844b3b73494a480edc2f3b0 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Fri, 7 Aug 2020 11:06:44 +0800
Subject: [PATCH 3/3] add videocompress lib

---
 config.gradle                                 |  1 +
 ...odule_event_panel_fragment_surrounding.xml | 27 ++++++++++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/config.gradle b/config.gradle
index 9006536b75..8cbaaddd98 100644
--- a/config.gradle
+++ b/config.gradle
@@ -141,6 +141,7 @@ targetSdkVersion        : 22,
             videoarm64               : "com.shuyu:gsyVideoPlayer-arm64:7.1.2",
             videojava                : "com.shuyu:gsyVideoPlayer-java:7.1.2",
             eventbus                 : "org.greenrobot:eventbus:3.1.1",
+            videoprocessor           : "com.zhidao.video:video-processor:1.0.2.1",
 
             coroutinescore           : "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1",
             coroutinesandroid        : "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1",
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
index 7f7650b06c..913477cb5a 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
@@ -2,23 +2,38 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:androud="http://schemas.android.com/apk/res-auto"
     android:id="@+id/clPanelContainer"
-    android:background="@color/live_video_background_color"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/live_video_background_color">
 
     <!--顶部layout-->
     <RelativeLayout
         android:id="@+id/layout_top"
         android:layout_width="match_parent"
-        android:layout_height="150dp">
+        android:layout_height="80dp">
 
         <TextView
+            android:id="@+id/tv_brief"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
+            android:layout_marginLeft="400px"
+            android:layout_centerVertical="true"
             android:text="周边5公里，共有23条数据 "
             android:textColor="#ffffff" />
 
+        <TextView
+            android:id="@+id/tv_top_refresh"
+            android:layout_width="150px"
+            android:layout_height="50px"
+            android:layout_marginLeft="50px"
+            android:layout_toRightOf="@+id/tv_brief"
+            android:layout_centerInParent="true"
+            android:background="@drawable/bg_v2x_event_live_show"
+            android:gravity="center"
+            android:text="刷新"
+            android:textColor="@color/live_video_background_color"
+            android:textSize="12px"
+            android:textStyle="bold" />
     </RelativeLayout>
 
     <!--列表相关-->
@@ -28,13 +43,13 @@
         android:layout_height="match_parent"
         android:layout_below="@+id/layout_top">
 
-        <!--空数据显示-->
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/surrounding_recycleview"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="visible" />
 
+        <!--空数据显示-->
         <RelativeLayout
             android:id="@+id/layout_empty_data_show"
             android:layout_width="match_parent"
@@ -86,8 +101,8 @@
                 android:layout_toRightOf="@+id/tv_main_share"
                 android:background="@drawable/bg_v2x_event_live_show"
                 android:gravity="center"
-                android:textColor="@color/live_video_background_color"
                 android:text="刷新"
+                android:textColor="@color/live_video_background_color"
                 android:textSize="12px"
                 android:textStyle="bold" />