From 8dc2c040c27ca4bdafe83bee7cf8589ea0c12d5c Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Mon, 20 Jul 2020 16:49:44 +0800
Subject: [PATCH 01/17] =?UTF-8?q?[add]=E5=88=86=E4=BA=AB=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BCUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panel/fragment/ShareEventsFragment.java   |  29 ++++
 .../module_event_panel_fragment_my_share.xml  |  90 ++++++++++-
 .../layout/module_event_share_description.xml | 141 ++++++++++++++++++
 3 files changed, 254 insertions(+), 6 deletions(-)
 create mode 100644 modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ShareEventsFragment.java
 create mode 100644 modules/mogo-module-event-panel/src/main/res/layout/module_event_share_description.xml

diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ShareEventsFragment.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ShareEventsFragment.java
new file mode 100644
index 0000000000..a076cb1964
--- /dev/null
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ShareEventsFragment.java
@@ -0,0 +1,29 @@
+package com.zhidao.mogo.module.event.panel.fragment;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.mogo.commons.mvp.MvpFragment;
+import com.mogo.commons.mvp.Presenter;
+import com.zhidao.mogo.module.event.panel.R;
+
+public class ShareEventsFragment extends MvpFragment {
+
+    private RecyclerView roadCase;
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.module_event_panel_fragment_my_share;
+    }
+
+    @Override
+    protected void initViews() {
+        roadCase = (RecyclerView) findViewById(R.id.road_case_share_list);
+    }
+
+    @NonNull
+    @Override
+    protected Presenter createPresenter() {
+        return null;
+    }
+}
diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_my_share.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_my_share.xml
index 3a5d7413a6..98516bf6c3 100644
--- a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_my_share.xml
+++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_my_share.xml
@@ -1,15 +1,93 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/clPanelContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/tvTitle"
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:gravity="center"
-        android:text="My Share"
-        android:textColor="#fff"
-        android:textSize="40sp" />
+        android:id="@+id/road_case_liset_item">
+
+        <TextView
+            android:id="@+id/road_case_style"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="#0000FF"
+            android:gravity="center"
+            android:paddingLeft="20dp"
+            android:paddingTop="20dp"
+            android:text="道路类型"
+            android:textColor="#ffffff"
+            android:textSize="20sp" />
+
+        <TextView
+            android:id="@+id/road_case_address"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/road_case_style"
+            android:background="#0000FF"
+            android:gravity="center"
+            android:paddingLeft="15dp"
+            android:text="东城区北三环"
+            android:textColor="#ffffff"
+            android:textSize="25sp" />
+
+        <TextView
+            android:id="@+id/road_case_share_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/road_case_address"
+            android:background="#0000FF"
+            android:gravity="center"
+            android:paddingLeft="20dp"
+            android:text="时间:"
+            android:textColor="#ffffff"
+            android:textSize="15sp" />
+
+        <Button
+            android:id="@+id/road_case_useless"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_alignParentRight="true"
+            android:layout_marginTop="25dp"
+            android:layout_marginRight="20dp"
+            android:background="@drawable/amap_bus" />
+
+        <TextView
+            android:id="@+id/road_case_useless_num"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_below="@id/road_case_useless"
+            android:layout_alignLeft="@id/road_case_useless"
+            android:layout_alignRight="@id/road_case_useless"
+            android:gravity="center"
+            android:text="10"
+            android:textColor="#FF4233"
+            android:textSize="15sp" />
+
+        <Button
+            android:id="@+id/road_case_uselful"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_alignTop="@id/road_case_useless"
+            android:layout_alignBottom="@id/road_case_useless"
+            android:layout_marginRight="20dp"
+            android:layout_toLeftOf="@id/road_case_useless"
+            android:background="@drawable/amap_ride" />
+
+        <TextView
+            android:id="@+id/road_case_useful_num"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_below="@id/road_case_useless"
+            android:layout_alignLeft="@id/road_case_uselful"
+            android:layout_alignRight="@id/road_case_uselful"
+            android:gravity="center"
+            android:text="5"
+            android:textColor="#FF4233"
+            android:textSize="15sp" />
+    </RelativeLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_share_description.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_share_description.xml
new file mode 100644
index 0000000000..4af7277581
--- /dev/null
+++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_share_description.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:orientation="horizontal"
+        android:id="@+id/share_linear">
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="80dp"
+            android:layout_weight="1"
+            android:background="#0000ff"
+            android:orientation="vertical">
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:id="@+id/share_num"
+                android:text="0"
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:textColor="#FFFFFF"
+                android:textSize="25sp"/>
+            <TextView
+                android:layout_width="match_parent"
+                android:id="@+id/shre_num_des"
+                android:layout_height="30dp"
+                android:textSize="20sp"
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:textColor="#FFFFFF"
+                android:text="分享次数"/>
+
+        </>
+
+        <ImageView
+            android:layout_width="1dp"
+            android:layout_height="80dp"
+            android:background="#FFFFFF"/>
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="80dp"
+            android:layout_weight="1"
+            android:background="#0000ff"
+            android:orientation="vertical">
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:id="@+id/share_approve"
+                android:text="0"
+                android:gravity="center"
+                android:textColor="#FFFFFF"
+                android:textSize="25sp"/>
+            <TextView
+                android:layout_width="match_parent"
+                android:id="@+id/share_approve_des"
+                android:layout_height="30dp"
+                android:textSize="20sp"
+                android:gravity="center"
+                android:textColor="#FFFFFF"
+                android:text="车友认同次数"/>
+
+        </LinearLayout>
+
+        <ImageView
+            android:layout_width="1dp"
+            android:layout_height="80dp"
+            android:background="#FFFFFF"/>
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="80dp"
+            android:layout_weight="1"
+            android:background="#0000ff"
+            android:orientation="vertical">
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:id="@+id/share_index"
+                android:background="@drawable/amap_ride"/>
+            <TextView
+                android:layout_width="match_parent"
+                android:id="@+id/share_index_des"
+                android:layout_height="30dp"
+                android:textSize="20sp"
+                android:gravity="center"
+                android:textColor="#FFFFFF"
+                android:text="热心指数"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="30dp"
+        android:layout_below="@+id/share_linear"
+        android:id="@+id/share_event_guide_des"
+        android:gravity="center"
+        android:textSize="16sp"
+        android:textColor="#FFFFFF"
+        android:background="#0000ff"
+        android:layout_centerHorizontal="true"
+        android:text="小窍门:分享路况、点赞其他车友，有助于提高热心指数">
+
+    </TextView>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="100dp"
+        android:id="@+id/share_event_null_des"
+        android:layout_below="@+id/share_event_guide_des"
+        android:gravity="center"
+        android:layout_centerHorizontal="true"
+        android:text="你还没有分享过道路事件，快去试试吧"/>
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/shre_event_button"
+        android:layout_below="@+id/share_event_null_des"
+        android:text="去分享"
+        android:background="#FFFFFF"
+        android:shadowRadius="4dp"
+        android:textSize="25sp"
+        android:layout_centerHorizontal="true"/>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/road_case_share_list"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:overScrollMode="never"
+        android:layout_below="@+id/share_linear"
+        app:layout_constraintBottom_toBottomOf = "parent"/>
+
+</RelativeLayout>
\ No newline at end of file

From b0c91bbb44c480d0398e536db0dbf9335d311347 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Mon, 20 Jul 2020 18:50:03 +0800
Subject: [PATCH 02/17] =?UTF-8?q?[add]=20=E6=B7=BB=E5=8A=A0=E5=88=86?=
 =?UTF-8?q?=E4=BA=ABPresenter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../event/panel/adapter/EventPagerAdapter.kt  |   3 +-
 .../panel/fragment/ShareEventsFragment.java   |  15 +-
 .../panel/presenter/ShareEventsPresenter.java |  11 +
 .../layout/module_event_share_description.xml | 250 +++++++++---------
 4 files changed, 149 insertions(+), 130 deletions(-)
 create mode 100644 modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/ShareEventsPresenter.java

diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/EventPagerAdapter.kt b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/EventPagerAdapter.kt
index 97d9514975..d958b6bff1 100644
--- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/EventPagerAdapter.kt
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/EventPagerAdapter.kt
@@ -3,6 +3,7 @@ package com.zhidao.mogo.module.event.panel.adapter
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import com.zhidao.mogo.module.event.panel.fragment.MyShareFragment
+import com.zhidao.mogo.module.event.panel.fragment.ShareEventsFragment
 import com.zhidao.mogo.module.event.panel.fragment.SurroundingEventFragment
 import com.zhidao.mogo.module.event.panel.fragment.TripRecordFragment
 
