From 65968bae64115567c88f795d88330aaaa8504063 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Sun, 25 Oct 2020 13:10:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=AD=E9=9F=B3:=E6=9F=A5=E8=AF=A2=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E5=88=86=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/fragment/V2XEventPanelFragment.kt     | 37 ++++++++++++++++---
 .../v2x/fragment/V2XShareEventsFragment.java  |  8 ++--
 .../scene/road/V2XRoadVideoWindow.java        |  1 -
 .../module/v2x/view/SimpleCoverVideoPlayer.kt |  3 +-
 4 files changed, 37 insertions(+), 12 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 a2b443522c..3f34b58809 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
@@ -151,6 +151,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
                         mVpEventPanel?.setCurrentItem(1, false)
                     }
                     R.id.rbShareEvents -> {
+                        // 更改选中是否加粗
                         // 更改选中是否加粗
                         mRbScenarioHistory?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
                         mRbSurroundingEvent?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
@@ -206,12 +207,38 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
 
 
     public fun showPanelWithSelectedItem(item: Int) {
-        showPanel()
-        mRbScenarioHistory?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
-        mRbSurroundingEvent?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
-        mRbShareEvents?.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
+        if (isPanelShow()) {
+            selectWithItem(item)
+        } else {
+            showPanel()
+            selectWithItem(item)
+        }
+    }
 
-        mVpEventPanel?.setCurrentItem(item, false)
+    private fun selectWithItem(item: Int) {
+        when (item) {
+            0 -> {
+                try {
+                    mRbScenarioHistory?.isChecked = true
+                } catch (e: java.lang.Exception) {
+                    e.printStackTrace()
+                }
+            }
+            1 -> {
+                try {
+                    mRbSurroundingEvent?.isChecked = true
+                } catch (e: java.lang.Exception) {
+                    e.printStackTrace()
+                }
+            }
+            2 -> {
+                try {
+                    mRbShareEvents?.isChecked = true
+                } catch (e: java.lang.Exception) {
+                    e.printStackTrace()
+                }
+            }
+        }
     }
 
     fun showPanel() {
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 bc638a88b4..8439f76181 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
@@ -84,7 +84,7 @@ public class V2XShareEventsFragment extends MvpFragment<V2XShareEventsFragment,
         ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                animatioonAcction(View.VISIBLE);
+                animatioonAction(View.VISIBLE);
             }
         });
 
@@ -132,7 +132,7 @@ public class V2XShareEventsFragment extends MvpFragment<V2XShareEventsFragment,
      * 我的分享列表数据处理
      * */
     private void loadSuccessWithShareEventList(Object result) {
-        animatioonAcction(View.GONE);
+        animatioonAction(View.GONE);
         V2XShareEventItem resultData = (V2XShareEventItem) result;
         V2XShareEventLoadMoreItem item = new V2XShareEventLoadMoreItem();
         if (resultData != null && resultData.getResult() != null) {
@@ -179,7 +179,7 @@ public class V2XShareEventsFragment extends MvpFragment<V2XShareEventsFragment,
 
     }
 
-    private void animatioonAcction(int visible) {
+    private void animatioonAction(int visible) {
         if (visible == View.VISIBLE) {
             if (loadingView != null) {
                 loadingView.start();
@@ -201,7 +201,7 @@ public class V2XShareEventsFragment extends MvpFragment<V2XShareEventsFragment,
     @Override
     public void loadMoreShareEventList() {
         Log.d(TAG, "page--" + pageNum);
-        animatioonAcction(View.VISIBLE);
+        animatioonAction(View.VISIBLE);
         pageNum += 1;
         v2XShareNetworkModel.getShareEventList(pageNum, 10, new V2XRefreshCallback() {
             @Override
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoWindow.java
index 16307d9c9c..898882763d 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoWindow.java
@@ -83,7 +83,6 @@ public class V2XRoadVideoWindow extends RelativeLayout implements IV2XWindow, ID
         simpleCoverVideoPlayer.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                Log.d(TAG, "onClick啦啦啦啦啦啦啦啦");
                 if (simpleCoverVideoPlayer.getCurrentState() == GSYVideoView.CURRENT_STATE_PAUSE) {/*播放中*/
                     resume();
                 } else {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt
index d854120aaf..4f49bc80d1 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt
@@ -82,13 +82,12 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer {
 
     override fun updateStartImage() {
         when (mCurrentState) {
-//            GSYVideoView.CURRENT_STATE_PLAYING -> start.setImageResource(R.drawable.v2x_video_pause)
+            GSYVideoView.CURRENT_STATE_PLAYING -> start.setImageResource(R.drawable.v2x_video_pause)
             GSYVideoView.CURRENT_STATE_ERROR -> start.setImageResource(R.drawable.v2x_event_video_refresh)
             else -> start.setImageResource(R.drawable.v2x_icon_event_play)
         }
 
         when (mCurrentState) {
-            GSYVideoView.CURRENT_STATE_PAUSE -> start.setImageResource(R.drawable.v2x_video_pause)
             GSYVideoView.CURRENT_STATE_PAUSE -> start.visibility = View.VISIBLE
             else -> start.visibility = View.INVISIBLE
         }