From e1a07f66f72ae3f946a06ce533893c30063695a1 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Fri, 27 Nov 2020 11:48:50 +0800
Subject: [PATCH 1/3] opt

---
 .../v2x/adapter/V2XSurroundingDetailAdapter.java  | 10 +++++++---
 .../module/v2x/fragment/V2XEventPanelFragment.kt  |  9 +++++++--
 .../listener/SurroundingDetailItemListener.java   | 15 +++++++++++++++
 3 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/SurroundingDetailItemListener.java

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java
index 08c4d3abe2..69dac71345 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java
@@ -16,6 +16,7 @@ import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.adapter.holder.V2XSurroundingDetailVH;
 import com.mogo.module.v2x.entity.panel.SurroundingConstruction;
+import com.mogo.module.v2x.listener.SurroundingDetailItemListener;
 import com.mogo.module.v2x.utils.RoadConditionUtils;
 import com.mogo.module.v2x.view.HeartLikeView;
 import com.mogo.module.v2x.view.HeartUnLikeView;
@@ -39,10 +40,12 @@ public class V2XSurroundingDetailAdapter extends RecyclerView.Adapter<V2XSurroun
     private HeartLikeView mHeartLikeView;
     private HeartUnLikeView mUnHeartLikeView;
 
+    private SurroundingDetailItemListener mListener;
 
-    public V2XSurroundingDetailAdapter(Context context, List<MarkerExploreWay> list) {
+    public V2XSurroundingDetailAdapter(Context context, List<MarkerExploreWay> list, SurroundingDetailItemListener listener) {
         mContext = context;
         markerExploreWays = list;
+        mListener = listener;
     }
 
     @Override
@@ -77,18 +80,19 @@ public class V2XSurroundingDetailAdapter extends RecyclerView.Adapter<V2XSurroun
         mAddressTv.setText(exploreWay.getAddr());
         mTimeTv.setText(DateTimeUtils.getTimeText(exploreWay.getGenerateTime(), DateTimeUtils.MM_Yue_dd_Ri_HH_mm));
 
+        Logger.d(V2XConst.MODULE_NAME, "exploreWay.isFabulous() = " + exploreWay.isFabulous());
         showView(exploreWay.isFabulous());
 
         mHeartLikeView.setOnClickCallListener(v -> {
             Logger.d(V2XConst.MODULE_NAME, "反馈有用 position = " + position);
             roadReportTrue(exploreWay);
-            showView(true);
+            mListener.onItemClickListener(v, position, exploreWay);
         });
 
         mUnHeartLikeView.setOnClickCallListener(v -> {
             Logger.d(V2XConst.MODULE_NAME, "反馈无用 position = " + position);
             roadReportErr(exploreWay);
-            showView(true);
+            mListener.onItemClickListener(v, position, exploreWay);
         });
     }
 
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 62d57d394c..ed07ebdbe9 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
@@ -32,6 +32,7 @@ import com.mogo.module.v2x.adapter.V2XEventPagerAdapter
 import com.mogo.module.v2x.adapter.V2XSurroundingDetailAdapter
 import com.mogo.module.v2x.entity.panel.BackRefreshInfo
 import com.mogo.module.v2x.entity.panel.SurroundingConstruction
+import com.mogo.module.v2x.listener.SurroundingDetailItemListener
 import com.mogo.module.v2x.presenter.EventPanelPresenter
 import com.mogo.module.v2x.utils.TrackUtils
 import com.mogo.module.v2x.view.V2XEventPanelHistoryCountView
@@ -49,7 +50,7 @@ import org.greenrobot.eventbus.ThreadMode
  *
  * @author tongchenfei
  */