@@ -12,7 +13,7 @@ import com.zhidao.mogo.module.event.panel.fragment.TripRecordFragment
  * @author tongchenfei
  */
 class EventPagerAdapter(fragment: Fragment) : FragmentStateAdapter(fragment) {
-    private val fragments:Array<Fragment> = arrayOf(TripRecordFragment(), SurroundingEventFragment(), MyShareFragment())
+    private val fragments:Array<Fragment> = arrayOf(TripRecordFragment(), SurroundingEventFragment(), ShareEventsFragment())
 
     /**
      * 目前一共就三个fragment
diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ShareEventsFragment.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ShareEventsFragment.java
index a076cb1964..7dc5b6e422 100644
--- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ShareEventsFragment.java
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ShareEventsFragment.java
@@ -1,29 +1,26 @@
 package com.zhidao.mogo.module.event.panel.fragment;
 
 import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
 import com.mogo.commons.mvp.MvpFragment;
-import com.mogo.commons.mvp.Presenter;
 import com.zhidao.mogo.module.event.panel.R;
+import com.zhidao.mogo.module.event.panel.presenter.ShareEventsPresenter;
 
-public class ShareEventsFragment extends MvpFragment {
+public class ShareEventsFragment extends MvpFragment <ShareEventsFragment, ShareEventsPresenter> {
 
-    private RecyclerView roadCase;
 
     @Override
     protected int getLayoutId() {
-        return R.layout.module_event_panel_fragment_my_share;
+        return R.layout.module_event_share_description;
     }
 
     @Override
     protected void initViews() {
-        roadCase = (RecyclerView) findViewById(R.id.road_case_share_list);
+
     }
 
     @NonNull
     @Override
-    protected Presenter createPresenter() {
-        return null;
+    protected ShareEventsPresenter createPresenter() {
+        return new ShareEventsPresenter(this);
     }
 }
diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/ShareEventsPresenter.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/ShareEventsPresenter.java
new file mode 100644
index 0000000000..4538dd7a7d
--- /dev/null
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/ShareEventsPresenter.java
@@ -0,0 +1,11 @@
+package com.zhidao.mogo.module.event.panel.presenter;
+
+import com.mogo.commons.mvp.IView;
+import com.mogo.commons.mvp.Presenter;
+import com.zhidao.mogo.module.event.panel.fragment.ShareEventsFragment;
+
+public class ShareEventsPresenter extends Presenter <ShareEventsFragment>{
+    public ShareEventsPresenter(IView view) {
+        super((ShareEventsFragment) view);
+    }
+}
diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_share_description.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_share_description.xml
index 4af7277581..23057858dd 100644
--- a/modules/mogo-module-event-panel/src/main/res/layout/module_event_share_description.xml
+++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_share_description.xml
@@ -1,141 +1,151 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="match_parent">
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="80dp"
-        android:orientation="horizontal"
-        android:id="@+id/share_linear">
+        android:layout_height="match_parent">
 
         <LinearLayout
-            android:layout_width="fill_parent"
+            android:id="@+id/share_linear"
+            android:layout_width="match_parent"
             android:layout_height="80dp"
-            android:layout_weight="1"
-            android:background="#0000ff"
-            android:orientation="vertical">
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:id="@+id/share_num"
-                android:text="0"
-                android:gravity="center"
-                android:layout_gravity="center"
-                android:textColor="#FFFFFF"
-                android:textSize="25sp"/>
-            <TextView
-                android:layout_width="match_parent"
-                android:id="@+id/shre_num_des"
-                android:layout_height="30dp"
-                android:textSize="20sp"
-                android:gravity="center"
-                android:layout_gravity="center"
-                android:textColor="#FFFFFF"
-                android:text="分享次数"/>
+            android:orientation="horizontal">
 
-        </>
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="80dp"
+                android:layout_weight="1"
+                android:background="#0000ff"
+                android:orientation="vertical">
 
-        <ImageView
-            android:layout_width="1dp"
-            android:layout_height="80dp"
-            android:background="#FFFFFF"/>
+                <TextView
+                    android:id="@+id/share_num"
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="0"
+                    android:textColor="#FFFFFF"
+                    android:textSize="25sp" />
 
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="80dp"
-            android:layout_weight="1"
-            android:background="#0000ff"
-            android:orientation="vertical">
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:id="@+id/share_approve"
-                android:text="0"
-                android:gravity="center"
-                android:textColor="#FFFFFF"
-                android:textSize="25sp"/>
-            <TextView
-                android:layout_width="match_parent"
-                android:id="@+id/share_approve_des"
-                android:layout_height="30dp"
-                android:textSize="20sp"
-                android:gravity="center"
-                android:textColor="#FFFFFF"
-                android:text="车友认同次数"/>
+                <TextView
+                    android:id="@+id/shre_num_des"
+                    android:layout_width="match_parent"
+                    android:layout_height="30dp"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="分享次数"
+                    android:textColor="#FFFFFF"
+                    android:textSize="20sp" />
 
-        </LinearLayout>
+            </LinearLayout>
 
-        <ImageView
-            android:layout_width="1dp"
-            android:layout_height="80dp"
-            android:background="#FFFFFF"/>
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="80dp"
-            android:layout_weight="1"
-            android:background="#0000ff"
-            android:orientation="vertical">
             <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:id="@+id/share_index"
-                android:background="@drawable/amap_ride"/>
-            <TextView
-                android:layout_width="match_parent"
-                android:id="@+id/share_index_des"
-                android:layout_height="30dp"
-                android:textSize="20sp"
-                android:gravity="center"
-                android:textColor="#FFFFFF"
-                android:text="热心指数"/>
+                android:layout_width="1dp"
+                android:layout_height="80dp"
+                android:background="#FFFFFF" />
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="80dp"
+                android:layout_weight="1"
+                android:background="#0000ff"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/share_approve"
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:gravity="center"
+                    android:text="0"
+                    android:textColor="#FFFFFF"
+                    android:textSize="25sp" />
+
+                <TextView
+                    android:id="@+id/share_approve_des"
+                    android:layout_width="match_parent"
+                    android:layout_height="30dp"
+                    android:gravity="center"
+                    android:text="车友认同次数"
+                    android:textColor="#FFFFFF"
+                    android:textSize="20sp" />
+
+            </LinearLayout>
+
+            <ImageView
+                android:layout_width="1dp"
+                android:layout_height="80dp"
+                android:background="#FFFFFF" />
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="80dp"
+                android:layout_weight="1"
+                android:background="#0000ff"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:id="@+id/share_index"
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:background="@drawable/amap_ride" />
+
+                <TextView
+                    android:id="@+id/share_index_des"
+                    android:layout_width="match_parent"
+                    android:layout_height="30dp"
+                    android:gravity="center"
+                    android:text="热心指数"
+                    android:textColor="#FFFFFF"
+                    android:textSize="20sp" />
+
+            </LinearLayout>
 
         </LinearLayout>
 
-    </LinearLayout>
+        <TextView
+            android:id="@+id/share_event_guide_des"
+            android:layout_width="wrap_content"
+            android:layout_height="30dp"
+            android:layout_below="@+id/share_linear"
+            android:layout_centerHorizontal="true"
+            android:background="#0000ff"
+            android:gravity="center"
+            android:text="小窍门:分享路况、点赞其他车友，有助于提高热心指数"
+            android:textColor="#FFFFFF"
+            android:textSize="16sp">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="30dp"
-        android:layout_below="@+id/share_linear"
-        android:id="@+id/share_event_guide_des"
-        android:gravity="center"
-        android:textSize="16sp"
-        android:textColor="#FFFFFF"
-        android:background="#0000ff"
-        android:layout_centerHorizontal="true"
-        android:text="小窍门:分享路况、点赞其他车友，有助于提高热心指数">
+        </TextView>
 
-    </TextView>
+        <TextView
+            android:id="@+id/share_event_null_des"
+            android:layout_width="wrap_content"
+            android:layout_height="100dp"
+            android:layout_below="@+id/share_event_guide_des"
+            android:layout_centerHorizontal="true"
+            android:gravity="center"
+            android:text="你还没有分享过道路事件，快去试试吧" />
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="100dp"
-        android:id="@+id/share_event_null_des"
-        android:layout_below="@+id/share_event_guide_des"
-        android:gravity="center"
-        android:layout_centerHorizontal="true"
-        android:text="你还没有分享过道路事件，快去试试吧"/>
+        <Button
+            android:id="@+id/shre_event_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/share_event_null_des"
+            android:layout_centerHorizontal="true"
+            android:background="#FFFFFF"
+            android:text="去分享"
+            android:textSize="25sp" />
 
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/shre_event_button"
-        android:layout_below="@+id/share_event_null_des"
-        android:text="去分享"
-        android:background="#FFFFFF"
-        android:shadowRadius="4dp"
-        android:textSize="25sp"
-        android:layout_centerHorizontal="true"/>
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/road_case_share_list"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/share_linear"
+            android:overScrollMode="never"
+            app:layout_constraintBottom_toBottomOf="parent" />
+    </RelativeLayout>
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/road_case_share_list"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:overScrollMode="never"
-        android:layout_below="@+id/share_linear"
-        app:layout_constraintBottom_toBottomOf = "parent"/>
-
-</RelativeLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From b4526e4df00475e147a443be9625fcfe6ca3b3a1 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Mon, 20 Jul 2020 19:57:33 +0800
Subject: [PATCH 03/17] =?UTF-8?q?[add]RecylerView/Adapter-=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panel/adapter/ShareEventAdapter.java      | 24 +++++++++++
 .../panel/fragment/ShareEventsFragment.java   | 43 ++++++++++++++++++-
 ...le_event_panel_share_event_recylerview.xml | 14 ++++++
 .../layout/module_event_share_description.xml |  7 ---
 4 files changed, 79 insertions(+), 9 deletions(-)
 create mode 100644 modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java
 create mode 100644 modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_event_recylerview.xml

diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java
new file mode 100644
index 0000000000..cb22c54e7e
--- /dev/null
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java
@@ -0,0 +1,24 @@
+package com.zhidao.mogo.module.event.panel.adapter;
+
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+public class ShareEventAdapter extends RecyclerView.Adapter {
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return null;
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return 0;
+    }
+}
diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ShareEventsFragment.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ShareEventsFragment.java
index 7dc5b6e422..59f1db7e33 100644
--- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ShareEventsFragment.java
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ShareEventsFragment.java
@@ -1,16 +1,33 @@
 package com.zhidao.mogo.module.event.panel.fragment;
 
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.mogo.commons.mvp.MvpFragment;
 import com.zhidao.mogo.module.event.panel.R;
+import com.zhidao.mogo.module.event.panel.adapter.ShareEventAdapter;
 import com.zhidao.mogo.module.event.panel.presenter.ShareEventsPresenter;
 
-public class ShareEventsFragment extends MvpFragment <ShareEventsFragment, ShareEventsPresenter> {
+public class ShareEventsFragment extends MvpFragment<ShareEventsFragment, ShareEventsPresenter> {
+
+
+    private RecyclerView listview;
+    private View view;
+    private ShareEventAdapter adapter;
 
 
     @Override
     protected int getLayoutId() {
-        return R.layout.module_event_share_description;
+        return R.layout.module_event_panel_share_event_recylerview;
     }
 
     @Override
@@ -18,6 +35,28 @@ public class ShareEventsFragment extends MvpFragment <ShareEventsFragment, Share
 
     }
 
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        view = inflater.inflate(R.layout.module_event_panel_fragment_my_share, container, false);
+        initRecyclerView();
+        initData();
+        return view;
+    }
+
+    private void initData() {
+
+    }
+
+    private void initRecyclerView() {
+        listview = findViewById(R.id.road_case_share_list);
+        listview.setAdapter(adapter);
+        listview.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));
+        //分割线
+        listview.addItemDecoration(new DividerItemDecoration(getActivity(),DividerItemDecoration.VERTICAL));
+
+    }
+
     @NonNull
     @Override
     protected ShareEventsPresenter createPresenter() {
diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_event_recylerview.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_event_recylerview.xml
new file mode 100644
index 0000000000..3c9e54d174
--- /dev/null
+++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_event_recylerview.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/road_case_share_list"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:overScrollMode="never"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_share_description.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_share_description.xml
index 23057858dd..dc119da3bb 100644
--- a/modules/mogo-module-event-panel/src/main/res/layout/module_event_share_description.xml
+++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_share_description.xml
@@ -139,13 +139,6 @@
             android:text="去分享"
             android:textSize="25sp" />
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/road_case_share_list"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/share_linear"
-            android:overScrollMode="never"
-            app:layout_constraintBottom_toBottomOf="parent" />
     </RelativeLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 5aa6ab0405918dcefcc1e873f28eeca3e71e5a8a Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Tue, 21 Jul 2020 18:25:27 +0800
Subject: [PATCH 04/17] =?UTF-8?q?[add]=20=E6=88=91=E7=9A=84=E5=88=86?=
 =?UTF-8?q?=E4=BA=ABBean,=E5=88=97=E8=A1=A8UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panel/adapter/ShareEventAdapter.java      |  96 +++++++++++-
 .../panel/bean/ShareEventDescription.java     |   7 +
 .../event/panel/bean/ShareEventItem.java      |  11 ++
 .../event/panel/fragment/MyShareFragment.kt   |   2 +-
 .../panel/fragment/ShareEventsFragment.java   |  36 +++--
 .../module_event_panel_fragment_my_share.xml  |  93 -----------
 .../module_event_panel_my_share_item.xml      |  84 ++++++++++
 ...le_event_panel_share_event_description.xml |  95 ++++++++++++
 ...le_event_panel_share_event_recylerview.xml |  21 +--
 .../layout/module_event_panel_share_guide.xml |  38 +++++
 .../layout/module_event_share_description.xml | 144 ------------------
 11 files changed, 361 insertions(+), 266 deletions(-)
 create mode 100644 modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventDescription.java
 create mode 100644 modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventItem.java
 delete mode 100644 modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_my_share.xml
 create mode 100644 modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_my_share_item.xml
 create mode 100644 modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_event_description.xml
 create mode 100644 modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_guide.xml
 delete mode 100644 modules/mogo-module-event-panel/src/main/res/layout/module_event_share_description.xml

diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java
index cb22c54e7e..4d7322c590 100644
--- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java
@@ -1,24 +1,114 @@
 package com.zhidao.mogo.module.event.panel.adapter;
 
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-public class ShareEventAdapter extends RecyclerView.Adapter {
+import com.zhidao.mogo.module.event.panel.R;
+import com.zhidao.mogo.module.event.panel.bean.ShareEventDescription;
+import com.zhidao.mogo.module.event.panel.bean.ShareEventItem;
+
+import java.util.ArrayList;
+
+public class ShareEventAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+    private Context context;
+    private ArrayList<ShareEventItem> dataArrayList;
+    private Object Tag = "ShareEventAdapter";
+    private final LayoutInflater shareLayoutInflater;
+
+    public static enum ITEM_TYPE {
+        ITEM_TYPE_NUM_DES,
+        ITEM_TYPE_SHARE_LIST
+    }
+
+    public ShareEventAdapter(Context context, ArrayList<ShareEventItem> dataArrayList) {
+        this.context = context;
+        this.dataArrayList = dataArrayList;
+        shareLayoutInflater = LayoutInflater.from(context);
+    }
+
     @NonNull
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        return null;
+        //根据viewType创建自定义布局
+        if (viewType == ITEM_TYPE.ITEM_TYPE_NUM_DES.ordinal()) {
+            View v = shareLayoutInflater.inflate(R.layout.module_event_panel_share_event_description, parent,
+                    false);
+            shareDescriptionViewHolder holder = new shareDescriptionViewHolder(v);
+            return holder;
+        } else {
+            View v = shareLayoutInflater.inflate(R.layout.module_event_panel_my_share_item, parent,
+                    false);
+            shareItemViewHolder holder = new shareItemViewHolder(v);
+            return holder;
+        }
+
     }
 
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        if (position < 1) {
+            ShareEventDescription data = new ShareEventDescription();
+            data.shareNum = "12";
+            data.approveNum = "10";
+            ((shareDescriptionViewHolder) holder).shareNumTextView.setText(data.shareNum);
+            ((shareDescriptionViewHolder) holder).approveNumTextView.setText(data.approveNum);
+
+        } else {
+            ShareEventItem data = dataArrayList.get(position-1);
+            ((shareItemViewHolder) holder).caseStyleTextView.setText(data.caseStyle);
+            ((shareItemViewHolder) holder).caseAddressTextView.setText(data.caseAddress);
+            ((shareItemViewHolder) holder).caseTimeTextView.setText(data.caseTime);
+        }
 
     }
 
     @Override
     public int getItemCount() {
-        return 0;
+        return dataArrayList.size() + 1;
     }
+
+    @Override
+    public int getItemViewType(int position) {
+        int type = position == 0 ? ITEM_TYPE.ITEM_TYPE_NUM_DES.ordinal() : ITEM_TYPE.ITEM_TYPE_SHARE_LIST.ordinal();
+        return type;
+    }
+
+    /*
+     * 分享列表
+     * */
+    class shareItemViewHolder extends RecyclerView.ViewHolder {
+        private TextView caseStyleTextView;
+        private TextView caseAddressTextView;
+        private TextView caseTimeTextView;
+//        private TextView caseUsefulTextView;
+
+        public shareItemViewHolder(@NonNull View itemView) {
+            super(itemView);
+            caseStyleTextView = itemView.findViewById(R.id.road_case_style);
+            caseAddressTextView = itemView.findViewById(R.id.road_case_address);
+            caseTimeTextView = itemView.findViewById(R.id.road_case_share_time);
+//            caseUsefulTextView = itemView.findViewById(R.id.road_case_useful_num);
+        }
+    }
+
+    /*
+     * 分享次数,热心指数...
+     * */
+    class shareDescriptionViewHolder extends RecyclerView.ViewHolder {
+        private TextView shareNumTextView;
+        private TextView approveNumTextView;
+
+        public shareDescriptionViewHolder(@NonNull View itemView) {
+            super(itemView);
+            shareNumTextView = itemView.findViewById(R.id.share_num);
+            approveNumTextView = itemView.findViewById(R.id.share_approve);
+        }
+    }
+
 }
diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventDescription.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventDescription.java
new file mode 100644
index 0000000000..ddd728241f
--- /dev/null
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventDescription.java
@@ -0,0 +1,7 @@
+package com.zhidao.mogo.module.event.panel.bean;
+
+public class ShareEventDescription {
+    public String shareNum;
+    public String approveNum;
+
+}
diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventItem.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventItem.java
new file mode 100644
index 0000000000..d04f3d4660
--- /dev/null
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventItem.java
@@ -0,0 +1,11 @@
+package com.zhidao.mogo.module.event.panel.bean;
+
+import java.io.Serializable;
+
+public class ShareEventItem implements Serializable {
+    public String caseStyle;
+    public String caseAddress;
+    public String caseTime;
+}
+
+
diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/MyShareFragment.kt b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/MyShareFragment.kt
index 2d759ded94..5feeafa005 100644
--- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/MyShareFragment.kt
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/MyShareFragment.kt
@@ -10,7 +10,7 @@ class MyShareFragment : MvpFragment<MyShareFragment, MySharePresenter>() {
      *
      * @return
      */
-    override fun getLayoutId(): Int = R.layout.module_event_panel_fragment_my_share
+    override fun getLayoutId(): Int = R.layout.module_event_panel_my_share_item
 
     /**
      * 初始化控件，必须在初始化完成之后才可以实例化presenter，避免
diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ShareEventsFragment.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ShareEventsFragment.java
index 59f1db7e33..cf8a4d4ad1 100644
--- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ShareEventsFragment.java
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ShareEventsFragment.java
@@ -4,26 +4,26 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.mogo.commons.mvp.MvpFragment;
 import com.zhidao.mogo.module.event.panel.R;
 import com.zhidao.mogo.module.event.panel.adapter.ShareEventAdapter;
+import com.zhidao.mogo.module.event.panel.bean.ShareEventItem;
 import com.zhidao.mogo.module.event.panel.presenter.ShareEventsPresenter;
 
+import java.util.ArrayList;
+
 public class ShareEventsFragment extends MvpFragment<ShareEventsFragment, ShareEventsPresenter> {
 
-
-    private RecyclerView listview;
+    private RecyclerView recyclerView;
     private View view;
     private ShareEventAdapter adapter;
-
+    private ArrayList<ShareEventItem> dataArrayList = new ArrayList<ShareEventItem>();
 
     @Override
     protected int getLayoutId() {
@@ -38,23 +38,29 @@ public class ShareEventsFragment extends MvpFragment<ShareEventsFragment, ShareE
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        view = inflater.inflate(R.layout.module_event_panel_fragment_my_share, container, false);
+        view = inflater.inflate(R.layout.module_event_panel_share_event_recylerview, container, false);
         initRecyclerView();
         initData();
         return view;
     }
 
-    private void initData() {
-
+    private void initRecyclerView() {
+        recyclerView = view.findViewById(R.id.road_case_share_list);
+        adapter = new ShareEventAdapter(getActivity(),dataArrayList);
+        recyclerView.setAdapter(adapter);
+        LinearLayoutManager linearLayoutManager =
+                new LinearLayoutManager( getActivity(), LinearLayoutManager.VERTICAL, false );
+        recyclerView.setLayoutManager(linearLayoutManager);
     }
 
-    private void initRecyclerView() {
-        listview = findViewById(R.id.road_case_share_list);
-        listview.setAdapter(adapter);
-        listview.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));
-        //分割线
-        listview.addItemDecoration(new DividerItemDecoration(getActivity(),DividerItemDecoration.VERTICAL));
-
+    private void initData() {
+        for (int i = 0; i < 12; i++) {
+            ShareEventItem data = new ShareEventItem();
+            data.caseStyle = "道路拥堵";
+            data.caseAddress = "环球贸易中心";
+            data.caseTime = "2020-07-21 12:00:00";
+            dataArrayList.add(data);
+        }
     }
 
     @NonNull
diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_my_share.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_my_share.xml
deleted file mode 100644
index 98516bf6c3..0000000000
--- a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_my_share.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/clPanelContainer"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/road_case_liset_item">
-
-        <TextView
-            android:id="@+id/road_case_style"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="#0000FF"
-            android:gravity="center"
-            android:paddingLeft="20dp"
-            android:paddingTop="20dp"
-            android:text="道路类型"
-            android:textColor="#ffffff"
-            android:textSize="20sp" />
-
-        <TextView
-            android:id="@+id/road_case_address"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/road_case_style"
-            android:background="#0000FF"
-            android:gravity="center"
-            android:paddingLeft="15dp"
-            android:text="东城区北三环"
-            android:textColor="#ffffff"
-            android:textSize="25sp" />
-
-        <TextView
-            android:id="@+id/road_case_share_time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/road_case_address"
-            android:background="#0000FF"
-            android:gravity="center"
-            android:paddingLeft="20dp"
-            android:text="时间:"
-            android:textColor="#ffffff"
-            android:textSize="15sp" />
-
-        <Button
-            android:id="@+id/road_case_useless"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_alignParentRight="true"
-            android:layout_marginTop="25dp"
-            android:layout_marginRight="20dp"
-            android:background="@drawable/amap_bus" />
-
-        <TextView
-            android:id="@+id/road_case_useless_num"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_below="@id/road_case_useless"
-            android:layout_alignLeft="@id/road_case_useless"
-            android:layout_alignRight="@id/road_case_useless"
-            android:gravity="center"
-            android:text="10"
-            android:textColor="#FF4233"
-            android:textSize="15sp" />
-
-        <Button
-            android:id="@+id/road_case_uselful"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_alignTop="@id/road_case_useless"
-            android:layout_alignBottom="@id/road_case_useless"
-            android:layout_marginRight="20dp"
-            android:layout_toLeftOf="@id/road_case_useless"
-            android:background="@drawable/amap_ride" />
-
-        <TextView
-            android:id="@+id/road_case_useful_num"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_below="@id/road_case_useless"
-            android:layout_alignLeft="@id/road_case_uselful"
-            android:layout_alignRight="@id/road_case_uselful"
-            android:gravity="center"
-            android:text="5"
-            android:textColor="#FF4233"
-            android:textSize="15sp" />
-    </RelativeLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_my_share_item.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_my_share_item.xml
new file mode 100644
index 0000000000..87f4c653ab
--- /dev/null
+++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_my_share_item.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/road_case_liset_item"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/road_case_style"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingLeft="20dp"
+        android:paddingTop="20dp"
+        android:text="道路类型"
+        android:textColor="#FFFFFF"
+        android:textSize="20sp" />
+
+    <TextView
+        android:id="@+id/road_case_address"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/road_case_style"
+        android:gravity="center"
+        android:paddingLeft="15dp"
+        android:text="东城区北三环"
+        android:textColor="#FFFFFF"
+        android:textSize="25sp" />
+
+    <TextView
+        android:id="@+id/road_case_share_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/road_case_address"
+        android:gravity="center"
+        android:paddingLeft="20dp"
+        android:text="时间:"
+        android:textColor="#FFFFFF"
+        android:textSize="15sp" />
+
+    <Button
+        android:id="@+id/road_case_useless"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="25dp"
+        android:layout_marginRight="20dp"
+        android:background="@drawable/amap_bus" />
+
+    <TextView
+        android:id="@+id/road_case_useless_num"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_below="@id/road_case_useless"
+        android:layout_alignLeft="@id/road_case_useless"
+        android:layout_alignRight="@id/road_case_useless"
+        android:gravity="center"
+        android:text="10"
+        android:textColor="#FFFFFF"
+        android:textSize="15sp" />
+
+    <Button
+        android:id="@+id/road_case_uselful"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_alignTop="@id/road_case_useless"
+        android:layout_alignBottom="@id/road_case_useless"
+        android:layout_marginRight="20dp"
+        android:layout_toLeftOf="@id/road_case_useless"
+        android:background="@drawable/amap_ride" />
+
+    <TextView
+        android:id="@+id/road_case_useful_num"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_below="@id/road_case_useless"
+        android:layout_alignLeft="@id/road_case_uselful"
+        android:layout_alignRight="@id/road_case_uselful"
+        android:gravity="center"
+        android:text="5"
+        android:textColor="#FFFFFF"
+        android:textSize="15sp" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_event_description.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_event_description.xml
new file mode 100644
index 0000000000..864ddbe8fb
--- /dev/null
+++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_event_description.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="80dp"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/share_num"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:text="0"
+            android:textColor="#FFFFFF"
+            android:textSize="25sp" />
+
+        <TextView
+            android:id="@+id/shre_num_des"
+            android:layout_width="match_parent"
+            android:layout_height="30dp"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:text="分享次数"
+            android:textColor="#FFFFFF"
+            android:textSize="20sp" />
+
+    </LinearLayout>
+
+    <ImageView
+        android:layout_width="1dp"
+        android:layout_height="80dp"
+        android:background="#FFFFFF" />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="80dp"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/share_approve"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:gravity="center"
+            android:text="0"
+            android:textColor="#FFFFFF"
+            android:textSize="25sp" />
+
+        <TextView
+            android:id="@+id/share_approve_des"
+            android:layout_width="match_parent"
+            android:layout_height="30dp"
+            android:gravity="center"
+            android:text="车友认同次数"
+            android:textColor="#FFFFFF"
+            android:textSize="20sp" />
+
+    </LinearLayout>
+
+    <ImageView
+        android:layout_width="1dp"
+        android:layout_height="80dp"
+        android:background="#FFFFFF" />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="80dp"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/share_index"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:background="@drawable/amap_ride" />
+
+        <TextView
+            android:id="@+id/share_index_des"
+            android:layout_width="match_parent"
+            android:layout_height="30dp"
+            android:gravity="center"
+            android:text="热心指数"
+            android:textColor="#FFFFFF"
+            android:textSize="20sp" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_event_recylerview.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_event_recylerview.xml
index 3c9e54d174..882c71cee9 100644
--- a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_event_recylerview.xml
+++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_event_recylerview.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/road_case_share_list"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:overScrollMode="never"
+    android:background="#000000"
+    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+
+
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/road_case_share_list"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:overScrollMode="never"
-        app:layout_constraintBottom_toBottomOf="parent" />
 
-</RelativeLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_guide.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_guide.xml
new file mode 100644
index 0000000000..bb0949eaff
--- /dev/null
+++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_guide.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/share_event_guide_des"
+        android:layout_width="wrap_content"
+        android:layout_height="30dp"
+        android:layout_centerHorizontal="true"
+        android:background="#0000ff"
+        android:gravity="center"
+        android:text="小窍门:分享路况、点赞其他车友，有助于提高热心指数"
+        android:textColor="#FFFFFF"
+        android:textSize="16sp">
+
+    </TextView>
+
+    <TextView
+        android:id="@+id/share_event_null_des"
+        android:layout_width="wrap_content"
+        android:layout_height="100dp"
+        android:layout_below="@+id/share_event_guide_des"
+        android:layout_centerHorizontal="true"
+        android:gravity="center"
+        android:text="你还没有分享过道路事件，快去试试吧" />
+
+    <Button
+        android:id="@+id/shre_event_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/share_event_null_des"
+        android:layout_centerHorizontal="true"
+        android:background="#FFFFFF"
+        android:text="去分享"
+        android:textSize="25sp" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_share_description.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_share_description.xml
deleted file mode 100644
index dc119da3bb..0000000000
--- a/modules/mogo-module-event-panel/src/main/res/layout/module_event_share_description.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:id="@+id/share_linear"
-            android:layout_width="match_parent"
-            android:layout_height="80dp"
-            android:orientation="horizontal">
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="80dp"
-                android:layout_weight="1"
-                android:background="#0000ff"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/share_num"
-                    android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:text="0"
-                    android:textColor="#FFFFFF"
-                    android:textSize="25sp" />
-
-                <TextView
-                    android:id="@+id/shre_num_des"
-                    android:layout_width="match_parent"
-                    android:layout_height="30dp"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:text="分享次数"
-                    android:textColor="#FFFFFF"
-                    android:textSize="20sp" />
-
-            </LinearLayout>
-
-            <ImageView
-                android:layout_width="1dp"
-                android:layout_height="80dp"
-                android:background="#FFFFFF" />
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="80dp"
-                android:layout_weight="1"
-                android:background="#0000ff"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/share_approve"
-                    android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:gravity="center"
-                    android:text="0"
-                    android:textColor="#FFFFFF"
-                    android:textSize="25sp" />
-
-                <TextView
-                    android:id="@+id/share_approve_des"
-                    android:layout_width="match_parent"
-                    android:layout_height="30dp"
-                    android:gravity="center"
-                    android:text="车友认同次数"
-                    android:textColor="#FFFFFF"
-                    android:textSize="20sp" />
-
-            </LinearLayout>
-
-            <ImageView
-                android:layout_width="1dp"
-                android:layout_height="80dp"
-                android:background="#FFFFFF" />
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="80dp"
-                android:layout_weight="1"
-                android:background="#0000ff"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:id="@+id/share_index"
-                    android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:background="@drawable/amap_ride" />
-
-                <TextView
-                    android:id="@+id/share_index_des"
-                    android:layout_width="match_parent"
-                    android:layout_height="30dp"
-                    android:gravity="center"
-                    android:text="热心指数"
-                    android:textColor="#FFFFFF"
-                    android:textSize="20sp" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/share_event_guide_des"
-            android:layout_width="wrap_content"
-            android:layout_height="30dp"
-            android:layout_below="@+id/share_linear"
-            android:layout_centerHorizontal="true"
-            android:background="#0000ff"
-            android:gravity="center"
-            android:text="小窍门:分享路况、点赞其他车友，有助于提高热心指数"
-            android:textColor="#FFFFFF"
-            android:textSize="16sp">
-
-        </TextView>
-
-        <TextView
-            android:id="@+id/share_event_null_des"
-            android:layout_width="wrap_content"
-            android:layout_height="100dp"
-            android:layout_below="@+id/share_event_guide_des"
-            android:layout_centerHorizontal="true"
-            android:gravity="center"
-            android:text="你还没有分享过道路事件，快去试试吧" />
-
-        <Button
-            android:id="@+id/shre_event_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/share_event_null_des"
-            android:layout_centerHorizontal="true"
-            android:background="#FFFFFF"
-            android:text="去分享"
-            android:textSize="25sp" />
-
-    </RelativeLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 0703430181cff7364c3aad53911fedc2d8ab031a Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Wed, 22 Jul 2020 11:36:47 +0800
Subject: [PATCH 05/17] =?UTF-8?q?=E5=88=86=E4=BA=AB=E7=A9=BA=E7=99=BD?=
 =?UTF-8?q?=E9=A1=B5=E7=B1=BB=E5=9E=8B=E6=B7=BB=E5=8A=A0=20xml=20rename?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panel/adapter/ShareEventAdapter.java      | 55 ++++++++++++++-----
 .../panel/bean/ShareEventDescription.java     |  1 -
 .../event/panel/bean/ShareEventItem.java      |  2 +
 .../event/panel/fragment/MyShareFragment.kt   |  2 +-
 .../panel/fragment/ShareEventsFragment.java   | 18 +++---
 ... module_event_panel_share_description.xml} |  0
 ...xml => module_event_panel_share_empty.xml} |  3 +-
 ....xml => module_event_panel_share_item.xml} |  9 +--
 ... module_event_panel_share_recylerview.xml} |  5 +-
 9 files changed, 61 insertions(+), 34 deletions(-)
 rename modules/mogo-module-event-panel/src/main/res/layout/{module_event_panel_share_event_description.xml => module_event_panel_share_description.xml} (100%)
 rename modules/mogo-module-event-panel/src/main/res/layout/{module_event_panel_share_guide.xml => module_event_panel_share_empty.xml} (94%)
 rename modules/mogo-module-event-panel/src/main/res/layout/{module_event_panel_my_share_item.xml => module_event_panel_share_item.xml} (97%)
 rename modules/mogo-module-event-panel/src/main/res/layout/{module_event_panel_share_event_recylerview.xml => module_event_panel_share_recylerview.xml} (97%)

diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java
index 4d7322c590..e782b957ed 100644
--- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java
@@ -23,7 +23,8 @@ public class ShareEventAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
     public static enum ITEM_TYPE {
         ITEM_TYPE_NUM_DES,
-        ITEM_TYPE_SHARE_LIST
+        ITEM_TYPE_SHARE_LIST_ITEM,
+        ITEM_TYPE_SHARE_EMPTY
     }
 
     public ShareEventAdapter(Context context, ArrayList<ShareEventItem> dataArrayList) {
@@ -37,45 +38,63 @@ public class ShareEventAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         //根据viewType创建自定义布局
         if (viewType == ITEM_TYPE.ITEM_TYPE_NUM_DES.ordinal()) {
-            View v = shareLayoutInflater.inflate(R.layout.module_event_panel_share_event_description, parent,
+            View v = shareLayoutInflater.inflate(R.layout.module_event_panel_share_description, parent,
                     false);
             shareDescriptionViewHolder holder = new shareDescriptionViewHolder(v);
             return holder;
-        } else {
-            View v = shareLayoutInflater.inflate(R.layout.module_event_panel_my_share_item, parent,
+        } else if ((viewType == ITEM_TYPE.ITEM_TYPE_SHARE_LIST_ITEM.ordinal())) {
+            View v = shareLayoutInflater.inflate(R.layout.module_event_panel_share_item, parent,
                     false);
             shareItemViewHolder holder = new shareItemViewHolder(v);
             return holder;
+        } else {
+            View v = shareLayoutInflater.inflate(R.layout.module_event_panel_share_empty, parent,
+                    false);
+            shareEmptyViewHolder holder = new shareEmptyViewHolder(v);
+            return holder;
         }
 
     }
 
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        if (position < 1) {
+
+        if (position == 0) {
             ShareEventDescription data = new ShareEventDescription();
             data.shareNum = "12";
             data.approveNum = "10";
+
             ((shareDescriptionViewHolder) holder).shareNumTextView.setText(data.shareNum);
             ((shareDescriptionViewHolder) holder).approveNumTextView.setText(data.approveNum);
 
         } else {
-            ShareEventItem data = dataArrayList.get(position-1);
-            ((shareItemViewHolder) holder).caseStyleTextView.setText(data.caseStyle);
-            ((shareItemViewHolder) holder).caseAddressTextView.setText(data.caseAddress);
-            ((shareItemViewHolder) holder).caseTimeTextView.setText(data.caseTime);
+            if (dataArrayList.size() > 0) {
+                ShareEventItem data = dataArrayList.get(position - 1);
+                data.usefulNum = "2";
+                data.uselessNum = "3";
+                ((shareItemViewHolder) holder).caseStyleTextView.setText(data.caseStyle);
+                ((shareItemViewHolder) holder).caseAddressTextView.setText(data.caseAddress);
+                ((shareItemViewHolder) holder).caseTimeTextView.setText(data.caseTime);
+                ((shareItemViewHolder) holder).caseUsefulTextView.setText(data.usefulNum);
+                ((shareItemViewHolder) holder).caseUselessTextView.setText(data.uselessNum);
+            }
         }
 
     }
 
     @Override
     public int getItemCount() {
-        return dataArrayList.size() + 1;
+        return dataArrayList.size() + dataArrayList.size() > 0 ? 1 : 2;
     }
 
     @Override
     public int getItemViewType(int position) {
-        int type = position == 0 ? ITEM_TYPE.ITEM_TYPE_NUM_DES.ordinal() : ITEM_TYPE.ITEM_TYPE_SHARE_LIST.ordinal();
+        switch (dataArrayList.size()) {
+            case 0:
+                return position == 0 ? ITEM_TYPE.ITEM_TYPE_NUM_DES.ordinal() : ITEM_TYPE.ITEM_TYPE_SHARE_EMPTY.ordinal();
+        }
+
+        int type = position == 0 ? ITEM_TYPE.ITEM_TYPE_NUM_DES.ordinal() : ITEM_TYPE.ITEM_TYPE_SHARE_LIST_ITEM.ordinal();
         return type;
     }
 
@@ -86,14 +105,16 @@ public class ShareEventAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         private TextView caseStyleTextView;
         private TextView caseAddressTextView;
         private TextView caseTimeTextView;
-//        private TextView caseUsefulTextView;
+        private TextView caseUsefulTextView;
+        private TextView caseUselessTextView;
 
         public shareItemViewHolder(@NonNull View itemView) {
             super(itemView);
             caseStyleTextView = itemView.findViewById(R.id.road_case_style);
             caseAddressTextView = itemView.findViewById(R.id.road_case_address);
             caseTimeTextView = itemView.findViewById(R.id.road_case_share_time);
-//            caseUsefulTextView = itemView.findViewById(R.id.road_case_useful_num);
+            caseUsefulTextView = itemView.findViewById(R.id.road_case_useful_num);
+            caseUselessTextView = itemView.findViewById(R.id.road_case_useless_num);
         }
     }
 
@@ -111,4 +132,12 @@ public class ShareEventAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         }
     }
 
+    /*
+     * 去分享
+     * */
+    class shareEmptyViewHolder extends RecyclerView.ViewHolder {
+        public shareEmptyViewHolder(@NonNull View itemView) {
+            super(itemView);
+        }
+    }
 }
diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventDescription.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventDescription.java
index ddd728241f..f8980d92f3 100644
--- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventDescription.java
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventDescription.java
@@ -3,5 +3,4 @@ package com.zhidao.mogo.module.event.panel.bean;
 public class ShareEventDescription {
     public String shareNum;
     public String approveNum;
-
 }
diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventItem.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventItem.java
index d04f3d4660..509492eb58 100644
--- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventItem.java
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventItem.java
@@ -6,6 +6,8 @@ public class ShareEventItem implements Serializable {
     public String caseStyle;
     public String caseAddress;
     public String caseTime;
+    public String usefulNum;
+    public String uselessNum;
 }
 
 
diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/MyShareFragment.kt b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/MyShareFragment.kt
index 5feeafa005..06c387766a 100644
--- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/MyShareFragment.kt
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/MyShareFragment.kt
@@ -10,7 +10,7 @@ class MyShareFragment : MvpFragment<MyShareFragment, MySharePresenter>() {
      *
      * @return
      */
-    override fun getLayoutId(): Int = R.layout.module_event_panel_my_share_item
+    override fun getLayoutId(): Int = R.layout.module_event_panel_share_item
 
     /**
      * 初始化控件，必须在初始化完成之后才可以实例化presenter，避免
diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ShareEventsFragment.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ShareEventsFragment.java
index cf8a4d4ad1..0ec47f825f 100644
--- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ShareEventsFragment.java
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ShareEventsFragment.java
@@ -27,7 +27,7 @@ public class ShareEventsFragment extends MvpFragment<ShareEventsFragment, ShareE
 
     @Override
     protected int getLayoutId() {
-        return R.layout.module_event_panel_share_event_recylerview;
+        return R.layout.module_event_panel_share_recylerview;
     }
 
     @Override
@@ -38,7 +38,7 @@ public class ShareEventsFragment extends MvpFragment<ShareEventsFragment, ShareE
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        view = inflater.inflate(R.layout.module_event_panel_share_event_recylerview, container, false);
+        view = inflater.inflate(R.layout.module_event_panel_share_recylerview, container, false);
         initRecyclerView();
         initData();
         return view;
@@ -54,13 +54,13 @@ public class ShareEventsFragment extends MvpFragment<ShareEventsFragment, ShareE
     }
 
     private void initData() {
-        for (int i = 0; i < 12; i++) {
-            ShareEventItem data = new ShareEventItem();
-            data.caseStyle = "道路拥堵";
-            data.caseAddress = "环球贸易中心";
-            data.caseTime = "2020-07-21 12:00:00";
-            dataArrayList.add(data);
-        }
+//        for (int i = 0; i < 12; i++) {
+//            ShareEventItem data = new ShareEventItem();
+//            data.caseStyle = "道路拥堵";
+//            data.caseAddress = "环球贸易中心";
+//            data.caseTime = "2020-07-21 12:00:00";
+//            dataArrayList.add(data);
+//        }
     }
 
     @NonNull
diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_event_description.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_description.xml
similarity index 100%
rename from modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_event_description.xml
rename to modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_description.xml
diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_guide.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_empty.xml
similarity index 94%
rename from modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_guide.xml
rename to modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_empty.xml
index bb0949eaff..98c49f2548 100644
--- a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_guide.xml
+++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_empty.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/share_event_guide_des"
         android:layout_width="wrap_content"
         android:layout_height="30dp"
         android:layout_centerHorizontal="true"
-        android:background="#0000ff"
         android:gravity="center"
         android:text="小窍门:分享路况、点赞其他车友，有助于提高热心指数"
         android:textColor="#FFFFFF"
diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_my_share_item.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_item.xml
similarity index 97%
rename from modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_my_share_item.xml
rename to modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_item.xml
index 87f4c653ab..cb1c941fdc 100644
--- a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_my_share_item.xml
+++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_item.xml
@@ -12,9 +12,10 @@
         android:gravity="center"
         android:paddingLeft="20dp"
         android:paddingTop="20dp"
+        android:background="#1E90FF"
         android:text="道路类型"
         android:textColor="#FFFFFF"
-        android:textSize="20sp" />
+        android:textSize="15sp" />
 
     <TextView
         android:id="@+id/road_case_address"
@@ -25,7 +26,7 @@
         android:paddingLeft="15dp"
         android:text="东城区北三环"
         android:textColor="#FFFFFF"
-        android:textSize="25sp" />
+        android:textSize="20sp" />
 
     <TextView
         android:id="@+id/road_case_share_time"
@@ -36,7 +37,7 @@
         android:paddingLeft="20dp"
         android:text="时间:"
         android:textColor="#FFFFFF"
-        android:textSize="15sp" />
+        android:textSize="13sp" />
 
     <Button
         android:id="@+id/road_case_useless"
@@ -59,7 +60,7 @@
         android:textColor="#FFFFFF"
         android:textSize="15sp" />
 
-    <Button
+    <TextView
         android:id="@+id/road_case_uselful"
         android:layout_width="40dp"
         android:layout_height="40dp"
diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_event_recylerview.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_recylerview.xml
similarity index 97%
rename from modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_event_recylerview.xml
rename to modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_recylerview.xml
index 882c71cee9..4951050a70 100644
--- a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_event_recylerview.xml
+++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_recylerview.xml
@@ -8,8 +8,5 @@
     android:orientation="vertical"
     android:overScrollMode="never"
     android:background="#000000"
-    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-
-
+    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
 

From 8c3b4436fd8cdae082e70d2d5e99bcace31e298a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Wed, 22 Jul 2020 11:55:27 +0800
Subject: [PATCH 06/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=202.1=EF=BC=8C=E5=89=8D=E6=96=B9=E8=BD=A8=E8=BF=B9?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D=20http://wiki.zhidaohulian.com/pages/viewpag?=
 =?UTF-8?q?e.action=3FpageId=3D42308582?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/module/v2x/V2XSocketManager.java | 32 ++++++--
 .../adapter/holder/V2XRoadEventDetailVH.java  | 47 +++++-------
 .../mogo/module/v2x/alarm/V2XAlarmServer.java |  8 --
 .../v2x/listener/V2XLocationListener.java     |  4 +-
 .../listener/V2XMessageListener_401012.java   | 74 +++++++++++++++++++
 .../v2x/scenario/impl/V2XScenarioManager.java |  2 +-
 .../scene/road/V2XRoadEventScenario.java      | 13 +---
 .../scene/road/V2XRoadEventWindow.java        |  2 +-
 8 files changed, 127 insertions(+), 55 deletions(-)
 create mode 100644 modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XSocketManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XSocketManager.java
index c6163caa39..1d29df1df1 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XSocketManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XSocketManager.java
@@ -7,6 +7,7 @@ import com.mogo.module.v2x.listener.V2XMessageListener_401007;
 import com.mogo.module.v2x.listener.V2XMessageListener_401009;
 import com.mogo.module.v2x.listener.V2XMessageListener_401010;
 import com.mogo.module.v2x.listener.V2XMessageListener_401011;
+import com.mogo.module.v2x.listener.V2XMessageListener_401012;
 import com.mogo.utils.logger.Logger;
 
 import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
@@ -22,7 +23,8 @@ public class V2XSocketManager {
 
     private static V2XSocketManager mV2XSocketManager;
 
-    private V2XMessageListener_401011 v2XMessageListener_401001;
+    private V2XMessageListener_401011 v2XMessageListener_401011;
+    private V2XMessageListener_401012 v2XMessageListener_401012;
     private V2XMessageListener_401003 v2XMessageListener_401003;
     private V2XMessageListener_401005 v2XMessageListener_401005;
     private V2XMessageListener_401006 v2XMessageListener_401006;
@@ -52,6 +54,7 @@ public class V2XSocketManager {
     public void registerSocketMessage() {
         Logger.d(MODULE_NAME, "开始注册Socket通道....");
         register401011();
+        register401012();
         register401005();
         register401007();
         register401009();
@@ -66,10 +69,15 @@ public class V2XSocketManager {
      */
     public void unregisterSocketMessage() {
         Logger.w(MODULE_NAME, "反注册Socket通道....");
-        if (v2XMessageListener_401001 != null) {
+        if (v2XMessageListener_401011 != null) {
             V2XServiceManager
                     .getMoGoSocketManager()
-                    .unregisterOnMessageListener(401011, v2XMessageListener_401001);
+                    .unregisterOnMessageListener(401011, v2XMessageListener_401011);
+        }
+        if (v2XMessageListener_401012 != null) {
+            V2XServiceManager
+                    .getMoGoSocketManager()
+                    .unregisterOnMessageListener(401012, v2XMessageListener_401012);
         }
         if (v2XMessageListener_401003 != null) {
             V2XServiceManager
@@ -102,13 +110,27 @@ public class V2XSocketManager {
      * 道路事件，在线车辆绘制
      */
     private void register401011() {
-        v2XMessageListener_401001 = new V2XMessageListener_401011();
+        v2XMessageListener_401011 = new V2XMessageListener_401011();
         // 道路事件，在线车辆绘制
         V2XServiceManager
                 .getMoGoSocketManager()
                 .registerOnMessageListener(
                         401011,
-                        v2XMessageListener_401001
+                        v2XMessageListener_401011
+                );
+    }
+
+    /**
+     * 道路事件，服务端下发
+     */
+    private void register401012() {
+        v2XMessageListener_401012 = new V2XMessageListener_401012();
+        // 道路事件，在线车辆绘制
+        V2XServiceManager
+                .getMoGoSocketManager()
+                .registerOnMessageListener(
+                        401012,
+                        v2XMessageListener_401012
                 );
     }
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventDetailVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventDetailVH.java
index 165f912f32..32a3d96dec 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventDetailVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventDetailVH.java
@@ -200,37 +200,28 @@ public class V2XRoadEventDetailVH extends V2XBaseViewHolder {
                     tvEventTime.setText(eventTime);
                 }
 
-                // 事件距离车辆小于50米的时候可以用户纠错
-                if (mV2XRoadEventEntity.getDistance() < 50) {
-                    ivEventReportTrue.setVisibility(VISIBLE);
-                    ivEventReportErr.setVisibility(VISIBLE);
-
-                    ivEventLive.setVisibility(GONE);
-                    ivEventZan.setVisibility(GONE);
+                if (!ArrayUtils.isEmpty(mV2XEventShowEntity.getV2XLiveCarList())) {
+                    ivEventLive.setVisibility(VISIBLE);
+                    V2XVoiceManager.INSTANCE
+                            .registerWakeCmd(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_LIVE_ROAD,
+                                    v2XVoiceOpenLiveListener)
+                            .registerUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_LIVE_UN_WAKEUP,
+                                    v2XVoiceOpenLiveListener);
+                    ivEventLive.setOnClickListener(v -> {
+                        showLiveCar(v2XEventShowEntity);
+                    });
                 } else {
-                    if (!ArrayUtils.isEmpty(mV2XEventShowEntity.getV2XLiveCarList())) {
-                        ivEventLive.setVisibility(VISIBLE);
-                        V2XVoiceManager.INSTANCE
-                                .registerWakeCmd(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_LIVE_ROAD,
-                                        v2XVoiceOpenLiveListener)
-                                .registerUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_LIVE_UN_WAKEUP,
-                                        v2XVoiceOpenLiveListener);
-                        ivEventLive.setOnClickListener(v -> {
-                            showLiveCar(v2XEventShowEntity);
-                        });
-                    } else {
-                        ivEventLive.setVisibility(GONE);
-                    }
+                    ivEventLive.setVisibility(GONE);
+                }
 
-                    ivEventReportTrue.setVisibility(GONE);
-                    ivEventReportErr.setVisibility(GONE);
-                    ivEventZan.setVisibility(VISIBLE);
+                ivEventReportTrue.setVisibility(GONE);
+                ivEventReportErr.setVisibility(GONE);
+                ivEventZan.setVisibility(VISIBLE);
 
-                    // 用户上报的才会展示拨打电话
-                    if (!TextUtils.isEmpty(mNoveltyInfo.getUploadType())
-                            && mNoveltyInfo.getUploadType().equals("1")) {
-                        requestUserInfo(mNoveltyInfo);
-                    }
+                // 用户上报的才会展示拨打电话
+                if (!TextUtils.isEmpty(mNoveltyInfo.getUploadType())
+                        && mNoveltyInfo.getUploadType().equals("1")) {
+                    requestUserInfo(mNoveltyInfo);
                 }
 
                 ivEventReportTrue.setOnClickListener(v -> {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java
index f96ae6e301..ffc2ec230b 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java
@@ -52,7 +52,6 @@ import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
 public class V2XAlarmServer {
     // 记录道路播报的事件
     private static HashMap<V2XRoadEventEntity, String> mAlertRoadEventList = new HashMap<>();
-    private static HashSet<V2XRoadEventEntity> mAlertRoadEventCorrectionList = new HashSet<>();
 
     // 记录违章停车播报事件
     private static HashMap<MarkerExploreWay, String> mAlertIllegalParkEventList = new HashMap<>();
@@ -112,13 +111,6 @@ public class V2XAlarmServer {
                                         isAlreadyAlert = true;
                                     }
                                 }
-                                // 判断是否是纠错，如果是纠错就忽略掉带有时间段的道路提醒
-                                if (v2XRoadEventEntity.getDistance() <= 50) {
-                                    if (!mAlertRoadEventCorrectionList.contains(v2XRoadEventEntity)) {
-                                        mAlertRoadEventCorrectionList.add(v2XRoadEventEntity);
-                                        isAlreadyAlert = false;
-                                    }
-                                }
 //                                Logger.w(MODULE_NAME, "V2X预警--车辆与事件信息：" +
 //                                        "\n距离：" + v2XRoadEventEntity.getDistance() + "米" +
 //                                        "\n是否已经提醒：" + isAlreadyAlert +
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java
index bf22201dba..0511b36ae9 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java
@@ -68,11 +68,9 @@ public class V2XLocationListener implements IMogoLocationListener, CarStatusList
     @Override
     public void onLocationChanged(MogoLocation location) {
         try {
-            Logger.d(V2XConst.MODULE_NAME, "V2X预警--onLocationChanged: " + GsonUtil.jsonFromObject(location));
-
+            //Logger.d(V2XConst.MODULE_NAME, "V2X预警--onLocationChanged: " + GsonUtil.jsonFromObject(location));
             // 刷新角度
             getCurrentCarAngle(location);
-
             // 只有车速大于 5 的时候进行计算
             if (location.getSpeed() >= 5) {
                 refreshCurrentCarState(location);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java
new file mode 100644
index 0000000000..b9f92b387b
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java
@@ -0,0 +1,74 @@
+package com.mogo.module.v2x.listener;
+
+import android.content.Intent;
+
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
+import com.mogo.map.MogoLatLng;
+import com.mogo.map.location.MogoLocation;
+import com.mogo.module.common.entity.MarkerCardResult;
+import com.mogo.module.common.entity.MarkerExploreWay;
+import com.mogo.module.common.entity.MarkerLocation;
+import com.mogo.module.common.entity.V2XMessageEntity;
+import com.mogo.module.common.entity.V2XRoadEventEntity;
+import com.mogo.module.service.Utils;
+import com.mogo.module.v2x.V2XConst;
+import com.mogo.module.v2x.V2XServiceManager;
+import com.mogo.module.v2x.utils.V2XUtils;
+import com.mogo.service.connection.IMogoOnMessageListener;
+import com.mogo.utils.logger.Logger;
+import com.mogo.utils.network.utils.GsonUtil;
+
+import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
+
+/**
+ * author : donghongyu
+ * e-mail : 1358506549@qq.com
+ * date   : 2020/4/1 10:23 AM
+ * desc   : 道路事件服务端下发触发
+ * version: 1.0
+ */
+public class V2XMessageListener_401012 implements IMogoOnMessageListener<MarkerCardResult> {
+
+    @Override
+    public Class<MarkerCardResult> target() {
+        return MarkerCardResult.class;
+    }
+
+    @Override
+    public void onMsgReceived(MarkerCardResult response) {
+        Logger.d(MODULE_NAME, "V2XMessageListener_401012==V2X服务端下发：\n"
+                + GsonUtil.jsonFromObject(response));
+        if (response.getExploreWay() != null && response.getExploreWay().size() > 0) {
+            MarkerExploreWay markerExploreWay = response.getExploreWay().get(0);
+            MarkerLocation markerLocation = markerExploreWay.getLocation();
+            // 记录道路事件
+            V2XRoadEventEntity v2XRoadEventEntity = new V2XRoadEventEntity();
+            v2XRoadEventEntity.setLocation(markerLocation);
+            // 探路目前只有上报拥堵
+            v2XRoadEventEntity.setPoiType(markerExploreWay.getPoiType());
+            // 当前车辆数据
+            MogoLocation currentLocation = V2XServiceManager.getV2XStatusManager().getLocation();
+            float calculateDistance = Utils.calculateLineDistance(
+                    new MogoLatLng(markerLocation.getLat(), markerLocation.getLon()),
+                    new MogoLatLng(currentLocation.getLatitude(), currentLocation.getLongitude())
+            );
+            v2XRoadEventEntity.setDistance(calculateDistance);
+            v2XRoadEventEntity.setNoveltyInfo(markerExploreWay);
+            v2XRoadEventEntity.setExpireTime(20000);
+
+            V2XMessageEntity<V2XRoadEventEntity> v2xMessageEntity = new V2XMessageEntity<>();
+            // 控制类型
+            v2xMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING);
+            // 设置数据
+            v2xMessageEntity.setContent(v2XRoadEventEntity);
+            // 控制展示状态
+            v2xMessageEntity.setShowState(true);
+
+            Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
+            intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2xMessageEntity);
+            LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent);
+        }
+    }
+
+}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
index bcffecdee1..97f648604d 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
@@ -52,7 +52,7 @@ public class V2XScenarioManager implements IV2XScenarioManager {
 
     @Override
     public void handlerMessage(V2XMessageEntity v2XMessageEntity) {
-        Logger.w(MODULE_NAME, "处理V2X场景：" + GsonUtil.jsonFromObject(v2XMessageEntity));
+        Logger.d(MODULE_NAME, "处理V2X场景：" + GsonUtil.jsonFromObject(v2XMessageEntity));
         synchronized (V2XScenarioManager.class) {
             // 展示
             V2XUtils.runOnUiThread(() -> {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java
index 0d8fc7153b..e711b26643 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java
@@ -53,7 +53,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
     @Override
     public void init(V2XMessageEntity<V2XRoadEventEntity> v2XMessageEntity) {
         try {
-            Logger.w(V2XConst.MODULE_NAME, "v2XMessageEntity:" + GsonUtil.jsonFromObject(v2XMessageEntity));
+            Logger.d(V2XConst.MODULE_NAME, "v2XMessageEntity:" + GsonUtil.jsonFromObject(v2XMessageEntity));
 
             V2XRoadEventEntity v2XRoadEventEntity = v2XMessageEntity.getContent();
             if (v2XRoadEventEntity != null) {
@@ -79,14 +79,8 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
     @Override
     public void show() {
         if (mV2XMessageEntity != null && mV2XMessageEntity.getContent() != null) {
-            // 如果道路事件小于50米的时候需要用户反馈
-            if (mV2XMessageEntity.getContent().getDistance() < 50) {
-                // 设置TTS
-                mV2XMessageEntity.getContent().getTtsWithFeedback();
-            } else {
-                // 设置TTS
-                mV2XMessageEntity.getContent().getTts(false);
-            }
+            // 设置TTS
+            mV2XMessageEntity.getContent().getTts(false);
             // 广播给ADAS
             ADASUtils.broadcastToADAS(
                     V2XServiceManager.getContext(),
@@ -96,6 +90,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
                 showWindow();
             }
         }
+        String json = "{\"exploreWay\":[{\"addr\":\"东城区小黄庄北街2号靠近中国银行(北京安贞桥支行)\",\"userInfo\":{\"userName\":\"玉涛1\",\"sn\":\"E841CC2018PZD20143\",\"userHead\":\"http://img.zhidaohulian.com/fileServer/api/prod/user_info/726761827601/914019cfda5ab4b618e7f00e093eda82.jpg\",\"safeLabelType\":0,\"userId\":726761827601},\"cityName\":\"北京市\",\"uploadType\":\"0\",\"type\":\"CARD_TYPE_ROAD_CONDITION\",\"poiType\":\"10015\",\"infoId\":\"56280492\",\"items\":[{\"url\":\"http://petchfile-1255510688.cos.ap-beijing.myqcloud.com/CarPad/com.zhidao.roadcondition/E841CC2018PZD20143/E841CC2018PZD20143_20200722112917/PhotoFront_20200722_112918.JPG?sign\\u003dq-sign-algorithm%3Dsha1%26q-ak%3DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%26q-sign-time%3D1595388896%3B1595396096%26q-key-time%3D1595388896%3B1595396096%26q-header-list%3D%26q-url-param-list%3D%26q-signature%3D2301fa50ff90f5b34f7f7c05a13a15f39abde9eb\",\"illegalCount\":0.0}],\"location\":{\"address\":\"东城区小黄庄北街2号靠近中国银行(北京安贞桥支行)\",\"angle\":0.0,\"lat\":39.968223,\"lon\":116.410857},\"generateTime\":1595388559153,\"distance\":47.0,\"fileType\":0,\"direction\":0,\"canLive\":false}]}";
     }
 
     @Override
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java
index 8723cb1dd9..93e07f7d70 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java
@@ -97,7 +97,7 @@ public class V2XRoadEventWindow extends RelativeLayout
      * 初始化视图
      */
     private void initView(Context context) {
-        Logger.w(MODULE_NAME, "V2X===初始化道路事件小窗口View。。。。。");
+        Logger.d(MODULE_NAME, "V2X===初始化道路事件小窗口View。。。。。");
         // 填充布局
         LayoutInflater.from(context).inflate(R.layout.window_road_event_detail, this);
         // 详情列表

From d9ac5f3a7dff64fcf3c616a073396d98389da560 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Wed, 22 Jul 2020 15:21:44 +0800
Subject: [PATCH 07/17] upgrade tanlu version

---
 .idea/misc.xml    | 2 +-
 gradle.properties | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 21e99e2dc0..cd77a1f062 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
     <groovy codeStyle="LEGACY" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 3c4c014176..860ef10b92 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -60,7 +60,7 @@ MOGO_MODULE_V2X_VERSION=1.2.1.20
 
 ## 工程外部模块
 # 探路
-MOGO_MODULE_TANLU_VERSION=1.3.0.19
+MOGO_MODULE_TANLU_VERSION=1.3.1.1
 # 车聊聊
 CARCHATTING_VERSION=1.4.6
 # 车聊聊接口
@@ -78,7 +78,7 @@ MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.6
 # 广告资源位
 MOGO_MODULE_AD_CARD_VERSION=1.0.1
 # 探路上报和分享模块
-TANLULIB_VERSION=1.3.0.19
+TANLULIB_VERSION=1.3.1.1
 MOGO_MODULE_EVENT_PANEL_VERSION = 1.0.0-SNAPSHOT
 MOGO_MODULE_EVENT_PANEL_NOOP_VERSION = 1.0.0-SNAPSHOT
 #左侧面板模块

From 773e3c3bfe8bc935bfe6f0769b10cdec88a5ecc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Mon, 27 Jul 2020 10:34:50 +0800
Subject: [PATCH 08/17] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/module/common/entity/V2XPoiTypeEnum.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XPoiTypeEnum.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XPoiTypeEnum.java
index 6624758b81..a972ffe0e6 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XPoiTypeEnum.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XPoiTypeEnum.java
@@ -18,14 +18,14 @@ public interface V2XPoiTypeEnum extends MarkerPoiTypeEnum {
     String ALERT_TRAFFIC_LIGHT_WARNING = "99996";
     // 故障车辆
     int ALERT_CAR_TROUBLE_WARNING = 20007;
+    // 疲劳驾驶
+    String ALERT_FATIGUE_DRIVING = "99993";
+    // 违章停车
+    String ALERT_ILLEGAL_PARK = "99992";
 
     // TODO 这里目前是演示DEMO会用到，想着是打算商用，先这么处理的
     // 取快递
     String ALERT_TRAFFIC_EXPRESS = "99995";
     // 顺风车
     String ALERT_TRAFFIC_TAXI = "99994";
-    // 疲劳驾驶
-    String ALERT_FATIGUE_DRIVING = "99993";
-    // 违章停车
-    String ALERT_ILLEGAL_PARK = "99992";
 }

From a6399aa4a6274d41b703c7ba7bbf3c145444ec4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Mon, 27 Jul 2020 11:09:43 +0800
Subject: [PATCH 09/17] =?UTF-8?q?=E4=BC=98=E5=8C=96ADAS=E7=9A=84tts?=
 =?UTF-8?q?=E6=92=AD=E6=8A=A5=EF=BC=8C=E4=BB=A5=E5=8F=8A=E9=81=93=E8=B7=AF?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8B=E5=8F=91=E7=9A=84=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/module/v2x/alarm/V2XAlarmServer.java |  3 +-
 .../listener/V2XMessageListener_401012.java   | 63 +++++++++++--------
 .../scene/park/V2XIllegalParkScenario.java    | 16 +++--
 3 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java
index ffc2ec230b..2fdd7b412f 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java
@@ -35,6 +35,7 @@ import com.mogo.utils.network.utils.GsonUtil;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
@@ -51,7 +52,7 @@ import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
  */
 public class V2XAlarmServer {
     // 记录道路播报的事件
-    private static HashMap<V2XRoadEventEntity, String> mAlertRoadEventList = new HashMap<>();
+    public static ConcurrentHashMap<V2XRoadEventEntity, String> mAlertRoadEventList = new ConcurrentHashMap<>();
 
     // 记录违章停车播报事件
     private static HashMap<MarkerExploreWay, String> mAlertIllegalParkEventList = new HashMap<>();
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java
index b9f92b387b..38b9fab0a3 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java
@@ -14,6 +14,8 @@ import com.mogo.module.common.entity.V2XRoadEventEntity;
 import com.mogo.module.service.Utils;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
+import com.mogo.module.v2x.alarm.V2XAlarmServer;
+import com.mogo.module.v2x.utils.TimeUtils;
 import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.service.connection.IMogoOnMessageListener;
 import com.mogo.utils.logger.Logger;
@@ -39,35 +41,42 @@ public class V2XMessageListener_401012 implements IMogoOnMessageListener<MarkerC
     public void onMsgReceived(MarkerCardResult response) {
         Logger.d(MODULE_NAME, "V2XMessageListener_401012==V2X服务端下发：\n"
                 + GsonUtil.jsonFromObject(response));
-        if (response.getExploreWay() != null && response.getExploreWay().size() > 0) {
-            MarkerExploreWay markerExploreWay = response.getExploreWay().get(0);
-            MarkerLocation markerLocation = markerExploreWay.getLocation();
-            // 记录道路事件
-            V2XRoadEventEntity v2XRoadEventEntity = new V2XRoadEventEntity();
-            v2XRoadEventEntity.setLocation(markerLocation);
-            // 探路目前只有上报拥堵
-            v2XRoadEventEntity.setPoiType(markerExploreWay.getPoiType());
-            // 当前车辆数据
-            MogoLocation currentLocation = V2XServiceManager.getV2XStatusManager().getLocation();
-            float calculateDistance = Utils.calculateLineDistance(
-                    new MogoLatLng(markerLocation.getLat(), markerLocation.getLon()),
-                    new MogoLatLng(currentLocation.getLatitude(), currentLocation.getLongitude())
-            );
-            v2XRoadEventEntity.setDistance(calculateDistance);
-            v2XRoadEventEntity.setNoveltyInfo(markerExploreWay);
-            v2XRoadEventEntity.setExpireTime(20000);
+        try {
+            if (response.getExploreWay() != null && response.getExploreWay().size() > 0) {
+                MarkerExploreWay markerExploreWay = response.getExploreWay().get(0);
+                MarkerLocation markerLocation = markerExploreWay.getLocation();
+                // 记录道路事件
+                V2XRoadEventEntity v2XRoadEventEntity = new V2XRoadEventEntity();
+                v2XRoadEventEntity.setLocation(markerLocation);
+                // 探路目前只有上报拥堵
+                v2XRoadEventEntity.setPoiType(markerExploreWay.getPoiType());
+                // 当前车辆数据
+                MogoLocation currentLocation = V2XServiceManager.getV2XStatusManager().getLocation();
+                float calculateDistance = Utils.calculateLineDistance(
+                        new MogoLatLng(markerLocation.getLat(), markerLocation.getLon()),
+                        new MogoLatLng(currentLocation.getLatitude(), currentLocation.getLongitude())
+                );
+                v2XRoadEventEntity.setDistance(calculateDistance);
+                v2XRoadEventEntity.setNoveltyInfo(markerExploreWay);
+                v2XRoadEventEntity.setExpireTime(20000);
 
-            V2XMessageEntity<V2XRoadEventEntity> v2xMessageEntity = new V2XMessageEntity<>();
-            // 控制类型
-            v2xMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING);
-            // 设置数据
-            v2xMessageEntity.setContent(v2XRoadEventEntity);
-            // 控制展示状态
-            v2xMessageEntity.setShowState(true);
+                // 记录播报过的道路事件
+                V2XAlarmServer.mAlertRoadEventList.put(v2XRoadEventEntity, TimeUtils.getNowString());
 
-            Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
-            intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2xMessageEntity);
-            LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent);
+                V2XMessageEntity<V2XRoadEventEntity> v2xMessageEntity = new V2XMessageEntity<>();
+                // 控制类型
+                v2xMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING);
+                // 设置数据
+                v2xMessageEntity.setContent(v2XRoadEventEntity);
+                // 控制展示状态
+                v2xMessageEntity.setShowState(true);
+
+                Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
+                intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2xMessageEntity);
+                LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkScenario.java
index 9bd5603dbe..2e9c1b008b 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkScenario.java
@@ -3,12 +3,14 @@ package com.mogo.module.v2x.scenario.scene.park;
 import androidx.annotation.Nullable;
 
 import com.mogo.module.common.entity.MarkerExploreWay;
+import com.mogo.module.common.entity.V2XMessageEntity;
+import com.mogo.module.common.entity.V2XPoiTypeEnum;
+import com.mogo.module.common.entity.V2XRoadEventEntity;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.V2XStatusManager;
 import com.mogo.module.v2x.alarm.V2XAlarmServer;
-import com.mogo.module.common.entity.V2XMessageEntity;
-import com.mogo.module.common.entity.V2XPoiTypeEnum;
 import com.mogo.module.v2x.scenario.impl.AbsV2XScenario;
+import com.mogo.module.v2x.utils.ADASUtils;
 import com.mogo.module.v2x.utils.TrackUtils;
 
 import java.util.ArrayList;
@@ -67,14 +69,20 @@ public class V2XIllegalParkScenario extends AbsV2XScenario<List<MarkerExploreWay
             //弹框
             // 设置要展开的违章停车事件
             //((V2XIllegalParkMarker) mV2XMarker).setOpenPoiId(markerExploreWay.getInfoId());
+            // 广播给ADAS
+            V2XRoadEventEntity v2XRoadEventEntity = new V2XRoadEventEntity();
+            v2XRoadEventEntity.setAlarmContent("违章停车");
+            v2XRoadEventEntity.setExpireTime(20000);
+            v2XRoadEventEntity.setPoiType(V2XPoiTypeEnum.ALERT_ILLEGAL_PARK);
             if (V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) {
-                speakTTSVoice(markerExploreWay.getAddr() + "可能被罚违章停车，您可以说，有用或没用来帮助其它车友。", null);
+                v2XRoadEventEntity.setTts(markerExploreWay.getAddr() + "可能被罚违章停车，您可以说，有用或没用来帮助其它车友。");
                 ((V2XIllegalParkWindow) mV2XWindow).show(markerExploreWay, true);
                 TrackUtils.trackV2xRoadShow(markerExploreWay.getInfoId(), V2XPoiTypeEnum.ALERT_ILLEGAL_PARK, "1");
             } else {
-                speakTTSVoice(markerExploreWay.getAddr() + "可能被罚违章停车", null);
+                v2XRoadEventEntity.setTts(markerExploreWay.getAddr() + "可能被罚违章停车");
                 TrackUtils.trackV2xRoadShow(markerExploreWay.getInfoId(), V2XPoiTypeEnum.ALERT_ILLEGAL_PARK, "2");
             }
+            ADASUtils.broadcastToADAS(V2XServiceManager.getContext(), v2XRoadEventEntity);
         }
     }
 

From c03943a72f1cabbba284992adc6b6e8ae02eede8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Mon, 27 Jul 2020 14:22:35 +0800
Subject: [PATCH 10/17] =?UTF-8?q?=E5=85=B3=E9=97=AD=E4=BA=86V2X=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/module/v2x/V2XModuleProvider.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java
index 05fa325662..5188f2398a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java
@@ -140,12 +140,12 @@ public class V2XModuleProvider implements
         intentFilter.addAction(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
         localBroadcastManager.registerReceiver(localReceiver, intentFilter);
 
-        if (BuildConfig.DEBUG) {
-            // TODO 这是测试页面
-            V2XServiceManager
-                    .getIMogoWindowManager()
-                    .addView(new V2XTestConsoleWindow(context), 0, 0, false);
-        }
+//        if (BuildConfig.DEBUG) {
+//            // TODO 这是测试页面
+//            V2XServiceManager
+//                    .getIMogoWindowManager()
+//                    .addView(new V2XTestConsoleWindow(context), 0, 0, false);
+//        }
     }
 
     private void initVoice(Context context) {

From e56b33d5fedb29eed65b9a4635e3ba1396ad529c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Mon, 27 Jul 2020 14:36:03 +0800
Subject: [PATCH 11/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=20versionCode=3D80007=20versionName=3D8.0.7-?=
 =?UTF-8?q?qa=5F1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 482db1913b..0e84a4cd04 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -103,5 +103,5 @@ MOGO_MODULE_SPLASH_NOOP_VERSION = 1.0.0-SNAPSHOT
 ## 产品库必备配置
 applicationId=com.mogo.launcer
 applicationName=IntelligentPilot
-versionCode=80006
-versionName=8.0.6
\ No newline at end of file
+versionCode=80007
+versionName=8.0.7-qa_1.1
\ No newline at end of file

From 839eab0eaf264d7d6dcf376c18851b7adec23d59 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Tue, 28 Jul 2020 20:44:17 +0800
Subject: [PATCH 12/17] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E4=B8=AD=E6=97=A0=E6=B3=95=E6=AD=A3=E7=A1=AE=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E8=BD=A6=E5=A4=B4=E5=92=8C=E6=AD=A3=E5=8C=97=E6=A0=87=E8=AF=86?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=202.=20v2x=20=E7=96=B2=E5=8A=B3?=
 =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E5=9C=BA=E6=99=AF=E6=97=A0=E6=B3=95=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/map/impl/amap/AMapNaviViewWrapper.java   |  1 +
 .../extensions/entrance/EntranceFragment.java     | 15 ++++++++++++---
 .../scene/fatigue/V2XFatigueDrivingWindow.java    |  1 -
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
index b02cbfaee4..aef3a1b430 100644
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
@@ -321,6 +321,7 @@ public class AMapNaviViewWrapper implements IMogoMapView,
     @Override
     public void onNaviMapMode( int mode ) {
         Logger.i( TAG, "mode=" + mode );
+        MogoMapListenerHandler.getInstance().onMapModeChanged( mode == 0 ? EnumMapUI.CarUp_2D : EnumMapUI.NorthUP_2D );
     }
 
     @Override
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index 203580640d..6246462783 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -239,9 +239,9 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
             } else {
                 mMApUIController.changeMapMode(EnumMapUI.NorthUP_2D);
             }
-            mCameraMode.setSelected(!mCameraMode.isSelected());
-            mCameraMode.setText(getString(mCameraMode.isSelected() ? R.string.mode_car_up :
-                    R.string.mode_north_up));
+//            mCameraMode.setSelected(!mCameraMode.isSelected());
+//            mCameraMode.setText(getString(mCameraMode.isSelected() ? R.string.mode_car_up :
+//                    R.string.mode_north_up));
         });
 
 
@@ -585,4 +585,13 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
             });
         });
     }
+
+    @Override
+    public void onMapModeChanged( EnumMapUI ui ) {
+        if ( mCameraMode == null ) {
+            return;
+        }
+        mCameraMode.setSelected(ui == EnumMapUI.NorthUP_2D);
+        mCameraMode.setText(getString(ui == EnumMapUI.NorthUP_2D ? R.string.mode_car_up : R.string.mode_north_up));
+    }
 }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java
index b4249e3355..56d0adf348 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java
@@ -157,7 +157,6 @@ public class V2XFatigueDrivingWindow extends RelativeLayout
 
     @Override
     public void onCalculateSuccess() {
-        V2XServiceManager.getMogoRegisterCenter().unregisterMogoNaviListener( "test");
         V2XServiceManager.getNavi().startNavi(true);
     }
 

From f3e726d77e32f8ad388db061c515a66e292863c0 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Wed, 29 Jul 2020 10:18:53 +0800
Subject: [PATCH 13/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=AF=94=E4=BA=9A?=
 =?UTF-8?q?=E8=BF=AA=E5=9F=8B=E7=82=B9fota=E5=8F=82=E6=95=B0=EF=BC=9A?=
 =?UTF-8?q?=E7=94=A8productFlavor=E4=BB=A3=E6=9B=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mogo/commons/network/ParamsUtil.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java
index 4eb76d1be3..b6645fa28c 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java
@@ -30,7 +30,7 @@ public class ParamsUtil {
     public static Map< String, Object > getDynamicParams() {
         Map< String, Object > params = new ArrayMap();
 
-        final Map<String,Object> location = LocationHelper.getInstance().getLocationProperties();
+        final Map< String, Object > location = LocationHelper.getInstance().getLocationProperties();
         if ( location != null ) {
             params.putAll( location );
         }
@@ -71,7 +71,8 @@ public class ParamsUtil {
     public static Map< String, Object > getAnalyticsCustomParams() {
         Map< String, Object > map = new ArrayMap<>();
         map.put( "debug", DebugConfig.isDebug() ? 1 : 0 );
-        map.put( "systemversion", Utils.getFotaVersion() );
+        String fota = Utils.getFotaVersion();
+        map.put( "systemversion", TextUtils.isEmpty( fota ) ? DebugConfig.getProductFlavor() : fota );
         map.put( "sn", Utils.getSn() );
         return map;
     }

From bb7aeaaa2d4e3ed54774404f6c39e66eab00c705 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Wed, 29 Jul 2020 10:45:08 +0800
Subject: [PATCH 14/17] bugfix: UI-881

---
 .../java/com/mogo/module/service/MarkerServiceHandler.java | 7 ++-----
 .../com/mogo/module/service/marker/MapMarkerManager.java   | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java
index cb7fa6a938..caaf67dd12 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java
@@ -63,8 +63,6 @@ public class MarkerServiceHandler {
     private static ICarsChattingProvider sCarChatting;
     private static IMogoGpsSimulatorManager sGpsSimulatorManager;
 
-    private static MapMarkerManager sMapMarkerManager;
-
     public static synchronized void init( final Context context ) {
 
         if ( sGpsSimulatorManager != null ) {
@@ -92,8 +90,7 @@ public class MarkerServiceHandler {
 
         sCarChatting = ( ICarsChattingProvider ) ARouter.getInstance().build( CallChattingProviderConstant.CAR_CALL_PROVIDER ).navigation( context );
 
-        sMapMarkerManager = MapMarkerManager.getInstance();
-        sMapMarkerManager.init( context );
+        MapMarkerManager.getInstance().init( context );
 
         sGpsSimulatorManager = ARouter.getInstance().navigation( IMogoGpsSimulatorManager.class );
     }
@@ -143,7 +140,7 @@ public class MarkerServiceHandler {
     }
 
     public static MapMarkerManager getMapMarkerManager() {
-        return sMapMarkerManager;
+        return MapMarkerManager.getInstance();
     }
 
     public static IMogoRegisterCenter getRegisterCenter() {
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
index f641febd03..6c2493af4a 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
@@ -77,6 +77,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
     private Rect mMarkerDisplayBounds;
 
     private MapMarkerManager() {
+        mContext = AbsMogoApplication.getApp();
     }
 
     public static synchronized MapMarkerManager getInstance() {
@@ -95,7 +96,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
      * @param context
      */
     public void init( Context context ) {
-        mContext = context;
         mRefreshModel = new RefreshModel( mContext );
 
         // 长连接

From ac024ffd37edfa855328286b3f6ba543e122651f Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Wed, 29 Jul 2020 10:59:23 +0800
Subject: [PATCH 15/17] bug fix: UI-2.0/UI-882 not attached to a context

---
 .../extensions/entrance/EntranceFragment.java | 44 +++++++++++--------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index 203580640d..68e4ae59a9 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -168,15 +168,18 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         mDisplayOverviewText = findViewById(R.id.module_ext_id_display_overview_text);
         mDisplayOverviewIcon = findViewById(R.id.module_ext_id_display_overview_icon);
         mDisplayOverview.setOnClickListener(view -> {
-            if (!mStatusManager.isDisplayOverview()) {
-                mMApUIController.displayOverview(mDisplayOverviewBounds);
-                UiThreadHandler.removeCallbacks(mLockCarRunnable);
-                UiThreadHandler.postDelayed(mLockCarRunnable, 20_000);
-            } else {
-                mMApUIController.recoverLockMode();
-                UiThreadHandler.removeCallbacks(mLockCarRunnable);
+            if(getContext()!=null) {
+                // 加此判断是解决下面setDisplayOverview后，本Fragment回调中出现not attached to a context问题
+                if (!mStatusManager.isDisplayOverview()) {
+                    mMApUIController.displayOverview(mDisplayOverviewBounds);
+                    UiThreadHandler.removeCallbacks(mLockCarRunnable);
+                    UiThreadHandler.postDelayed(mLockCarRunnable, 20_000);
+                } else {
+                    mMApUIController.recoverLockMode();
+                    UiThreadHandler.removeCallbacks(mLockCarRunnable);
+                }
+                mStatusManager.setDisplayOverview(TAG, !mStatusManager.isDisplayOverview());
             }
-            mStatusManager.setDisplayOverview(TAG, !mStatusManager.isDisplayOverview());
         });
 
         mMove2CurrentLocation = findViewById(R.id.module_entrance_id_move2_current_location);
@@ -460,19 +463,22 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
             if (!mMogoNavi.isNaviing()) {
                 return;
             }
-            if (isTrue) {
-                mDisplayOverviewText.setText("退出全览");
-                mDisplayOverviewText.setTextSize(TypedValue.COMPLEX_UNIT_PX,
-                        getResources().getDimensionPixelSize(R.dimen.module_ext_display_overview_textSize));
-                mCameraMode.setVisibility(View.GONE);
-            } else {
-                mDisplayOverviewText.setText("全览");
-                mDisplayOverviewText.setTextSize(TypedValue.COMPLEX_UNIT_PX,
-                        getResources().getDimensionPixelSize(R.dimen.module_ext_display_overview_textSize_large));
-                if (CustomNaviInterrupter.getInstance().interrupt()) {
+            if(getContext()!=null) {
+                // 加此判断是为了规避not attached to a context问题
+                if (isTrue) {
+                    mDisplayOverviewText.setText("退出全览");
+                    mDisplayOverviewText.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+                            getContext().getResources().getDimensionPixelSize(R.dimen.module_ext_display_overview_textSize));
                     mCameraMode.setVisibility(View.GONE);
                 } else {
-                    mCameraMode.setVisibility(View.VISIBLE);
+                    mDisplayOverviewText.setText("全览");
+                    mDisplayOverviewText.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+                            getContext().getResources().getDimensionPixelSize(R.dimen.module_ext_display_overview_textSize_large));
+                    if (CustomNaviInterrupter.getInstance().interrupt()) {
+                        mCameraMode.setVisibility(View.GONE);
+                    } else {
+                        mCameraMode.setVisibility(View.VISIBLE);
+                    }
                 }
             }
         } else if (descriptor == StatusDescriptor.ACC_STATUS) {

From b4db94488935b4601ed47f625cea67467fe43e11 Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Wed, 29 Jul 2020 11:03:47 +0800
Subject: [PATCH 16/17] bug fix: UI-2.0/UI-883 tvCountDown must not be null

---
 .../module/splash/fragment/BydSplashFragment.kt    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.kt b/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.kt
index bcd4301496..1148d63378 100644
--- a/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.kt
+++ b/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.kt
@@ -34,12 +34,14 @@ class BydSplashFragment :MvpFragment<BydSplashFragment,BydSplashPresenter>(),Han
 
     override fun handleMessage(msg: Message): Boolean {
         if (msg.what == MSG_COUNT_DOWN) {
-            countDownTime--
-            if(countDownTime>0) {
-                tvCountDown.text = countDownTime.toString()
-                handler.sendEmptyMessageDelayed(MSG_COUNT_DOWN, DEFAULT_COUNT_DOWN_DELAY)
-            }else{
-                hideSplash()
+            tvCountDown?.also {
+                countDownTime--
+                if(countDownTime>0) {
+                    it.text = countDownTime.toString()
+                    handler.sendEmptyMessageDelayed(MSG_COUNT_DOWN, DEFAULT_COUNT_DOWN_DELAY)
+                }else{
+                    hideSplash()
+                }
             }
             return true
         }

From 259773d236b2e50cd760f536969745ae1d0b0ddb Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Wed, 29 Jul 2020 11:24:12 +0800
Subject: [PATCH 17/17] opt

---
 modules/mogo-module-extensions/build.gradle   |  1 -
 .../extensions/entrance/EntranceFragment.java | 39 +++++++------------
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/modules/mogo-module-extensions/build.gradle b/modules/mogo-module-extensions/build.gradle
index 56876478a7..e9737fc1a3 100644
--- a/modules/mogo-module-extensions/build.gradle
+++ b/modules/mogo-module-extensions/build.gradle
@@ -43,7 +43,6 @@ dependencies {
     annotationProcessor rootProject.ext.dependencies.aroutercompiler
     implementation rootProject.ext.dependencies.rxjava
     implementation rootProject.ext.dependencies.rxandroid
-    implementation rootProject.ext.dependencies.tanluupload
 
     if (Boolean.valueOf(RELEASE)) {
         api rootProject.ext.dependencies.mogomap
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index 68e4ae59a9..93f7e5fc2c 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -3,13 +3,11 @@ package com.mogo.module.extensions.entrance;
 import android.content.Intent;
 import android.graphics.Rect;
 import android.os.Bundle;
-import android.util.Log;
 import android.text.TextUtils;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -18,6 +16,7 @@ import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.mvp.MvpFragment;
 import com.mogo.map.listener.IMogoMapListener;
@@ -58,7 +57,6 @@ import com.mogo.utils.ResourcesHelper;
 import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.glide.GlideApp;
 import com.mogo.utils.logger.Logger;
-import com.zhidao.roadcondition.service.DelayService;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -168,7 +166,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         mDisplayOverviewText = findViewById(R.id.module_ext_id_display_overview_text);
         mDisplayOverviewIcon = findViewById(R.id.module_ext_id_display_overview_icon);
         mDisplayOverview.setOnClickListener(view -> {
-            if(getContext()!=null) {
+            if (getContext() != null) {
                 // 加此判断是解决下面setDisplayOverview后，本Fragment回调中出现not attached to a context问题
                 if (!mStatusManager.isDisplayOverview()) {
                     mMApUIController.displayOverview(mDisplayOverviewBounds);
@@ -463,29 +461,21 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
             if (!mMogoNavi.isNaviing()) {
                 return;
             }
-            if(getContext()!=null) {
-                // 加此判断是为了规避not attached to a context问题
-                if (isTrue) {
-                    mDisplayOverviewText.setText("退出全览");
-                    mDisplayOverviewText.setTextSize(TypedValue.COMPLEX_UNIT_PX,
-                            getContext().getResources().getDimensionPixelSize(R.dimen.module_ext_display_overview_textSize));
+            if (isTrue) {
+                mDisplayOverviewText.setText("退出全览");
+                mDisplayOverviewText.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+                        AbsMogoApplication.getApp().getResources().getDimensionPixelSize(R.dimen.module_ext_display_overview_textSize));
+                mCameraMode.setVisibility(View.GONE);
+            } else {
+                mDisplayOverviewText.setText("全览");
+                mDisplayOverviewText.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+                        AbsMogoApplication.getApp().getResources().getDimensionPixelSize(R.dimen.module_ext_display_overview_textSize_large));
+                if (CustomNaviInterrupter.getInstance().interrupt()) {
                     mCameraMode.setVisibility(View.GONE);
                 } else {
-                    mDisplayOverviewText.setText("全览");
-                    mDisplayOverviewText.setTextSize(TypedValue.COMPLEX_UNIT_PX,
-                            getContext().getResources().getDimensionPixelSize(R.dimen.module_ext_display_overview_textSize_large));
-                    if (CustomNaviInterrupter.getInstance().interrupt()) {
-                        mCameraMode.setVisibility(View.GONE);
-                    } else {
-                        mCameraMode.setVisibility(View.VISIBLE);
-                    }
+                    mCameraMode.setVisibility(View.VISIBLE);
                 }
             }
-        } else if (descriptor == StatusDescriptor.ACC_STATUS) {
-            Log.d(TAG, " onStatusChanged  isTrue = " + isTrue);
-            if (isTrue) {
-                DelayService.Companion.launchService(getContext());
-            }
         }
     }
 
@@ -521,8 +511,9 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         }
     }
 
-    private int[] heights = new int[]{100,200,300};
+    private int[] heights = new int[]{100, 200, 300};
     private int currentHeight;
+
     private void debugTopView() {
         findViewById(R.id.btnDebugCtrlNaviView).setOnClickListener(view -> {
             if (!toggle) {