From 1d7c90270320b6e085aed4e9d7ea6745987df698 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Tue, 18 Aug 2020 19:55:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=88=86=E4=BA=AB=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=88=B7=E6=96=B0=E6=97=B6=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/fragment/V2XEventPanelFragment.kt     |  6 +++++-
 .../v2x/fragment/V2XShareEventsFragment.java  | 19 +++++++++++++++----
 .../v2x/presenter/ShareEventsPresenter.java   | 15 +++++++++++++--
 .../res/layout/v2x_network_loading_item.xml   |  2 +-
 4 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
index 297ac9d014..5a277dafae 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
@@ -11,6 +11,7 @@ import com.mogo.module.v2x.V2XConst.MODULE_NAME
 import com.mogo.module.v2x.V2XServiceManager
 import com.mogo.module.v2x.adapter.V2XEventPagerAdapter
 import com.mogo.module.v2x.presenter.EventPanelPresenter
+import com.mogo.module.v2x.presenter.ShareEventsPresenter
 import com.mogo.module.v2x.utils.TrackUtils
 import com.mogo.module.v2x.view.V2XEventPanelHistoryCountView
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener
@@ -38,6 +39,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
     private var mV2XEventPanelHistoryCountView: V2XEventPanelHistoryCountView? = null
 
     private val mV2XScenarioHistoryFragment = V2XScenarioHistoryFragment()
+    private val mV2XShareEventsFragment = V2XShareEventsFragment()
 
     companion object {
         private val fragment = V2XEventPanelFragment()
@@ -93,7 +95,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
             fragments = arrayOf(
                     mV2XScenarioHistoryFragment,
                     V2XSurroundingFragment(),
-                    V2XShareEventsFragment()
+                    mV2XShareEventsFragment
             )
             //禁用预加载
             vpEventPanel.offscreenPageLimit = ViewPager2.OFFSCREEN_PAGE_LIMIT_DEFAULT
@@ -156,6 +158,8 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
         try {
             if (isFirstLoad) {
                 mV2XScenarioHistoryFragment.presenter.loadHistory()
+                mV2XShareEventsFragment.presenter.loadShareEventList()
+
             }
         } catch (e: Exception) {
             e.printStackTrace()
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 2d8049e13c..2a08c5828a 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
@@ -22,12 +22,12 @@ import com.mogo.module.v2x.listener.AdapterCallback;
 import com.mogo.module.v2x.network.V2XRefreshCallback;
 import com.mogo.module.v2x.network.V2XShareNetworkModel;
 import com.mogo.module.v2x.presenter.ShareEventsPresenter;
+import com.mogo.module.v2x.utils.ThreadUtils;
 import com.mogo.module.v2x.view.V2XNetworkLoadingView;
-import com.mogo.utils.CheckUtils;
 
 import java.util.ArrayList;
 
-public class V2XShareEventsFragment extends MvpFragment implements AdapterCallback {
+public class V2XShareEventsFragment extends MvpFragment<V2XShareEventsFragment, ShareEventsPresenter> implements AdapterCallback {
 
     private static final String TAG = "ShareEventsFragment";
     private RecyclerView recyclerView;
@@ -79,7 +79,12 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
      * */
     @Override
     public void getShareEventResponse() {
-        animatioonAcction(View.VISIBLE);
+        ThreadUtils.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                animatioonAcction(View.VISIBLE);
+            }
+        });
 
         v2XShareNetworkModel.getShareEventResponse(pageNum, 10, new V2XRefreshCallback() {
             @Override
@@ -156,7 +161,13 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
             item.setViewType(V2XShareEventItemEnum.ITEM_TYPE_SHARE_EMPTY);
             dataArrayList.add(item);
         }
-        adapter.notifyDataSetChanged();
+
+        ThreadUtils.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                adapter.notifyDataSetChanged();
+            }
+        });
 
     }
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ShareEventsPresenter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ShareEventsPresenter.java
index c1e6c48b71..f2ba64eb21 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ShareEventsPresenter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ShareEventsPresenter.java
@@ -2,10 +2,21 @@ package com.mogo.module.v2x.presenter;
 
 import com.mogo.commons.mvp.IView;
 import com.mogo.commons.mvp.Presenter;
+import com.mogo.module.common.entity.V2XHistoryScenarioData;
 import com.mogo.module.v2x.fragment.V2XShareEventsFragment;
+import com.mogo.module.v2x.utils.V2XSQLiteUtils;
+import com.mogo.utils.WorkThreadHandler;
+
+import java.util.List;
 
 public class ShareEventsPresenter extends Presenter <V2XShareEventsFragment>{
-    public ShareEventsPresenter(IView view) {
-        super((V2XShareEventsFragment) view);
+
+    public ShareEventsPresenter(IView view) { super((V2XShareEventsFragment) view); }
+
+    public void loadShareEventList() {
+        WorkThreadHandler.getInstance().post(() -> {
+            mView.getShareEventResponse();
+        });
     }
+
 }
diff --git a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
index c48b3bc1f5..9065e0893b 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
@@ -34,7 +34,7 @@
         android:layout_centerHorizontal="true"
         android:layout_gravity="top|center"
         android:layout_marginTop="34px"
-        android:background="@drawable/bg_v2x_event_live_show"
+        android:background="@drawable/v2xt_dw_common_corner_bkg_light"
         android:text="刷新"
         android:textColor="#FFFFFF"
         android:textSize="18px" />