-class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPresenter>() {
+class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPresenter>() , SurroundingDetailItemListener {
 
     private val TAG = "EventPanelFragment"
 
@@ -267,10 +268,14 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
         selectWithItem(item)
     }
 
+    override fun onItemClickListener(v: View?, position: Int, exploreWay: MarkerExploreWay?) {
+        markerExploreWays[position].isFabulous = true
+        mSurroundingDetailAdapter.notifyItemChanged(position)
+    }
 
     private fun initDetail() {
         mDetailRecyclerView!!.addItemDecoration(SpacesItemDecoration(resources.getDimension(R.dimen.share_item_padding).toInt()))
-        mSurroundingDetailAdapter = V2XSurroundingDetailAdapter(activity, markerExploreWays)
+        mSurroundingDetailAdapter = V2XSurroundingDetailAdapter(activity, markerExploreWays, this)
         mDetailRecyclerView!!.adapter = mSurroundingDetailAdapter
         val linearLayoutManager = LinearLayoutManager(activity, LinearLayoutManager.VERTICAL, false)
         mDetailRecyclerView!!.layoutManager = linearLayoutManager
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/SurroundingDetailItemListener.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/SurroundingDetailItemListener.java
new file mode 100644
index 0000000000..1290e78670
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/SurroundingDetailItemListener.java
@@ -0,0 +1,15 @@
+package com.mogo.module.v2x.listener;
+
+import android.view.View;
+
+import com.mogo.module.common.entity.MarkerExploreWay;
+import com.mogo.module.v2x.entity.panel.SurroundingConstruction;
+
+/**
+ * @author lixiaopeng
+ * @description
+ * @since 2020/8/10
+ */
+public interface SurroundingDetailItemListener {
+    void onItemClickListener(View v, int position, MarkerExploreWay exploreWay);
+}

From 0dca234b5d9f48db4f39745cdbb49083d4ea49a3 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Fri, 27 Nov 2020 13:10:55 +0800
Subject: [PATCH 2/3] no message

---
 .../mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml b/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml
index 0c6111bd2a..9fc434c82f 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml
@@ -31,7 +31,7 @@
 
     <View
         android:id="@+id/viewLinEnd"
-        android:layout_width="12px"
+        android:layout_width="@dimen/dp_22"
         android:layout_height="1px"
         android:layout_marginLeft="16px"
         android:background="@color/share_event_no_more_color"

From 1b564ba775e09511ec7694f53bf09a0af8211d42 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Fri, 27 Nov 2020 16:11:32 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[add]=20=E5=85=B3=E9=97=AD=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E7=99=BD=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/module_main_activity_main.xml    | 12 ++++++------
 .../src/main/res/values-xhdpi/dimens.xml             |  8 ++++----
 .../drawable/module_common_close_selector_light.xml  |  6 ++++++
 3 files changed, 16 insertions(+), 10 deletions(-)
 create mode 100644 skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_close_selector_light.xml

diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
index 47c99c83a9..0e76264f15 100644
--- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
+++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
@@ -25,9 +25,9 @@
         android:layout_width="@dimen/module_main_apps_fragment_container_width"
         android:layout_height="match_parent"
         android:paddingLeft="@dimen/module_main_apps_fragment_container_padding"
-        android:paddingRight="@dimen/module_main_apps_fragment_container_padding"
         android:paddingTop="@dimen/module_main_apps_fragment_container_paddingTop"
-        android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop"/>
+        android:paddingRight="@dimen/module_main_apps_fragment_container_padding"
+        android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop" />
 
     <!--  左侧浮层,布局位置目前只考虑了1+16独立app情况  -->
     <FrameLayout
@@ -42,8 +42,8 @@
         android:layout_height="match_parent"
         android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft"
         android:paddingLeft="@dimen/module_main_apps_fragment_container_padding"
-        android:paddingRight="@dimen/module_main_apps_fragment_container_padding"
         android:paddingTop="@dimen/module_main_apps_fragment_container_paddingTop"
+        android:paddingRight="@dimen/module_main_apps_fragment_container_padding"
         android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop" />
 
     <!-- 浮层-->
@@ -58,15 +58,15 @@
         android:layout_height="match_parent"
         android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft"
         android:paddingLeft="@dimen/module_main_event_panel_fragment_paddingLeft"
-        android:paddingRight="@dimen/module_main_event_panel_fragment_paddingRight"
         android:paddingTop="@dimen/module_main_event_panel_fragment_paddingTop"
+        android:paddingRight="@dimen/module_main_event_panel_fragment_paddingRight"
         android:paddingBottom="@dimen/module_main_event_panel_fragment_paddingBottom" />
 
     <FrameLayout
         android:id="@+id/module_main_id_message_history_fragment_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft"/>
+        android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft" />
 
     <FrameLayout
         android:id="@+id/module_main_id_search_fragment"
@@ -77,8 +77,8 @@
         android:id="@+id/module_main_id_cover_up"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scaleType="centerCrop"
         android:background="@drawable/main_bitmap_splash_bg"
+        android:scaleType="centerCrop"
         android:visibility="visible" />
 
     <FrameLayout
diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml
index 0f5abc133c..1e3dc1ca7d 100644
--- a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml
@@ -28,8 +28,8 @@
     <dimen name="module_event_fragment_container_padding">20px</dimen>
     <dimen name="module_main_apps_fragment_container_paddingTop">20px</dimen>
 
-    <dimen name="module_main_event_panel_fragment_paddingTop">15px</dimen>
-    <dimen name="module_main_event_panel_fragment_paddingBottom">15px</dimen>
-    <dimen name="module_main_event_panel_fragment_paddingLeft">15px</dimen>
-    <dimen name="module_main_event_panel_fragment_paddingRight">15px</dimen>
+    <dimen name="module_main_event_panel_fragment_paddingTop">18px</dimen>
+    <dimen name="module_main_event_panel_fragment_paddingBottom">18px</dimen>
+    <dimen name="module_main_event_panel_fragment_paddingLeft">18px</dimen>
+    <dimen name="module_main_event_panel_fragment_paddingRight">18px</dimen>
 </resources>
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_close_selector_light.xml b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_close_selector_light.xml
new file mode 100644
index 0000000000..328ea41398
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_close_selector_light.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/module_common_icon_close_press_light" android:state_pressed="true" />
+    <item android:drawable="@drawable/module_common_icon_close_light" android:state_pressed="false" />
+    <item android:drawable="@drawable/module_common_icon_close_light" />
+</selector>
\ No newline at end of file