From 05cd84b855104a4caf65dcffc73cbc6a9b6ffe7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 31 Jul 2020 18:06:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=9A=E4=B8=8A=E4=BA=86Tab=E7=9A=84?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panel/fragment/EventPanelFragment.kt      | 22 ++++++++++++-------
 .../fragment/ScenarioHistoryFragment.java     | 11 ++++++++++
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/EventPanelFragment.kt b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/EventPanelFragment.kt
index b0d7ff0113..34a5fcddf7 100644
--- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/EventPanelFragment.kt
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/EventPanelFragment.kt
@@ -35,14 +35,16 @@ class EventPanelFragment : MvpFragment<EventPanelFragment, EventPanelPresenter>(
                     ShareEventsFragment()
             )
 
-    private val activeColor: Int = android.graphics.Color.parseColor("#ff678f")
-    private val normalColor: Int = android.graphics.Color.parseColor("#666666")
-
-    private val activeSize = 30
-    private val normalSize = 20
-
     private var mediator: TabLayoutMediator? = null
 
+    private val activeColor: Int = android.graphics.Color.parseColor("#ff678f")
+    private val normalColor: Int = android.graphics.Color.parseColor("#EE00FF")
+
+    private val activeSize = 40
+    private val normalSize = 30
+
+    private var selectPosition = 1
+
     companion object {
         private val fragment = EventPanelFragment()
         fun getInstance(): EventPanelFragment {
@@ -60,12 +62,12 @@ class EventPanelFragment : MvpFragment<EventPanelFragment, EventPanelPresenter>(
         vpEventPanel.offscreenPageLimit = ViewPager2.OFFSCREEN_PAGE_LIMIT_DEFAULT
         vpEventPanel.adapter = EventPagerAdapter(this, fragments)
         //viewPager 页面切换监听
-        vpEventPanel.registerOnPageChangeCallback(changeCallback);
+        vpEventPanel.registerOnPageChangeCallback(changeCallback)
 
         //这里可以自定义TabView
         mediator = TabLayoutMediator(tabLayout, vpEventPanel, TabConfigurationStrategy { tab, position ->
             val tabView = TextView(context)
-            tabView.gravity=Gravity.CENTER
+            tabView.gravity = Gravity.CENTER
             val states = arrayOfNulls<IntArray>(2)
             states[0] = intArrayOf(android.R.attr.state_selected)
             states[1] = intArrayOf()
@@ -79,6 +81,9 @@ class EventPanelFragment : MvpFragment<EventPanelFragment, EventPanelPresenter>(
         //要执行这一句才是真正将两者绑定起来
         mediator!!.attach()
 
+        // 选中指定的Tab
+        //tabLayout.getTabAt(selectPosition)?.select()
+
         btnShowOrHidePanels.setOnClickListener {
             if (clPanelContainer.visibility == View.GONE) {
                 showPanel()
@@ -90,6 +95,7 @@ class EventPanelFragment : MvpFragment<EventPanelFragment, EventPanelPresenter>(
 
     private val changeCallback: OnPageChangeCallback = object : OnPageChangeCallback() {
         override fun onPageSelected(position: Int) {
+            selectPosition = position
             //可以来设置选中时tab的大小
             val tabCount = tabLayout.tabCount
             for (i in 0 until tabCount) {
diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ScenarioHistoryFragment.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ScenarioHistoryFragment.java
index 750054b88e..8241a4aa2d 100644
--- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ScenarioHistoryFragment.java
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ScenarioHistoryFragment.java
@@ -50,6 +50,17 @@ public class ScenarioHistoryFragment
 
         List<V2XHistoryScenarioData> v2XHistoryScenarioData = V2XSQLiteUtils.getScenarioHistoryData(getActivity());
         Logger.d("ScenarioHistoryFragment", "查询到历史消息：" + v2XHistoryScenarioData);
+        mV2XHistoryScenarioData.clear();
+        mV2XHistoryScenarioData.addAll(v2XHistoryScenarioData);
+        mScenarioHistoryAdapter.notifyDataSetChanged();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        List<V2XHistoryScenarioData> v2XHistoryScenarioData = V2XSQLiteUtils.getScenarioHistoryData(getActivity());
+        Logger.d("ScenarioHistoryFragment", "查询到历史消息：" + v2XHistoryScenarioData);
+        mV2XHistoryScenarioData.clear();
         mV2XHistoryScenarioData.addAll(v2XHistoryScenarioData);
         mScenarioHistoryAdapter.notifyDataSetChanged();
     }