From 3a7a84465a68d01cff4197439b700851c825232c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Tue, 11 Aug 2020 12:06:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E4=B8=AD=E7=9A=84=E6=A0=B7=E5=BC=8F=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E6=95=B0=E9=87=8F=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/fragment/V2XEventPanelFragment.kt     |  19 +++++---
 .../drawable-ldpi/icon_event_panel_more.png   | Bin 0 -> 293 bytes
 .../v2x_drawable_event_message_bkg.xml        |  10 ++++
 .../drawable/v2x_drawable_event_more_bkg.xml  |   8 +++
 ...e_v2x_event_panel_fragment_event_panel.xml |  46 +++++++++++++-----
 5 files changed, 64 insertions(+), 19 deletions(-)
 create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_event_panel_more.png
 create mode 100644 modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_message_bkg.xml
 create mode 100644 modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml

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 4841b81167..c861d22fef 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.utils.V2XSQLiteUtils
 import com.mogo.utils.logger.Logger
 import kotlinx.android.synthetic.main.module_v2x_event_panel_fragment_event_panel.*
 
@@ -24,13 +25,10 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
 
     private val TAG = "EventPanelFragment"
 
-    private val tabsTitle = arrayOf("出行动态", "周边事件", "我的分享")
     private var fragments: Array<Fragment>? = null
 
     private var mediator: TabLayoutMediator? = null
 
-    private var selectPosition = 0
-
     companion object {
         private val fragment = V2XEventPanelFragment()
         fun getInstance(): V2XEventPanelFragment {
@@ -73,13 +71,21 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
             hidePanel()
         }
 
-        btnShowOrHidePanels.setOnClickListener {
-            if (clPanelContainer.visibility == View.GONE) {
+        llEventMore.setOnClickListener {
+            if (!isPanelShow()) {
                 showPanel()
             } else {
                 hidePanel()
             }
         }
+
+        val historyMessage = V2XSQLiteUtils.getScenarioHistoryData()
+        if (historyMessage != null && historyMessage.size > 0) {
+            tvEventCount.visibility = View.VISIBLE
+            tvEventCount.text = "${historyMessage.size}"
+        } else {
+            tvEventCount.visibility = View.GONE
+        }
     }
 
     override fun onDestroyView() {
@@ -94,16 +100,13 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
     fun showPanel() {
         Logger.d(MODULE_NAME, "in fragment show panel")
         clPanelContainer.visibility = View.VISIBLE
-        btnShowOrHidePanels.text = "隐藏面板"
         V2XServiceManager.getMoGoV2XStatusManager().setEventPanelWindowShow(TAG, true)
     }
 
     fun hidePanel() {
         Logger.d(MODULE_NAME, "in fragment hide panel")
         clPanelContainer.visibility = View.GONE
-        btnShowOrHidePanels.text = "显示面板"
         V2XServiceManager.getMoGoV2XStatusManager().setEventPanelWindowShow(TAG, false)
-
     }
 
     fun isPanelShow(): Boolean {
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_event_panel_more.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_event_panel_more.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7c778c377eb1e2b3b859f6b87fc47273e3baeec
GIT binary patch
literal 293
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAO`7UU|?Rr$iNJw89`zTm=LlHm=SD{LZ6e{K(_XKx;Tb-@Fpin
zus&%!@c;jR>xLiV0++cO&b&)t5#n#?o1%Vwq06gkj!h?IR#>og-0ZmGvT9Sj1FyHo
zRg+b9CM+8Ki~*nYn4~7NAKBt_Z?c1!EnAe5^Um2HXMJEvnJ6CMX(Vv@l6&z-tK^U(
z6P64irUg&la++9jc4W@n^ZcUj;Y|#+MuHugaV(5)CDIre?&kDzS#zm80y)vs)z4*}
HQ$iB}$Wu|c

literal 0
HcmV?d00001

diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_message_bkg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_message_bkg.xml
new file mode 100644
index 0000000000..d4a17f0e59
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_message_bkg.xml
@@ -0,0 +1,10 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="@dimen/dp_180" />
+            <gradient android:angle="90"
+                android:endColor="#D94848"
+                android:startColor="#C63F3F" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml
new file mode 100644
index 0000000000..99e433a31f
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml
@@ -0,0 +1,8 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="@dimen/dp_30" />
+            <gradient android:angle="90" android:endColor="#3F456D" android:startColor="#3F435F" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
index 3fff1894f8..d6a0c423da 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
@@ -5,6 +5,41 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <RelativeLayout
+        android:id="@+id/llEventMore"
+        android:layout_width="@dimen/dp_132"
+        android:layout_height="@dimen/dp_132"
+        android:background="@drawable/v2x_drawable_event_more_bkg"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:translationZ="1dp">
+
+        <ImageView
+            android:id="@+id/btnShowOrHidePanels"
+            android:layout_width="@dimen/dp_52"
+            android:layout_height="@dimen/dp_52"
+            android:layout_centerInParent="true"
+            android:src="@drawable/icon_event_panel_more" />
+
+        <TextView
+            android:id="@+id/tvEventCount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginEnd="@dimen/dp_12"
+            android:background="@drawable/v2x_drawable_event_message_bkg"
+            android:paddingStart="@dimen/dp_10"
+            android:paddingTop="@dimen/dp_0_5"
+            android:paddingEnd="@dimen/dp_10"
+            android:paddingBottom="@dimen/dp_0_5"
+            android:textColor="#FFFFFF"
+            android:textSize="@dimen/dp_28"
+            android:visibility="gone"
+            tools:text="99"
+            tools:visibility="visible" />
+    </RelativeLayout>
+
     <com.mogo.module.v2x.view.RoundConstraintLayout
         android:id="@+id/clPanelContainer"
         android:layout_width="match_parent"
@@ -96,15 +131,4 @@
 
     </com.mogo.module.v2x.view.RoundConstraintLayout>
 
-    <Button
-        android:id="@+id/btnShowOrHidePanels"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="300dp"
-        android:layout_marginEnd="10dp"
-        android:text="显示面板"
-        android:textColor="#000"
-        android:textSize="20sp"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file