From 8220fd50ed1bb12905ef032ff005ffcc4b7208ce Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Fri, 14 Aug 2020 10:20:37 +0800
Subject: [PATCH 01/36] UI

---
 .../v2x/adapter/V2XShareEventAdapter.java     | 12 +++-
 .../v2x/fragment/V2XShareEventsFragment.java  |  6 +-
 .../module/v2x/listener/AdapterCallback.java  |  2 +-
 .../layout/module_v2x_event_share_empty.xml   | 63 +++++++++++++------
 4 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
index 2750ecd74a..686d49e351 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
@@ -207,7 +207,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
     }
 
     /*
-     * 去分享
+     * 去分享  刷新
      * */
     class shareEmptyViewHolder extends RecyclerView.ViewHolder {
         public shareEmptyViewHolder(@NonNull View itemView) {
@@ -218,6 +218,14 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
                 V2XEventPanelFragment.Companion.getInstance().hidePanel();
                 mApis.getShareManager().showShareDialog();
             });
+
+            Button refresh = itemView.findViewById(R.id.refresh_button);
+            refresh.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    callback.loadMoreShareEventList(false);
+                }
+            });
         }
     }
 
@@ -234,7 +242,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
 
                 @Override
                 public void onClick(View v) {
-                    callback.loadMoreShareEventList();
+                    callback.loadMoreShareEventList(true);
                 }
             });
         }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
index 602c82acf5..eee06e5379 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
@@ -170,10 +170,12 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
     }
 
     @Override
-    public void loadMoreShareEventList() {
+    public void loadMoreShareEventList(boolean moreOnePage) {
         Log.d(TAG, "page--" + pageNum);
         animatioonAcction(View.VISIBLE);
-        pageNum += 1;
+        if (moreOnePage  == true){
+            pageNum += 1;
+        }
         v2XShareNetworkModel.getShareEventList(pageNum, 10, new V2XRefreshCallback() {
             @Override
             public void onSuccess(Object result) {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/AdapterCallback.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/AdapterCallback.java
index ced68b8aae..7a7e6d3d7a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/AdapterCallback.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/AdapterCallback.java
@@ -5,5 +5,5 @@ package com.mogo.module.v2x.listener;
  */
 public interface AdapterCallback {
     //分享列表加载更多
-    void loadMoreShareEventList();
+    void loadMoreShareEventList(boolean moreOnePage);
 }
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
index 9ab5722748..f0e63ae0ca 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
@@ -2,8 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:gravity="center">
+    android:gravity="center"
+    android:orientation="vertical">
 
     <ImageView
         android:id="@+id/no_share_image"
@@ -14,29 +14,52 @@
 
     <TextView
         android:id="@+id/share_event_null_des"
-        android:layout_below="@+id/no_share_image"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_below="@+id/no_share_image"
         android:layout_centerHorizontal="true"
-        android:gravity="bottom"
-        android:alpha="0.7"
         android:layout_marginTop="12.6px"
-        android:textSize="18px"
+        android:alpha="0.7"
+        android:gravity="bottom"
         android:text="你还没有分享过道路事件，快去试试吧"
-        android:textColor="#FFFFFF" />
-
-    <Button
-        android:id="@+id/share_event_button"
-        android:layout_width="150px"
-        android:layout_height="48px"
-        android:layout_below="@+id/share_event_null_des"
-        android:layout_centerHorizontal="true"
-        android:background="@drawable/bg_v2x_event_live_show"
-        android:clickable="true"
-        android:onClick="shareEventAction"
-        android:layout_marginTop="21px"
-        android:text="去分享"
         android:textColor="#FFFFFF"
-        android:textSize="25sp" />
+        android:textSize="18px" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="33px">
+
+        <Button
+            android:id="@+id/share_event_button"
+            android:layout_width="150px"
+            android:layout_height="48px"
+            android:layout_centerHorizontal="true"
+            android:layout_toLeftOf="@id/center"
+            android:background="@drawable/v2xt_dw_common_corner_bkg_dark"
+            android:clickable="true"
+            android:onClick="shareEventAction"
+            android:text="去分享"
+            android:textColor="#FFFFFF"
+            android:textSize="18px" />
+
+        <View
+            android:id="@+id/center"
+            android:layout_width="29px"
+            android:layout_height="29px"
+            android:layout_centerInParent="true" />
+
+        <Button
+            android:id="@+id/refresh_button"
+            android:layout_width="150px"
+            android:layout_height="48px"
+            android:layout_toRightOf="@id/center"
+            android:background="@drawable/v2xt_dw_common_corner_bkg_light"
+            android:text="刷新"
+            android:textColor="#FFFFFF"
+            android:textSize="18px" />
+
+    </RelativeLayout>
+
 
 </LinearLayout>
\ No newline at end of file

From 58e1506f8f5984185059e7ce048cc7d50c8a3621 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Fri, 14 Aug 2020 11:01:01 +0800
Subject: [PATCH 02/36] =?UTF-8?q?=E4=BC=98=E5=8C=96=20app=20=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=20build.gradle=20=E6=96=87=E4=BB=B6=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=8A=E9=87=8D=E6=96=B0=E6=95=B4=E7=90=86=E5=88=86?=
 =?UTF-8?q?=E7=BB=84=E6=96=B9=E5=BC=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle   | 133 +++++----------------------------------------
 app/regroup.gradle |  45 +++++++++++++++
 2 files changed, 59 insertions(+), 119 deletions(-)
 create mode 100644 app/regroup.gradle

diff --git a/app/build.gradle b/app/build.gradle
index 3a3707d12e..9fa3526b19 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,11 +2,9 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.alibaba.arouter'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
-import java.text.SimpleDateFormat
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
-    // buildToolsVersion rootProject.ext.android.buildToolsVersion
     defaultConfig {
         minSdkVersion rootProject.ext.android.minSdkVersion
         targetSdkVersion rootProject.ext.android.targetSdkVersion
@@ -66,13 +64,13 @@ android {
         independent {
             manifest.srcFile 'src/independent/AndroidManifest.xml'
         }
-        e8xx{
+        e8xx {
             manifest.srcFile 'src/e8xx/AndroidManifest.xml'
         }
         em4 {
             manifest.srcFile 'src/em4/AndroidManifest.xml'
         }
-        f8xxLauncherOnlineRelease{
+        f8xxLauncherOnlineRelease {
             manifest.srcFile 'src/f8xxLauncherOnlineRelease/AndroidManifest.xml'
         }
     }
@@ -81,7 +79,7 @@ android {
 
     productFlavors {
         //独立app
-        independent{
+        independent {
             dimension "basic"
             // 是否启动位置服务
             buildConfigField 'boolean', 'LAUNCH_LOCATION_SERVICE', 'false'
@@ -90,7 +88,7 @@ android {
             buildConfigField 'String', 'SOCKET_APP_ID', '\"com.mogo.launcher\"'
         }
         // launcher app
-        launcher{
+        launcher {
             dimension "basic"
             // 是否启动位置服务
             buildConfigField 'boolean', 'LAUNCH_LOCATION_SERVICE', 'true'
@@ -99,11 +97,11 @@ android {
             buildConfigField 'String', 'SOCKET_APP_ID', '\"com.mogo.launcher\"'
         }
         // f系列-分体机全系列，未细分
-        f8xx{
+        f8xx {
             applicationId rootProject.ext.android.fLauncherApplicationId
             dimension "product"
             // 使用思必驰语音
-            buildConfigField 'int', 'AIType','2'
+            buildConfigField 'int', 'AIType', '2'
             buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
             // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
             buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
@@ -117,7 +115,7 @@ android {
             applicationId rootProject.ext.android.launcherApplicationId
             dimension "product"
             // 使用思必驰语音
-            buildConfigField 'int', 'AIType','2'
+            buildConfigField 'int', 'AIType', '2'
             buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true'
             // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
             buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
@@ -131,7 +129,7 @@ android {
             applicationId rootProject.ext.android.launcherApplicationId
             dimension "product"
             // 使用思必驰语音
-            buildConfigField 'int', 'AIType','2'
+            buildConfigField 'int', 'AIType', '2'
             buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true'
             // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
             buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
@@ -173,7 +171,7 @@ android {
             applicationId rootProject.ext.android.independentApplicationId
             dimension "product"
             // 使用同行者语音
-            buildConfigField 'int', 'AIType','1'
+            buildConfigField 'int', 'AIType', '1'
             buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true'
             // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
             buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
@@ -183,11 +181,11 @@ android {
             buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
         }
         // d系列 1+16 版本
-        d82x{
+        d82x {
             applicationId rootProject.ext.android.independentApplicationId
             dimension "product"
             // 使用同行者语音
-            buildConfigField 'int', 'AIType','1'
+            buildConfigField 'int', 'AIType', '1'
             buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true'
             // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
             buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
@@ -197,11 +195,11 @@ android {
             buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
         }
         // 比亚迪
-        bydauto{
+        bydauto {
             applicationId rootProject.ext.android.bydautoIndependentApplicationId
             dimension "product"
             // 不使用语音
-            buildConfigField 'int', 'AIType','0'
+            buildConfigField 'int', 'AIType', '0'
             buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
             // 车机类型，主要用于区分自研车机还是别人家的车机，其他车机，比亚迪定为1
             buildConfigField 'int', 'CAR_MACHINE_TYPE', '1'
@@ -229,42 +227,6 @@ android {
     }
 }
 
-def generateVersionCode() {
-    String vn = rootProject.ext.android.versionName
-    String[] versions = vn.split("\\.")
-    if (versions.length == 3) {
-        int num1 = Integer.valueOf(versions[0])
-        int num2 = Integer.valueOf(versions[1])
-        int num3 = Integer.valueOf(versions[2])
-        if (num1 < 1 || num1 > 99){
-            throw new GradleException("版本号必须定义为 x.y.z，x[1,99], y[0, 99], z[0, 99])")
-        }
-        if (num2 < 0 || num2 > 99){
-            throw new GradleException("版本号必须定义为 x.y.z，x[1,99], y[0, 99], z[0, 99])")
-        }
-        if (num3 < 0 || num3 > 99){
-            throw new GradleException("版本号必须定义为 x.y.z，x[1,99], y[0, 99], z[0, 99])")
-        }
-        StringBuilder builder = new StringBuilder()
-        builder.append(num1)
-        if( num2 > 9 ){
-            builder.append(num2)
-        } else {
-            builder.append("0").append(num2)
-        }
-        if( num3 > 9 ){
-            builder.append(num3)
-        } else {
-            builder.append("0").append(num3)
-        }
-        println("last versionCode ${builder}")
-        return Integer.valueOf(builder.toString())
-    } else {
-        throw new GradleException("版本号必须定义为 x.y.z，x[1,99], y[0, 99], z[0, 99])")
-    }
-
-}
-
 repositories {
     flatDir {
         dirs 'libs'
@@ -332,13 +294,6 @@ dependencies {
     apply from: "./functions/leftpanel.gradle"
 }
 
-//android.applicationVariants.all { variant ->
-//    variant.outputs.all { //这里修改apk文件名
-//        outputFileName = "Launcher2.0_V${android.defaultConfig.versionName}_${getCurrentDate()}_${variant.name}_${getGitCommit()}.apk"
-//        println outputFileName
-//    }
-//}
-
 android.applicationVariants.all { variant ->
     def buildTime = new Date().format("yyyyMMdd", TimeZone.getTimeZone("GMT+08:00"))
     def flavor = variant.productFlavors.collect { it.name }.join('-')
@@ -354,64 +309,4 @@ android.applicationVariants.all { variant ->
     }
 }
 
-
-def getMonthAndDay() {
-
-    SimpleDateFormat sdf = new SimpleDateFormat("MMddHH")
-    return sdf.format(new Date())
-}
-
-def getCurrentDate() {
-    SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss")
-    return sdf.format(new Date())
-}
-
-def getGitCommit() {
-    def gitDir = new File("${new File("${rootDir}")}/.git")
-    if (!gitDir.isDirectory()) {
-        return 'non_git_build'
-    }
-
-    def cmd = 'git log --pretty=format:%h -1'
-    def gitCommit = cmd.execute().text.trim()
-
-    print gitCommit
-
-    def cmd2 = 'git status -s'
-    def gitStatus = cmd2.execute().text.trim()
-
-    println '---------'
-
-    print gitStatus
-    if (gitStatus != null && !gitStatus.isEmpty()) {
-        return 'local-build'
-    }
-
-    assert !gitCommit.isEmpty()
-    gitCommit
-}
-
-afterEvaluate {
-
-    it.getTasks().iterator().forEachRemaining {
-        def nameLowCase = it.name
-
-        if (nameLowCase.startsWith("assemble")
-                && nameLowCase.contains("Independent")
-                && (nameLowCase.endsWith("Debug") || nameLowCase.endsWith("Release"))) {
-            it.group = "assembleIndependent"
-        } else if (nameLowCase.startsWith("assemble")
-                && nameLowCase.contains("Launcher")
-                && (nameLowCase.endsWith("Debug") || nameLowCase.endsWith("Release"))) {
-            it.group = "assembleLauncher"
-        } else if (nameLowCase.startsWith("install")
-                && nameLowCase.contains("Independent")
-                && (nameLowCase.endsWith("Debug") || nameLowCase.endsWith("Release"))) {
-            it.group = "installIndependent"
-        } else if (nameLowCase.startsWith("install")
-                && nameLowCase.contains("Launcher")
-                && (nameLowCase.endsWith("Debug") || nameLowCase.endsWith("Release"))) {
-            it.group = "installLauncher"
-        }
-    }
-}
+apply from: "./regroup.gradle"
diff --git a/app/regroup.gradle b/app/regroup.gradle
new file mode 100644
index 0000000000..4b3e0ba638
--- /dev/null
+++ b/app/regroup.gradle
@@ -0,0 +1,45 @@
+// 将 install 和 assemble 任务按功能分组
+
+afterEvaluate {
+
+    def independent = ["em3", "em1", "d8xx", "d82x", "bydauto"]
+    def launcher = ["f8xx", "em4"]
+
+    it.getTasks().iterator().forEachRemaining {
+        def task = it
+        def taskName = task.name
+        if (taskName.startsWith("assemble")
+                && taskName.contains("Independent")
+                && (taskName.endsWith("Debug") || taskName.endsWith("Release"))) {
+            independent.forEach {
+                if( taskName.toLowerCase().contains(it) ){
+                    task.group = "assembleIndependent"
+                }
+            }
+        } else if (taskName.startsWith("assemble")
+                && taskName.contains("Launcher")
+                && (taskName.endsWith("Debug") || taskName.endsWith("Release"))) {
+            launcher.forEach {
+                if( taskName.toLowerCase().contains(it) ){
+                    task.group = "assembleLauncher"
+                }
+            }
+        } else if (taskName.startsWith("install")
+                && taskName.contains("Independent")
+                && (taskName.endsWith("Debug") || taskName.endsWith("Release"))) {
+            independent.forEach {
+                if( taskName.toLowerCase().contains(it) ){
+                    task.group = "installIndependent"
+                }
+            }
+        } else if (taskName.startsWith("install")
+                && taskName.contains("Launcher")
+                && (taskName.endsWith("Debug") || taskName.endsWith("Release"))) {
+            launcher.forEach {
+                if( taskName.toLowerCase().contains(it) ){
+                    task.group = "installLauncher"
+                }
+            }
+        }
+    }
+}

From 06a06e47b7d77b3e12e5f7752074f0d0f12519cb Mon Sep 17 00:00:00 2001
From: unknown <zhongchao@zdauto.com>
Date: Fri, 14 Aug 2020 11:27:50 +0800
Subject: [PATCH 03/36] fix bug of UI and update callchat to 1.5.1

---
 gradle.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 620f4a0289..954f602451 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -65,12 +65,13 @@ MOGO_BASE_SERVICES_SDK_VERSION = 1.2.1.22
 # 探路
 MOGO_MODULE_TANLU_VERSION=1.3.1.24
 # 车聊聊
-CARCHATTING_VERSION=1.4.9
+CARCHATTING_VERSION=1.5.1
 # 车聊聊接口
 CARCHATTINGPROVIDER_VERSION=1.3.4
 # 视频引导
 MOGO_MODULE_GUIDESHOW_VERSION=1.0.2-SNAPSHOT
 # 视频引导接口
+
 MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT
 # 在线车辆F
 MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2

From 3390ff00355e2a6b3eea728b41bae81c3d33fd2c Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Fri, 14 Aug 2020 11:37:01 +0800
Subject: [PATCH 04/36] =?UTF-8?q?=E6=96=87=E6=A1=88=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/module/v2x/network/V2XShareNetworkModel.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java
index 877136cec3..c706acbe91 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java
@@ -136,7 +136,7 @@ public class V2XShareNetworkModel {
                     public void onError(Throwable e) {
                         super.onError(e);
                         if (callback != null){
-                            callback.onFail("当前服务不可以, 请稍后重试");
+                            callback.onFail("网络异常，点击刷新重试");
                         }
                     }
                 });
@@ -180,7 +180,7 @@ public class V2XShareNetworkModel {
                     public void onError(Throwable e) {
                         super.onError(e);
                         if (callback != null){
-                            callback.onFail("当前服务不可以, 请稍后重试");
+                            callback.onFail("网络异常，点击刷新重试");
                         }
                     }
                 });

From 72c0cb27aed547dc55bdb17418537f59aeba303f Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Fri, 14 Aug 2020 11:37:01 +0800
Subject: [PATCH 05/36] =?UTF-8?q?=E6=96=87=E6=A1=88=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/module/v2x/network/V2XShareNetworkModel.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java
index 877136cec3..c706acbe91 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java
@@ -136,7 +136,7 @@ public class V2XShareNetworkModel {
                     public void onError(Throwable e) {
                         super.onError(e);
                         if (callback != null){
-                            callback.onFail("当前服务不可以, 请稍后重试");
+                            callback.onFail("网络异常，点击刷新重试");
                         }
                     }
                 });
@@ -180,7 +180,7 @@ public class V2XShareNetworkModel {
                     public void onError(Throwable e) {
                         super.onError(e);
                         if (callback != null){
-                            callback.onFail("当前服务不可以, 请稍后重试");
+                            callback.onFail("网络异常，点击刷新重试");
                         }
                     }
                 });

From 54e288f7b6f4147c7999ff680f1d5151a8aa1354 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Fri, 14 Aug 2020 12:03:12 +0800
Subject: [PATCH 06/36] =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/module/v2x/adapter/V2XShareEventAdapter.java |  4 ++--
 .../module/v2x/fragment/V2XShareEventsFragment.java   | 11 +++++------
 .../com/mogo/module/v2x/listener/AdapterCallback.java |  4 +++-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
index 686d49e351..ee61fb7aa8 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
@@ -223,7 +223,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
             refresh.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    callback.loadMoreShareEventList(false);
+                    callback.getShareEventResponse();
                 }
             });
         }
@@ -242,7 +242,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
 
                 @Override
                 public void onClick(View v) {
-                    callback.loadMoreShareEventList(true);
+                    callback.loadMoreShareEventList();
                 }
             });
         }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
index eee06e5379..29f91fa0a0 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
@@ -32,7 +32,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
     private static final String TAG = "ShareEventsFragment";
     private RecyclerView recyclerView;
     private V2XShareEventAdapter adapter;
-    private ArrayList dataArrayList = new ArrayList();
+    private ArrayList dataArrayList =new ArrayList();
     ;
     private int pageNum = 1;
     private V2XShareNetworkModel v2XShareNetworkModel;
@@ -77,7 +77,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
     /*
      * 获取热心指数,分享列表等分享内容
      * */
-    private void getShareEventResponse() {
+    public void getShareEventResponse() {
         animatioonAcction(View.VISIBLE);
         v2XShareNetworkModel.getShareEventResponse(pageNum, 10, new V2XRefreshCallback() {
             @Override
@@ -106,6 +106,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
                 });
             }
 
+
         });
 
     }
@@ -170,12 +171,10 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
     }
 
     @Override
-    public void loadMoreShareEventList(boolean moreOnePage) {
+    public void loadMoreShareEventList() {
         Log.d(TAG, "page--" + pageNum);
         animatioonAcction(View.VISIBLE);
-        if (moreOnePage  == true){
-            pageNum += 1;
-        }
+        pageNum += 1;
         v2XShareNetworkModel.getShareEventList(pageNum, 10, new V2XRefreshCallback() {
             @Override
             public void onSuccess(Object result) {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/AdapterCallback.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/AdapterCallback.java
index 7a7e6d3d7a..d5fb4f315e 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/AdapterCallback.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/AdapterCallback.java
@@ -5,5 +5,7 @@ package com.mogo.module.v2x.listener;
  */
 public interface AdapterCallback {
     //分享列表加载更多
-    void loadMoreShareEventList(boolean moreOnePage);
+    void loadMoreShareEventList();
+    //分享列表首次刷新
+    void getShareEventResponse();
 }

From f9b8707745d382f0d93980d15bc47120145e152c Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Fri, 14 Aug 2020 12:03:12 +0800
Subject: [PATCH 07/36] =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/module/v2x/adapter/V2XShareEventAdapter.java |  4 ++--
 .../module/v2x/fragment/V2XShareEventsFragment.java   | 11 +++++------
 .../com/mogo/module/v2x/listener/AdapterCallback.java |  4 +++-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
index 686d49e351..ee61fb7aa8 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
@@ -223,7 +223,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
             refresh.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    callback.loadMoreShareEventList(false);
+                    callback.getShareEventResponse();
                 }
             });
         }
@@ -242,7 +242,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
 
                 @Override
                 public void onClick(View v) {
-                    callback.loadMoreShareEventList(true);
+                    callback.loadMoreShareEventList();
                 }
             });
         }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
index eee06e5379..29f91fa0a0 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
@@ -32,7 +32,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
     private static final String TAG = "ShareEventsFragment";
     private RecyclerView recyclerView;
     private V2XShareEventAdapter adapter;
-    private ArrayList dataArrayList = new ArrayList();
+    private ArrayList dataArrayList =new ArrayList();
     ;
     private int pageNum = 1;
     private V2XShareNetworkModel v2XShareNetworkModel;
@@ -77,7 +77,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
     /*
      * 获取热心指数,分享列表等分享内容
      * */
-    private void getShareEventResponse() {
+    public void getShareEventResponse() {
         animatioonAcction(View.VISIBLE);
         v2XShareNetworkModel.getShareEventResponse(pageNum, 10, new V2XRefreshCallback() {
             @Override
@@ -106,6 +106,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
                 });
             }
 
+
         });
 
     }
@@ -170,12 +171,10 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
     }
 
     @Override
-    public void loadMoreShareEventList(boolean moreOnePage) {
+    public void loadMoreShareEventList() {
         Log.d(TAG, "page--" + pageNum);
         animatioonAcction(View.VISIBLE);
-        if (moreOnePage  == true){
-            pageNum += 1;
-        }
+        pageNum += 1;
         v2XShareNetworkModel.getShareEventList(pageNum, 10, new V2XRefreshCallback() {
             @Override
             public void onSuccess(Object result) {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/AdapterCallback.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/AdapterCallback.java
index 7a7e6d3d7a..d5fb4f315e 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/AdapterCallback.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/AdapterCallback.java
@@ -5,5 +5,7 @@ package com.mogo.module.v2x.listener;
  */
 public interface AdapterCallback {
     //分享列表加载更多
-    void loadMoreShareEventList(boolean moreOnePage);
+    void loadMoreShareEventList();
+    //分享列表首次刷新
+    void getShareEventResponse();
 }

From e009400ce50fc2b144b9f6b7ae766016fe6ed133 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Fri, 14 Aug 2020 12:12:32 +0800
Subject: [PATCH 08/36] =?UTF-8?q?=E7=BD=91=E7=BB=9C=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/module/v2x/fragment/V2XShareEventsFragment.java  | 4 ++--
 .../java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
index 29f91fa0a0..c473c778ad 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
@@ -97,7 +97,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
 
             @Override
             public void onFail(String msg) {
-                loadingView.stopWithError(msg);
+                loadingView.stopWithError(msg,View.VISIBLE);
                 loadingView.refresButton.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -183,7 +183,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
 
             @Override
             public void onFail(String msg) {
-
+                loadingView.stopWithError(msg,View.INVISIBLE);
             }
         });
     }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java
index b8c1e9beea..a73c2c4ccc 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java
@@ -76,7 +76,7 @@ public class V2XNetworkLoadingView extends RelativeLayout {
         }
     }
 
-    public void stopWithError(String errormsg) {
+    public void stopWithError(String errormsg, int showRefreshButton) {
         if (v2XAnimationManager != null) {
             v2XAnimationManager.soptWithError();
         }
@@ -84,7 +84,7 @@ public class V2XNetworkLoadingView extends RelativeLayout {
             textView.setText(errormsg);
         }
         if (refresButton != null) {
-            refresButton.setVisibility(VISIBLE);
+            refresButton.setVisibility(showRefreshButton);
         }
 
     }

From 2f5a0a3ae023b8c93db571f3226aca0344ccca91 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Fri, 14 Aug 2020 12:12:32 +0800
Subject: [PATCH 09/36] =?UTF-8?q?=E7=BD=91=E7=BB=9C=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/module/v2x/fragment/V2XShareEventsFragment.java  | 4 ++--
 .../java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
index 29f91fa0a0..c473c778ad 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
@@ -97,7 +97,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
 
             @Override
             public void onFail(String msg) {
-                loadingView.stopWithError(msg);
+                loadingView.stopWithError(msg,View.VISIBLE);
                 loadingView.refresButton.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -183,7 +183,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
 
             @Override
             public void onFail(String msg) {
-
+                loadingView.stopWithError(msg,View.INVISIBLE);
             }
         });
     }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java
index b8c1e9beea..a73c2c4ccc 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java
@@ -76,7 +76,7 @@ public class V2XNetworkLoadingView extends RelativeLayout {
         }
     }
 
-    public void stopWithError(String errormsg) {
+    public void stopWithError(String errormsg, int showRefreshButton) {
         if (v2XAnimationManager != null) {
             v2XAnimationManager.soptWithError();
         }
@@ -84,7 +84,7 @@ public class V2XNetworkLoadingView extends RelativeLayout {
             textView.setText(errormsg);
         }
         if (refresButton != null) {
-            refresButton.setVisibility(VISIBLE);
+            refresButton.setVisibility(showRefreshButton);
         }
 
     }

From 1f0790e0e7bdae26e9a895a0528c9a62da6d7dda Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Fri, 14 Aug 2020 12:25:12 +0800
Subject: [PATCH 10/36] =?UTF-8?q?=E6=8C=87=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/adapter/V2XShareEventAdapter.java     | 27 +------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
index ee61fb7aa8..1768ed13bf 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
@@ -73,31 +73,6 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
         }
     }
 
-    private float getEnthusuasmIndex(double score) {
-        if (score <= 0) {
-            return 0;
-        } else if (0 < score && score <= 5) {
-            return (float) 0.5;
-        } else if (5 < score && score <= 10) {
-            return 1;
-        } else if (10 < score && score <= 15) {
-            return (float) 1.5;
-        } else if (15 < score && score <= 20) {
-            return 2;
-        } else if (20 < score && score <= 25) {
-            return (float) 2.5;
-        } else if (25 < score && score <= 30) {
-            return 3;
-        } else if (30 < score && score <= 35) {
-            return (float) 3.5;
-        } else if (35 < score && score <= 40) {
-            return 4;
-        } else if (40 < score && score <= 45) {
-            return (float) 4.5;
-        }
-        return 5;
-    }
-
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
 
@@ -115,7 +90,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
                     if (likeNum != null) {
                         ((shareDescriptionViewHolder) holder).approveNumTextView.setText(likeNum);
                     }
-                    ((shareDescriptionViewHolder) holder).ratingBar.setRating(getEnthusuasmIndex(enthusiasmIndex));
+                    ((shareDescriptionViewHolder) holder).ratingBar.setRating((float) enthusiasmIndex);
                 }
             }
         } else if (holder instanceof shareItemViewHolder) {

From d6b68ba10b9e4a74a4f4f78c989e74e372e68739 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Fri, 14 Aug 2020 12:25:12 +0800
Subject: [PATCH 11/36] =?UTF-8?q?=E6=8C=87=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/adapter/V2XShareEventAdapter.java     | 27 +------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
index ee61fb7aa8..1768ed13bf 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
@@ -73,31 +73,6 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
         }
     }
 
-    private float getEnthusuasmIndex(double score) {
-        if (score <= 0) {
-            return 0;
-        } else if (0 < score && score <= 5) {
-            return (float) 0.5;
-        } else if (5 < score && score <= 10) {
-            return 1;
-        } else if (10 < score && score <= 15) {
-            return (float) 1.5;
-        } else if (15 < score && score <= 20) {
-            return 2;
-        } else if (20 < score && score <= 25) {
-            return (float) 2.5;
-        } else if (25 < score && score <= 30) {
-            return 3;
-        } else if (30 < score && score <= 35) {
-            return (float) 3.5;
-        } else if (35 < score && score <= 40) {
-            return 4;
-        } else if (40 < score && score <= 45) {
-            return (float) 4.5;
-        }
-        return 5;
-    }
-
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
 
@@ -115,7 +90,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
                     if (likeNum != null) {
                         ((shareDescriptionViewHolder) holder).approveNumTextView.setText(likeNum);
                     }
-                    ((shareDescriptionViewHolder) holder).ratingBar.setRating(getEnthusuasmIndex(enthusiasmIndex));
+                    ((shareDescriptionViewHolder) holder).ratingBar.setRating((float) enthusiasmIndex);
                 }
             }
         } else if (holder instanceof shareItemViewHolder) {

From 7f803d47b955630a15e4d81e56acdc93cef063e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 14 Aug 2020 12:40:26 +0800
Subject: [PATCH 12/36] =?UTF-8?q?=E5=B0=86=E5=8E=86=E5=8F=B2=E5=87=BA?=
 =?UTF-8?q?=E8=A1=8C=E5=8A=A8=E6=80=81=E6=9F=A5=E8=AF=A2=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=AD=90=E7=BA=BF=E7=A8=8B=E6=9F=A5=E8=AF=A2=EF=BC=8C=E9=98=B2?=
 =?UTF-8?q?=E6=AD=A2ANR=20http://jira.zhidaohulian.com/browse/E85XJD-150?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/fragment/V2XEventPanelFragment.kt     | 82 +++++++++----------
 .../fragment/V2XScenarioHistoryFragment.java  | 26 +++---
 .../presenter/ScenarioHistoryPresenter.java   |  8 +-
 ...e_v2x_event_panel_fragment_event_panel.xml |  2 +-
 4 files changed, 64 insertions(+), 54 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
index 3542bee411..0627defe4c 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
@@ -12,7 +12,6 @@ import com.mogo.module.v2x.V2XServiceManager
 import com.mogo.module.v2x.adapter.V2XEventPagerAdapter
 import com.mogo.module.v2x.presenter.EventPanelPresenter
 import com.mogo.module.v2x.utils.TrackUtils
-import com.mogo.module.v2x.utils.V2XSQLiteUtils
 import com.mogo.module.v2x.view.V2XEventPanelHistoryCountView
 import com.mogo.utils.logger.Logger
 import kotlinx.android.synthetic.main.module_v2x_event_panel_fragment_event_panel.*
@@ -46,51 +45,52 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
 
     override fun initViews() {
         Logger.d(MODULE_NAME, "事件面板初始化……")
-        fragments = arrayOf(
-                V2XScenarioHistoryFragment(),
-                V2XSurroundingFragment(),
-                V2XShareEventsFragment()
-        )
-        //禁用预加载
-        vpEventPanel.offscreenPageLimit = ViewPager2.OFFSCREEN_PAGE_LIMIT_DEFAULT
-        vpEventPanel.adapter = V2XEventPagerAdapter(this, fragments!!)
-        vpEventPanel.isUserInputEnabled = false; //true:滑动，false：禁止滑动
+        try {
+            fragments = arrayOf(
+                    V2XScenarioHistoryFragment(),
+                    V2XSurroundingFragment(),
+                    V2XShareEventsFragment()
+            )
+            //禁用预加载
+            vpEventPanel.offscreenPageLimit = ViewPager2.OFFSCREEN_PAGE_LIMIT_DEFAULT
+            vpEventPanel.adapter = V2XEventPagerAdapter(this, fragments!!)
+            vpEventPanel.isUserInputEnabled = false; //true:滑动，false：禁止滑动
 
-        val radioGroup = findViewById<View>(R.id.rgTabSelect) as RadioGroup?
-        radioGroup!!.setOnCheckedChangeListener { group, checkedId ->
-            when (checkedId) {
-                R.id.rbScenarioHistory -> {
-                    TrackUtils.trackV2xHistoryEvent(2)
-                    vpEventPanel.setCurrentItem(0, false)
-                }
-                R.id.rbSurroundingEvent -> {
-                    TrackUtils.trackV2xHistoryEvent(3)
-                    vpEventPanel.setCurrentItem(1, false)
-                }
-                R.id.rbShareEvents -> {
-                    TrackUtils.trackV2xHistoryEvent(4)
-                    vpEventPanel.setCurrentItem(2, false)
+            val radioGroup = findViewById<View>(R.id.rgTabSelect) as RadioGroup?
+            radioGroup!!.setOnCheckedChangeListener { group, checkedId ->
+                when (checkedId) {
+                    R.id.rbScenarioHistory -> {
+                        TrackUtils.trackV2xHistoryEvent(2)
+                        vpEventPanel.setCurrentItem(0, false)
+                    }
+                    R.id.rbSurroundingEvent -> {
+                        TrackUtils.trackV2xHistoryEvent(3)
+                        vpEventPanel.setCurrentItem(1, false)
+                    }
+                    R.id.rbShareEvents -> {
+                        TrackUtils.trackV2xHistoryEvent(4)
+                        vpEventPanel.setCurrentItem(2, false)
+                    }
                 }
             }
-        }
 
-        btnHidePanels.setOnClickListener {
-            TrackUtils.trackV2xHistoryEvent(5)
-            hidePanel()
-        }
-
-        mV2XEventPanelHistoryCountView = V2XEventPanelHistoryCountView(context)
-        mV2XEventPanelHistoryCountView!!.setOnClickListener {
-            TrackUtils.trackV2xHistoryEvent(1)
-            if (!isPanelShow()) {
-                showPanel()
-            } else {
+            btnHidePanels.setOnClickListener {
+                TrackUtils.trackV2xHistoryEvent(5)
                 hidePanel()
             }
-        }
-        V2XServiceManager.getMogoEntranceButtonController().addBottomLayerView(mV2XEventPanelHistoryCountView)
 
-        changeEventCount()
+            mV2XEventPanelHistoryCountView = V2XEventPanelHistoryCountView(context)
+            mV2XEventPanelHistoryCountView!!.setOnClickListener {
+                if (!isPanelShow()) {
+                    TrackUtils.trackV2xHistoryEvent(1)
+                    showPanel()
+                }
+            }
+            V2XServiceManager.getMogoEntranceButtonController().addBottomLayerView(mV2XEventPanelHistoryCountView)
+            changeEventCount()
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
     }
 
     override fun onDestroyView() {
@@ -105,13 +105,13 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
     fun showPanel() {
         Logger.d(MODULE_NAME, "in fragment show panel")
         clPanelContainer.visibility = View.VISIBLE
-        V2XServiceManager.getMoGoV2XStatusManager().setEventPanelWindowShow(TAG, true)
+//        V2XServiceManager.getMoGoV2XStatusManager().setEventPanelWindowShow(TAG, true)
     }
 
     fun hidePanel() {
         Logger.d(MODULE_NAME, "in fragment hide panel")
         clPanelContainer.visibility = View.GONE
-        V2XServiceManager.getMoGoV2XStatusManager().setEventPanelWindowShow(TAG, false)
+//        V2XServiceManager.getMoGoV2XStatusManager().setEventPanelWindowShow(TAG, false)
     }
 
     fun isPanelShow(): Boolean {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
index 3ffce33d8e..09cfa19bf7 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
@@ -18,6 +18,7 @@ import com.mogo.module.v2x.adapter.V2XScenarioHistoryAdapter;
 import com.mogo.module.v2x.manager.IMoGoV2XStatusChangedListener;
 import com.mogo.module.v2x.manager.V2XStatusDescriptor;
 import com.mogo.module.v2x.presenter.ScenarioHistoryPresenter;
+import com.mogo.module.v2x.utils.ThreadUtils;
 import com.mogo.module.v2x.view.V2XListEmptyView;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.utils.GsonUtil;
@@ -108,16 +109,21 @@ public class V2XScenarioHistoryFragment
      */
     public void loadHistory(List<V2XHistoryScenarioData> v2XHistoryScenarioData) {
         Logger.d(TAG, "查询到历史消息：" + GsonUtil.jsonFromObject(v2XHistoryScenarioData));
-        mV2XHistoryScenarioData.clear();
-        if (v2XHistoryScenarioData.size() > 0) {
-            mEmptyView.setVisibility(View.GONE);
-            mClHistoryList.setVisibility(View.VISIBLE);
-            mV2XHistoryScenarioData.addAll(v2XHistoryScenarioData);
-        } else {
-            mEmptyView.setVisibility(View.VISIBLE);
-            mClHistoryList.setVisibility(View.GONE);
-        }
-        mV2XScenarioHistoryAdapter.notifyDataSetChanged();
+        ThreadUtils.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mV2XHistoryScenarioData.clear();
+                if (v2XHistoryScenarioData.size() > 0) {
+                    mEmptyView.setVisibility(View.GONE);
+                    mClHistoryList.setVisibility(View.VISIBLE);
+                    mV2XHistoryScenarioData.addAll(v2XHistoryScenarioData);
+                } else {
+                    mEmptyView.setVisibility(View.VISIBLE);
+                    mClHistoryList.setVisibility(View.GONE);
+                }
+                mV2XScenarioHistoryAdapter.notifyDataSetChanged();
+            }
+        });
     }
 
     @Override
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ScenarioHistoryPresenter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ScenarioHistoryPresenter.java
index d3379857c7..95b3b4ea05 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ScenarioHistoryPresenter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ScenarioHistoryPresenter.java
@@ -4,7 +4,9 @@ package com.mogo.module.v2x.presenter;
 import com.mogo.commons.mvp.Presenter;
 import com.mogo.module.common.entity.V2XHistoryScenarioData;
 import com.mogo.module.v2x.fragment.V2XScenarioHistoryFragment;
+import com.mogo.module.v2x.utils.ThreadUtils;
 import com.mogo.module.v2x.utils.V2XSQLiteUtils;
+import com.mogo.utils.WorkThreadHandler;
 
 import java.util.List;
 
@@ -18,7 +20,9 @@ public class ScenarioHistoryPresenter extends Presenter<V2XScenarioHistoryFragme
     }
 
     public void loadHistory() {
-        List<V2XHistoryScenarioData> v2XHistoryScenarioData = V2XSQLiteUtils.getScenarioHistoryData();
-        mView.loadHistory(v2XHistoryScenarioData);
+        WorkThreadHandler.getInstance().post(() -> {
+            List<V2XHistoryScenarioData> v2XHistoryScenarioData = V2XSQLiteUtils.getScenarioHistoryData();
+            mView.loadHistory(v2XHistoryScenarioData);
+        });
     }
 }
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
index 051d0557f0..fc8f9f24ca 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
@@ -20,7 +20,7 @@
         <RadioGroup
             android:id="@+id/rgTabSelect"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_130"
+            android:layout_height="@dimen/dp_154"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 

From bd1c318f79af2086e450475dfbe3e29398b0965f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 14 Aug 2020 14:15:03 +0800
Subject: [PATCH 13/36] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E9=9D=A2?=
 =?UTF-8?q?=E5=94=A4=E9=86=92=E8=AF=AD=E5=8F=A5=E6=93=8D=E6=8E=A7=20http:/?=
 =?UTF-8?q?/jira.zhidaohulian.com/browse/E85XJD-151?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/fragment/V2XEventPanelFragment.kt     | 57 ++++++++++++++++++-
 .../module/v2x/voice/V2XVoiceConstants.java   | 24 +++++++-
 2 files changed, 77 insertions(+), 4 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
index 0627defe4c..ff0cfbf53c 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
@@ -1,7 +1,7 @@
 package com.mogo.module.v2x.fragment
 
+import android.content.Intent
 import android.view.View
-import android.widget.RadioGroup
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.tabs.TabLayoutMediator
@@ -13,6 +13,9 @@ import com.mogo.module.v2x.adapter.V2XEventPagerAdapter
 import com.mogo.module.v2x.presenter.EventPanelPresenter
 import com.mogo.module.v2x.utils.TrackUtils
 import com.mogo.module.v2x.view.V2XEventPanelHistoryCountView
+import com.mogo.module.v2x.voice.V2XVoiceCallbackListener
+import com.mogo.module.v2x.voice.V2XVoiceConstants
+import com.mogo.module.v2x.voice.V2XVoiceManager
 import com.mogo.utils.logger.Logger
 import kotlinx.android.synthetic.main.module_v2x_event_panel_fragment_event_panel.*
 
@@ -39,6 +42,42 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
         }
     }
 
+    // 打开出行动态TAB
+    private val mCheckHistoryEventCb = V2XVoiceCallbackListener { command: String?, intent: Intent? ->
+        try {
+            rgTabSelect?.check(R.id.rbScenarioHistory)
+        } catch (e: java.lang.Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    // 打开周边事件TAB
+    private val mCheckSurroundingCb = V2XVoiceCallbackListener { command: String?, intent: Intent? ->
+        try {
+            rgTabSelect?.check(R.id.rbSurroundingEvent)
+        } catch (e: java.lang.Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    // 打开我的分享TAB
+    private val mCheckShearEventCb = V2XVoiceCallbackListener { command: String?, intent: Intent? ->
+        try {
+            rgTabSelect?.check(R.id.rbShareEvents)
+        } catch (e: java.lang.Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    // 打关闭事件面板
+    private val mCloeEventCb = V2XVoiceCallbackListener { command: String?, intent: Intent? ->
+        try {
+            hidePanel()
+        } catch (e: java.lang.Exception) {
+            e.printStackTrace()
+        }
+    }
+
     override fun getLayoutId(): Int {
         return R.layout.module_v2x_event_panel_fragment_event_panel
     }
@@ -56,8 +95,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
             vpEventPanel.adapter = V2XEventPagerAdapter(this, fragments!!)
             vpEventPanel.isUserInputEnabled = false; //true:滑动，false：禁止滑动
 
-            val radioGroup = findViewById<View>(R.id.rgTabSelect) as RadioGroup?
-            radioGroup!!.setOnCheckedChangeListener { group, checkedId ->
+            rgTabSelect?.setOnCheckedChangeListener { group, checkedId ->
                 when (checkedId) {
                     R.id.rbScenarioHistory -> {
                         TrackUtils.trackV2xHistoryEvent(2)
@@ -106,12 +144,25 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
         Logger.d(MODULE_NAME, "in fragment show panel")
         clPanelContainer.visibility = View.VISIBLE
 //        V2XServiceManager.getMoGoV2XStatusManager().setEventPanelWindowShow(TAG, true)
+        // 注册语音交互
+
+        //Logger.w(MODULE_NAME, "列表View V2XPushEventDetailVH 触发 onViewAttachedToWindow");
+        // 注册语音交互
+        V2XVoiceManager.registerUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_HISTORY_EVENT_UN_WAKEUP, mCheckHistoryEventCb)
+                .registerUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_SURROUNDING_EVENT_UN_WAKEUP, mCheckSurroundingCb)
+                .registerUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_SHEAR_EVENT_UN_WAKEUP, mCheckShearEventCb)
+                .registerUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_CLOSE_WINDOW_UN_WAKEUP, mCloeEventCb)
     }
 
     fun hidePanel() {
         Logger.d(MODULE_NAME, "in fragment hide panel")
         clPanelContainer.visibility = View.GONE
 //        V2XServiceManager.getMoGoV2XStatusManager().setEventPanelWindowShow(TAG, false)
+        // 注册语音交互
+        V2XVoiceManager.unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_HISTORY_EVENT_UN_WAKEUP)
+                .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_SURROUNDING_EVENT_UN_WAKEUP)
+                .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_SHEAR_EVENT_UN_WAKEUP)
+                .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_CLOSE_WINDOW_UN_WAKEUP)
     }
 
     fun isPanelShow(): Boolean {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java
index 82aaaeaeb8..78aefa1956 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java
@@ -151,7 +151,7 @@ public class V2XVoiceConstants {
      * 关闭路况详情
      */
     public static final String COMMAND_V2X_TO_CLOSE_WINDOW_UN_WAKEUP = "COMMAND_V2X_TO_CLOSE_WINDOW_UN_WAKEUP";
-    public static final String[] COMMAND_V2X_TO_CLOSE_WINDOW_UN_WAKEUP_WORDS = {"关闭"};
+    public static final String[] COMMAND_V2X_TO_CLOSE_WINDOW_UN_WAKEUP_WORDS = {"关闭", "关闭页面"};
     /**
      * 应用内免唤醒
      * 反馈"正确"语音回调
@@ -207,6 +207,24 @@ public class V2XVoiceConstants {
     public static final String COMMAND_ZHIDAO_V2X_ILLEGAL_PARKMARKER_FEEDBACK_MEIYONG_UN_WAKEUP = "COMMAND_ZHIDAO_V2X_ILLEGAL_PARKMARKER_FEEDBACK_MEIYONG_UN_WAKEUP";
     public static final String[] COMMAND_ZHIDAO_V2X_ILLEGAL_PARKMARKER_FEEDBACK_MEIYONG_UN_WAKEUP_WORDS = {"没用"};
 
+    /**
+     * 出行动态
+     */
+    public static final String COMMAND_ZHIDAO_V2X_OPEN_HISTORY_EVENT_UN_WAKEUP = "COMMAND_ZHIDAO_V2X_OPEN_HISTORY_EVENT_UN_WAKEUP";
+    public static final String[] COMMAND_ZHIDAO_V2X_OPEN_HISTORY_EVENT_UN_WAKEUP_WORDS = {"出行动态"};
+
+    /**
+     * 周边事件
+     */
+    public static final String COMMAND_ZHIDAO_V2X_OPEN_SURROUNDING_EVENT_UN_WAKEUP = "COMMAND_ZHIDAO_V2X_OPEN_SURROUNDING_EVENT_UN_WAKEUP";
+    public static final String[] COMMAND_ZHIDAO_V2X_OPEN_SURROUNDING_EVENT_UN_WAKEUP_WORDS = {"周边事件"};
+
+    /**
+     * 我的分享
+     */
+    public static final String COMMAND_ZHIDAO_V2X_OPEN_SHEAR_EVENT_UN_WAKEUP = "COMMAND_ZHIDAO_V2X_OPEN_SHEAR_EVENT_UN_WAKEUP";
+    public static final String[] COMMAND_ZHIDAO_V2X_OPEN_SHEAR_EVENT_UN_WAKEUP_WORDS = {"我的分享"};
+
     static {
         // 免唤醒 默认
         sVoiceCmds.put(COMMAND_V2X_TO_CHAT_MORE_UN_WAKEUP, COMMAND_V2X_TO_CHAT_MORE_UN_WAKEUP_WORDS);
@@ -230,6 +248,10 @@ public class V2XVoiceConstants {
         sVoiceCmds.put(COMMAND_ZHIDAO_V2X_ILLEGAL_PARKMARKER_FEEDBACK_YOUYONG_UN_WAKEUP, COMMAND_ZHIDAO_V2X_ILLEGAL_PARKMARKER_FEEDBACK_YOUYONG_UN_WAKEUP_WORDS);
         sVoiceCmds.put(COMMAND_ZHIDAO_V2X_ILLEGAL_PARKMARKER_FEEDBACK_MEIYONG_UN_WAKEUP, COMMAND_ZHIDAO_V2X_ILLEGAL_PARKMARKER_FEEDBACK_MEIYONG_UN_WAKEUP_WORDS);
 
+        sVoiceCmds.put(COMMAND_ZHIDAO_V2X_OPEN_HISTORY_EVENT_UN_WAKEUP, COMMAND_ZHIDAO_V2X_OPEN_HISTORY_EVENT_UN_WAKEUP_WORDS);
+        sVoiceCmds.put(COMMAND_ZHIDAO_V2X_OPEN_SURROUNDING_EVENT_UN_WAKEUP, COMMAND_ZHIDAO_V2X_OPEN_SURROUNDING_EVENT_UN_WAKEUP_WORDS);
+        sVoiceCmds.put(COMMAND_ZHIDAO_V2X_OPEN_SHEAR_EVENT_UN_WAKEUP, COMMAND_ZHIDAO_V2X_OPEN_SHEAR_EVENT_UN_WAKEUP_WORDS);
+
 
         //默认
        /* sCmds.add(COMMAND_ZHIDAO_V2X_CALL_CHATTING);

From dce7f5e68cc52785ff8eb8118cfba933f4ae80ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 14 Aug 2020 14:21:20 +0800
Subject: [PATCH 14/36] =?UTF-8?q?=E3=80=90=E6=99=BA=E6=85=A7=E9=A9=BE?=
 =?UTF-8?q?=E9=A9=B61.1.2=E3=80=91=E5=87=BA=E8=A1=8C=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E7=BB=8F=E8=BF=87=E4=BA=8B=E4=BB=B6=20?=
 =?UTF-8?q?=E6=96=87=E6=A1=88=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=EF=BC=8C?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8F=96=E5=80=BC=E9=94=99=E8=AF=AF=20http:/?=
 =?UTF-8?q?/jira.zhidaohulian.com/browse/E85XJD-157?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java
index 4970ba17bc..4062ef5d86 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java
@@ -64,7 +64,7 @@ public class V2XScenarioHistoryRoadEventVH extends V2XBaseViewHolder<V2XHistoryS
 
             try {
                 mTvIllegalNum.setText(mExploreWay.getUserInfo().getUserName() + " 的分享 时间：" +
-                        TimeUtils.millis2String(mExploreWay.getGenerateTime(), "MM月dd日 HH:mm"));
+                        TimeUtils.millis2String(mOldScenarioData.getTriggerTime(), "MM月dd日 HH:mm"));
             } catch (Exception e) {
                 e.printStackTrace();
             }

From d9b1ef9acd080bfe791a46d674d6491c2f76d80c Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Fri, 14 Aug 2020 14:22:51 +0800
Subject: [PATCH 15/36] add roadtrafic upload

---
 .../zhidao/roadcondition/constant/Const.kt    |  10 +-
 .../roadcondition/model/InformationBody.kt    |   3 +-
 .../service/CarCorderController.kt            | 213 +++++++++---------
 .../service/CosCallbackMapController.kt       |   1 -
 .../service/CosStatusController.kt            |  83 +++----
 .../roadcondition/service/MainService.kt      |  27 +--
 .../service/MainServiceController.kt          |  12 +-
 .../com/zhidao/roadcondition/util/PdUtil.kt   |   6 +-
 8 files changed, 177 insertions(+), 178 deletions(-)

diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/Const.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/Const.kt
index b7628fd94b..889aedacc7 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/Const.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/Const.kt
@@ -50,23 +50,23 @@ const val TANLU_ROAD_CURRENT = "10015" //实时路况
 /**
  * 用户手点上报
  */
-const val UPLOAD_FROM_USER = 1
+const val UPLOAD_FROM_USER = "1"
 /**
  * 用户语音上报
  */
-const val UPLOAD_FROM_VOICE = 2
+const val UPLOAD_FROM_VOICE = "2"
 /**
  * 数据策略：拥堵自动上报
  */
-const val UPLOAD_FROM_STRATEGY_BLOCK_AUTO = 3
+const val UPLOAD_FROM_STRATEGY_BLOCK_AUTO = "3"
 /**
  * 数据策略：已有事件云端校验
  */
-const val UPLOAD_FROM_STRATEGY_CLOUD_CHECK = 4
+const val UPLOAD_FROM_STRATEGY_CLOUD_CHECK = "4"
 /**
  * 数据策略：交通事故上报
  */
-const val UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO = 5
+const val UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO = "5"
 
 /**
  * 默认视频抓取时长，单位是秒
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationBody.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationBody.kt
index a57e134a26..1d4c23725f 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationBody.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/InformationBody.kt
@@ -20,5 +20,6 @@ data class InformationBody(
     val trafficInfoType:String, // 上报情报类型
     val isShare: Boolean, // 是否分享给附近车机
     val direction: Float,
-    val poiType: String //类型分类
+    val poiType: String, //类型分类
+    val mainInfoId: Long //事件id
 )
\ No newline at end of file
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
index bf664f0cf5..24002c1042 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
@@ -1,13 +1,11 @@
 package com.zhidao.roadcondition.service
 
-import android.content.Intent
 import android.text.TextUtils
 import android.util.Log
 import com.hw.videoprocessor.VideoProcessor
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.debug.DebugConfig
 import com.mogo.utils.NetworkUtils
-import com.mogo.utils.TipToast
 import com.zhidao.auto.carcorder.callback.TakePhotoCallback
 import com.zhidao.auto.carcorder.callback.TakeVideoCallback
 import com.zhidao.auto.carcorder.controller.ZdCarCoderController
@@ -34,6 +32,8 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
     val TAG: String = this.javaClass.simpleName
     var outputVideoPath: String = ""
     var mType: String = "" //1 上报拥堵, 2 封路和查车
+    var mainInfoId: Long = 0
+    var mFromType: String = ""
 
     private var getVideoFailed: (() -> Unit)? = null
     private var interceptors: ArrayList<TakePhotoInterceptor> = ArrayList(1)
@@ -56,24 +56,28 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
 
     fun initCarCorderController() {
         zdCarCoderController =
-            ZdCarCoderController.getInstance(AbsMogoApplication.getApp().applicationContext)
+                ZdCarCoderController.getInstance(AbsMogoApplication.getApp().applicationContext)
         zdCarCoderController.addCallback(this)
         zdCarCoderController.addVideoCallback(this)
         zdCarCoderController.init()
     }
 
     fun takePhoto(
-        photoType: Int,
-        cameraId: Int,
-        haveVoice: Boolean,
-        isCustom: Boolean = false,
-        type: String
+            photoType: Int,
+            cameraId: Int,
+            haveVoice: Boolean,
+            isCustom: Boolean = false,
+            type: String,
+            mainInfoId: Long,
+            fromType: String
     ) {
-        Log.d(TAG, "takePhoto ---------- type = $type" + " >>>mType =" + mType)
+        Log.d(TAG, "takePhoto ---------- type = $type  --- mType = $mType ---fromType = $fromType")
+        this.mType = type
+        this.mainInfoId = mainInfoId
+        this.mFromType = fromType
         CustomStatusHandler.offerPhotoStatus(isCustom)
         zdCarCoderController.takePhoto(photoType, cameraId, haveVoice)
         trackGetPhoto(1)
-        this.mType = type
     }
 
     /**
@@ -81,15 +85,19 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
      * @param id: 标志是哪一个上传
      */
     fun takeVideo(
-        cameraId: Int,
-        duration: Int,
-        isCustom: Boolean = false,
-        id: Long = 0L,
-        type: String
+            cameraId: Int,
+            duration: Int,
+            isCustom: Boolean = false,
+            id: Long = 0L,
+            type: String,
+            mainInfoId: Long,
+            fromType: String
     ) {
         Log.d(TAG, "takeVideo -------- type = $type")
-        Log.d(TAG, "takeVideo -------- isCustom = $isCustom")
+        Log.d(TAG, "takeVideo -------- isCustom = $isCustom ---mFromType = $mFromType")
         this.mType = type
+        this.mainInfoId = mainInfoId
+        this.mFromType = fromType
         if (DebugConfig.getCarMachineType() == 0) { //自研车机
             outputVideoPath = getCompressVideoPath()
             CustomStatusHandler.offerVideoStatus(TakeEntity(isCustom, id))
@@ -100,27 +108,28 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
 //            if (!NetworkUtils.isConnected(AbsMogoApplication.getApp().applicationContext)) {
 //                TipToast.shortTip("分享失败，请检查网络")
 //            } else {
-                //失败了，传空地址，发起请求
-                val entity = TakeEntity(isCustom, id)
-                videoAndThumbMap["video"] = ""
-                videoAndThumbMap["thumb"] = ""
+            //失败了，传空地址，发起请求
+            val entity = TakeEntity(isCustom, id)
+            videoAndThumbMap["video"] = ""
+            videoAndThumbMap["thumb"] = ""
 
-                CosStatusController().sendInformationDirectly(
+            CosStatusController().sendInformationDirectly(
                     INFO_TYPE_VIDEO,
                     videoAndThumbMap,
                     mType,
-                    entity
-                )
+                    entity,
+                    mainInfoId
+            )
 
-                //地图上打点
-                taskAsync(3_000) {
-                    try {
-                        LatLngStickyEventBus.getInstance()
+            //地图上打点
+            taskAsync(3_000) {
+                try {
+                    LatLngStickyEventBus.getInstance()
                             .postSticky(GetImageSuccessEvent("", mType))
-                    } catch (e: java.lang.Exception) {
-                        e.printStackTrace()
-                    }
+                } catch (e: java.lang.Exception) {
+                    e.printStackTrace()
                 }
+            }
 //            }
         }
     }
@@ -138,18 +147,17 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
         }
         val isCustom = CustomStatusHandler.pollPhotoStatus()
         val entity = TakeEntity(isCustom, 0L)
-        Log.e(TAG, "onTakePhotoFail -----mType = $mType ")
-        Log.e(TAG, "onTakePhotoFail -----isCustom = $isCustom ")
+        Log.e(TAG, "onTakePhotoFail -----mType = $mType --- isCustom = $isCustom")
         //语音播报 1：上报路况，2：交通检查，3：封路  默认 mType 应该为null
         if (mType.equals(TANLU_ROAD_CONGESTION) || mType.equals(TANLU_TRAFFIC_CHECK) || mType.equals(
-                TANLU_ROAD_CLOSURE
-            )
-            || mType.equals(TANLU_ROAD_CURRENT) || mType.equals(TANLU_ROAD_PONDING) || mType.equals(
-                TANLU_ROAD_ICING
-            )
-            || mType.equals(TANLU_ROAD_HEAVY_FOG) || mType.equals(TANLU_ROAD_ACCIDENT) || mType.equals(
-                TANLU_ROAD_WORK
-            )
+                        TANLU_ROAD_CLOSURE
+                )
+                || mType.equals(TANLU_ROAD_CURRENT) || mType.equals(TANLU_ROAD_PONDING) || mType.equals(
+                        TANLU_ROAD_ICING
+                )
+                || mType.equals(TANLU_ROAD_HEAVY_FOG) || mType.equals(TANLU_ROAD_ACCIDENT) || mType.equals(
+                        TANLU_ROAD_WORK
+                )
         ) {
             taskAsync(1_500) {
                 try {
@@ -165,28 +173,20 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
             //获取图片失败也上报，图片不打点
             if (isCustom) {
                 CosStatusController().sendInformationDirectly(
-                    INFO_TYPE_IMG,
-                    mutableMapOf("pic" to "" as String),
-                    mType,
-                    entity
+                        INFO_TYPE_IMG,
+                        mutableMapOf("pic" to "" as String),
+                        mType,
+                        entity,
+                        mainInfoId
                 );
             }
         }
     }
 
-    private fun sendGetInfoFailedReceiver(type: String) {
-        Log.e(TAG, "sendGetInfoFailedReceiver ------>")
-        var intent = Intent()
-        intent.action = "com.zhidao.roadcondition.getinfo.failed"
-        intent.putExtra("type", type)
-        AbsMogoApplication.getApp().applicationContext.sendBroadcast(intent)
-    }
-
-
     //拍照成功回调返回图片本地路径
     override fun onTakePhotoSuccess(photoType: Int, camera: Int, photoPath: String?) {
         trackGetPhoto(2)
-        Log.d(TAG, "onTakePhotoSuccess -----mType = $mType")
+        Log.d(TAG, "onTakePhotoSuccess -----mType = $mType --- mainInfoId = $mainInfoId")
         val isCustom = CustomStatusHandler.pollPhotoStatus()
         val entity = TakeEntity(isCustom, 0L)
 
@@ -204,35 +204,37 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
         }
 
         var minSpeedPic =
-            getStrategyMinSpeed(
-                AbsMogoApplication.getApp().applicationContext,
-                "pic",
-                getStrategyType("pic")
-            )
+                getStrategyMinSpeed(
+                        AbsMogoApplication.getApp().applicationContext,
+                        "pic",
+                        getStrategyType("pic")
+                )
         var maxSpeedPic =
-            getStrategyMaxSpeed(
-                AbsMogoApplication.getApp().applicationContext,
-                "pic",
-                getStrategyType("pic")
-            )
+                getStrategyMaxSpeed(
+                        AbsMogoApplication.getApp().applicationContext,
+                        "pic",
+                        getStrategyType("pic")
+                )
         var speed = LocationUtil.getInstance().getSpeed()
 
         if (!TextUtils.isEmpty(mType)) {
             Log.d(TAG, "onTakePhotoSuccess mType != null")
-            CosStatusController().uploadFile(mutableListOf(photoPath as String), entity, mType)
+            CosStatusController().uploadFile(mutableListOf(photoPath as String), entity, mType, mainInfoId, mFromType)
         } else {
             Log.d(TAG, "onTakePhotoSuccess mType == null")
             Log.d(
-                TAG,
-                "onTakePhotoSuccess maxSpeedPic = $maxSpeedPic  ---> speed = $speed ---->minSpeedPic= $minSpeedPic"
+                    TAG,
+                    "onTakePhotoSuccess maxSpeedPic = $maxSpeedPic  ---> speed = $speed ---->minSpeedPic= $minSpeedPic"
             )
             if (maxSpeedPic == -1) {
                 if (speed >= (Math.abs(minSpeedPic) / 3.6f)) {
                     Log.d(TAG, "onTakePhotoSuccess abs =" + (Math.abs(minSpeedPic) / 3.6f))
                     CosStatusController().uploadFile(
-                        mutableListOf(photoPath as String),
-                        entity,
-                        mType
+                            mutableListOf(photoPath as String),
+                            entity,
+                            mType,
+                            mainInfoId,
+                            mFromType
                     )
                 }
             }
@@ -241,9 +243,11 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
                 Log.d(TAG, "onTakePhotoSuccess minSpeedPic > 0 -- speed = $speed")
                 if ((speed >= (minSpeedPic / 3.6f)) && speed <= (maxSpeedPic / 3.6f)) {
                     CosStatusController().uploadFile(
-                        mutableListOf(photoPath as String),
-                        entity,
-                        mType
+                            mutableListOf(photoPath as String),
+                            entity,
+                            mType,
+                            mainInfoId,
+                            mFromType
                     )
                 }
             }
@@ -253,11 +257,11 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
     //获取视频成功
     override fun onTakeVideoSuccess(camera: Int, videoPath: String?) {
         var thumbnailPath =
-            AbsMogoApplication.getApp().applicationContext.filesDir.parent + File.separator + "Thumbnail${System.currentTimeMillis()}.jpg"
+                AbsMogoApplication.getApp().applicationContext.filesDir.parent + File.separator + "Thumbnail${System.currentTimeMillis()}.jpg"
         var isSuccess = getVideoThumbnail(videoPath!!, thumbnailPath)
         Log.d(
-            TAG,
-            "getVideo onTakeVideoSuccess===$videoPath -----> isSuccess= $isSuccess ----> mType = $mType "
+                TAG,
+                "getVideo onTakeVideoSuccess===$videoPath -----> isSuccess= $isSuccess ----> mType = $mType --- mainInfoId = $mainInfoId"
         )
 
         val entity = CustomStatusHandler.pollVideoStatus()
@@ -267,12 +271,12 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
 
         if (isSuccess) {
             var minSpeedVideo = getStrategyMinSpeed(
-                AbsMogoApplication.getApp().applicationContext, "video",
-                getStrategyType("video")
+                    AbsMogoApplication.getApp().applicationContext, "video",
+                    getStrategyType("video")
             )
             var maxSpeedVideo = getStrategyMaxSpeed(
-                AbsMogoApplication.getApp().applicationContext, "video",
-                getStrategyType("video")
+                    AbsMogoApplication.getApp().applicationContext, "video",
+                    getStrategyType("video")
             )
             var speed = LocationUtil.getInstance().getSpeed()
             //TODO
@@ -286,8 +290,8 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
                 compressVideo(videoPath, thumbnailPath, entity)
             } else {
                 Log.d(
-                    TAG,
-                    "onTakeVideoSuccess  maxSpeedVideo = $maxSpeedVideo --->speed= $speed + minSpeedVideo = $minSpeedVideo"
+                        TAG,
+                        "onTakeVideoSuccess  maxSpeedVideo = $maxSpeedVideo --->speed= $speed + minSpeedVideo = $minSpeedVideo"
                 )
                 if (maxSpeedVideo == -1) {
                     Log.d(TAG, "onTakeVideoSuccess 111  abs =" + (Math.abs(minSpeedVideo) / 3.6f))
@@ -328,10 +332,11 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
         videoAndThumbMap["thumb"] = ""
 
         CosStatusController().sendInformationDirectly(
-            INFO_TYPE_VIDEO,
-            videoAndThumbMap,
-            mType,
-            entity
+                INFO_TYPE_VIDEO,
+                videoAndThumbMap,
+                mType,
+                entity,
+                mainInfoId
         )
 
         //地图上打点
@@ -349,26 +354,28 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
      */
     fun compressVideo(videoPath: String, thumbnailPath: String, entity: TakeEntity) {
         Log.d(
-            TAG,
-            "outputVideoPath = " + outputVideoPath + ">> videoPath=" + videoPath + " isCustom = ${entity?.isCustom}"
+                TAG,
+                "outputVideoPath = " + outputVideoPath + ">> videoPath=" + videoPath + " isCustom = ${entity?.isCustom}"
         )
         var startTime = System.currentTimeMillis()
         Thread(Runnable {
             try {
                 VideoProcessor.processor(AbsMogoApplication.getApp().applicationContext)
-                    .input(videoPath)
-                    .output(outputVideoPath)
-                    .removeAudio(true)
-                    .outWidth(1920)
-                    .outHeight(1080)
-                    .bitrate(2000 * 1024)
-                    .frameRate(25)
-                    .process()
+                        .input(videoPath)
+                        .output(outputVideoPath)
+                        .removeAudio(true)
+                        .outWidth(1920)
+                        .outHeight(1080)
+                        .bitrate(2000 * 1024)
+                        .frameRate(25)
+                        .process()
                 Log.d(TAG, "compress cost time =" + (System.currentTimeMillis() - startTime))
                 CosStatusController().uploadFile(
-                    mutableListOf(outputVideoPath, thumbnailPath),
-                    entity,
-                    mType
+                        mutableListOf(outputVideoPath, thumbnailPath),
+                        entity,
+                        mType,
+                        mainInfoId,
+                        mFromType
                 )
                 //删除压缩前的视频
                 deletePicFile(videoPath)
@@ -392,16 +399,16 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
     //获取图片
     private fun trackGetPhoto(type: Int) {
         trackNormalEvent(
-            CarNet_Get_Picture, mutableMapOf("type" to type),
-            AbsMogoApplication.getApp().applicationContext
+                CarNet_Get_Picture, mutableMapOf("type" to type),
+                AbsMogoApplication.getApp().applicationContext
         )
     }
 
     //获取视频
     private fun trackGetVideo(type: Int) {
         trackNormalEvent(
-            CarNet_Get_Video, mutableMapOf("type" to type),
-            AbsMogoApplication.getApp().applicationContext
+                CarNet_Get_Video, mutableMapOf("type" to type),
+                AbsMogoApplication.getApp().applicationContext
         )
     }
 
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosCallbackMapController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosCallbackMapController.kt
index 4ea6399cdf..a7f80df795 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosCallbackMapController.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosCallbackMapController.kt
@@ -41,7 +41,6 @@ object CosCallbackMapController : CosStatusCallback {
         path?.let {
             map.remove(path)
         }
-        Log.d(TAG, "size: ${map.size}")
     }
 
     fun unregisterCallbacks(paths: Map<String, String>?) {
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
index cddc661ccd..464744387b 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
@@ -36,22 +36,26 @@ class CosStatusController : CosStatusCallback {
     private lateinit var entity: TakeEntity
 
     private var mType: String = ""
+    private var mainInfoId: Long = 0
+    private var mFromType: String = ""
 
     //上传文件
-    fun uploadFile(picPath: MutableList<String>, entity: TakeEntity, type: String) {
+    fun uploadFile(picPath: MutableList<String>, entity: TakeEntity, type: String, mainInfoId: Long, fromType: String) {
         CosCallbackMapController.registerCallback(picPath, this)
 //        CosLogger.setLogStatus(true)
 
         this.entity = entity
         this.mType = type
-        Log.d(TAG, "uploadFile type===$type ---- picPath = $picPath ")
+        this.mainInfoId = mainInfoId
+        this.mFromType = fromType;
+        Log.d(TAG, "uploadFile type===$type ---- mainInfoId =$mainInfoId ----mFromType = $mFromType ---- picPath = $picPath ")
         trackUploadCos(3)
         if (picPath.contains("backPic")) return
         //参数说明： paths：本地文件路径；（注：上传的本地路径不要重复）；config：文件上传的优先级
         mPicEventId =
-            CosUploadManagerImpl.getInstance(AbsMogoApplication.getApp().applicationContext).eventId
+                CosUploadManagerImpl.getInstance(AbsMogoApplication.getApp().applicationContext).eventId
         CosUploadManagerImpl.getInstance(AbsMogoApplication.getApp().applicationContext)
-            .upload(picPath, mPicEventId, DbPriorityConfig.PRIORITY_HIGH)
+                .upload(picPath, mPicEventId, DbPriorityConfig.PRIORITY_HIGH)
     }
 
 
@@ -68,22 +72,21 @@ class CosStatusController : CosStatusCallback {
 
     override fun uploadCosFailed(cosPath: String?, eventId: String?, localPath: String?) {
         Log.d(TAG, "uploadCosFailed  = $localPath")
-        Log.d(TAG, "uploadCosFailed  CarCorderController.mType  = " + CarCorderController.mType)
         trackUploadCos(2)
         //语音播报 1：上报路况，2：交通检查，3：封路  默认 mType 应该为null
         if (CarCorderController.mType.equals(TANLU_ROAD_CONGESTION) || CarCorderController.mType.equals(
-                TANLU_TRAFFIC_CHECK
-            ) || CarCorderController.mType.equals(TANLU_ROAD_CLOSURE)
-            || CarCorderController.mType.equals(TANLU_ROAD_CURRENT) || CarCorderController.mType.equals(
-                TANLU_ROAD_PONDING
-            ) || CarCorderController.mType.equals(TANLU_ROAD_ICING)
-            || CarCorderController.mType.equals(TANLU_ROAD_HEAVY_FOG) || CarCorderController.mType.equals(
-                TANLU_ROAD_ACCIDENT
-            ) || CarCorderController.mType.equals(TANLU_ROAD_WORK)
+                        TANLU_TRAFFIC_CHECK
+                ) || CarCorderController.mType.equals(TANLU_ROAD_CLOSURE)
+                || CarCorderController.mType.equals(TANLU_ROAD_CURRENT) || CarCorderController.mType.equals(
+                        TANLU_ROAD_PONDING
+                ) || CarCorderController.mType.equals(TANLU_ROAD_ICING)
+                || CarCorderController.mType.equals(TANLU_ROAD_HEAVY_FOG) || CarCorderController.mType.equals(
+                        TANLU_ROAD_ACCIDENT
+                ) || CarCorderController.mType.equals(TANLU_ROAD_WORK)
         ) {
 //            VoiceController.speakVoice("cos上报失败")
             Log.d(TAG, "uploadCosFailed  mType  = $mType")
-            if (entity?.isCustom) {
+            if (entity?.isCustom && mFromType != UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO) {
                 sendGetInfoFailedReceiver("100")
             }
         }
@@ -108,10 +111,10 @@ class CosStatusController : CosStatusCallback {
     }
 
     override fun uploadCosCompleted(
-        cosPath: String?,
-        eventId: String?,
-        downloadUrl: String?,
-        localPath: String?
+            cosPath: String?,
+            eventId: String?,
+            downloadUrl: String?,
+            localPath: String?
     ) {
         Log.d(TAG, "uploadFile mType= $mType")
         Log.d(TAG, "uploadCosCompleted localPath = $localPath")
@@ -130,22 +133,21 @@ class CosStatusController : CosStatusCallback {
             Log.d(TAG, "videoAndThumbMap ${videoAndThumbMap}")
             if (videoAndThumbMap.size == 2) {
                 Log.d(TAG, "videoAndThumbMap.size == 2 ")
-
                 var locationInfo = LocationUtil.getInstance().getLocationInfo()
                 val locationStr: String = Gson().toJson(locationInfo)
                 Log.d(TAG, "locationStr = " + locationStr)
                 //如果失败，需要提示失败弹框
                 if (locationInfo.address.isNullOrEmpty() || locationInfo.cityName.isNullOrEmpty() || locationInfo.cityCode.isNullOrEmpty()
-                    || locationInfo.latitude == 0.0 || locationInfo.areaName.isNullOrEmpty() || locationInfo.street.isNullOrEmpty()
-                    || locationInfo.areaCode.isNullOrEmpty() || locationInfo.provinceName.isNullOrEmpty()
+                        || locationInfo.latitude == 0.0 || locationInfo.areaName.isNullOrEmpty() || locationInfo.street.isNullOrEmpty()
+                        || locationInfo.areaCode.isNullOrEmpty() || locationInfo.provinceName.isNullOrEmpty()
                 ) {
-                    if (entity?.isCustom) {
+                    if (entity?.isCustom && mFromType != UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO) {
                         sendGetInfoFailedReceiver("100")
                     }
                 } else {
                     //分享成功，并打点，如果是上报拥堵，需要takeVideo
                     LatLngStickyEventBus.getInstance()
-                        .postSticky(GetImageSuccessEvent(downloadUrl, mType))
+                            .postSticky(GetImageSuccessEvent(downloadUrl, mType))
                     //上传录像以及缩略图成功
                     sendInformation(INFO_TYPE_VIDEO, videoAndThumbMap)
                 }
@@ -155,10 +157,11 @@ class CosStatusController : CosStatusCallback {
             Log.d(TAG, "uploadCosCompleted 分享成功 ----mType = $mType")
 //            if (mType.equals("1") || mType.equals("-1")) {
             sendInformationDirectly(
-                INFO_TYPE_IMG,
-                mutableMapOf("pic" to downloadUrl as String),
-                mType,
-                entity
+                    INFO_TYPE_IMG,
+                    mutableMapOf("pic" to downloadUrl as String),
+                    mType,
+                    entity,
+                    mainInfoId
             )
 //            }
         }
@@ -174,7 +177,7 @@ class CosStatusController : CosStatusCallback {
 //                CosCallbackMapController.mainService?.sendCustomResult(it)
 //            }
 //        } else {
-        sendInformationDirectly(type, map, mType, entity)
+        sendInformationDirectly(type, map, mType, entity, mainInfoId)
 //        }
     }
 
@@ -182,18 +185,20 @@ class CosStatusController : CosStatusCallback {
      * 被动上报时直接上报，不用等待、选择情报类型
      */
     fun sendInformationDirectly(
-        type: Int,
-        map: Map<String, String>,
-        poiType: String,
-        entity: TakeEntity
+            type: Int,
+            map: Map<String, String>,
+            poiType: String,
+            entity: TakeEntity,
+            mainInfoId: Long
     ) {
         Log.d(TAG, "sendInformationDirectly  isCustomSend = ${entity?.isCustom}")
-        Log.d(TAG, "sendInformationDirectly  poiType= $poiType")
+        Log.d(TAG, "sendInformationDirectly  poiType= $poiType ---- mainInfoId= $mainInfoId")
         mainServiceHttpModel.sendInformationMessage(
-            type = type,
-            url = map,
-            isCustom = entity?.isCustom,
-            poiType = poiType
+                type = type,
+                url = map,
+                isCustom = entity?.isCustom,
+                poiType = poiType,
+                mainInfoId = mainInfoId
         ) { success ->
             CosCallbackMapController.unregisterCallbacks(map)
             CosCallbackMapController.mainService?.let {
@@ -208,8 +213,8 @@ class CosStatusController : CosStatusCallback {
     //上传COS
     private fun trackUploadCos(type: Int) {
         trackNormalEvent(
-            CarNet_Cos_Upload, mutableMapOf("type" to type),
-            AbsMogoApplication.getApp().applicationContext
+                CarNet_Cos_Upload, mutableMapOf("type" to type),
+                AbsMogoApplication.getApp().applicationContext
         )
     }
 
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
index 6b1d364db3..91700ea1cc 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
@@ -61,7 +61,7 @@ class MainService : Service() {
     var isCustom: Boolean = false
 
     var params: UploadParams? = null
-
+    var mainInfoId: Long = 0
 
     //发送主动上报结果广播给外部
     fun sendCustomResult(result: Boolean) {
@@ -73,12 +73,9 @@ class MainService : Service() {
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         Log.d(TAG, "onStartCommand  -----------> ")
         //清理多媒体资源和sp策略数据
-//        DelayService.launchService(this)
         clearStrategyType(this)
         //初始化埋点
         Analytics.getInstance().start(this)
-        //初始化定位
-//        LocationUtil.getInstance().initLocation()
         //参数说明：appKey: app唯一标识（比如：包名）
         CosUploadManagerImpl.getInstance(AbsMogoApplication.getApp().applicationContext)
                 .init(BuildConfig.APPLICATION_ID, 2)
@@ -90,13 +87,14 @@ class MainService : Service() {
             params?.let {
                 shareType = it.eventType
                 fromType = it.fromType
+                mainInfoId = 0 //TODO
                 Log.d(TAG, "onStartCommand  shareType = $shareType")
                 if (shareType == TANLU_ROAD_CONGESTION || shareType == TANLU_TRAFFIC_CHECK || shareType == TANLU_ROAD_CLOSURE || shareType == TANLU_ROAD_CURRENT
                         || shareType == TANLU_ROAD_PONDING || shareType == TANLU_ROAD_ICING || shareType == TANLU_ROAD_HEAVY_FOG
                         || shareType == TANLU_ROAD_ACCIDENT || shareType == TANLU_ROAD_WORK
                 ) {
 //                takePhoto(1, false, true)
-                    if (!fromType.equals("5")) { // 是策略触发，不提示
+                    if (!fromType.equals(UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO)) { // 是策略触发，不提示
                         takeVideo(it.duration, isCustom = true, id = id)
                     } else {
                         takeVideo(it.duration)
@@ -124,12 +122,6 @@ class MainService : Service() {
                     var duration = p1.getIntExtra("duration", 3)
                     takeVideo(duration, true)
                 }
-            } else if (p1.action == "com.zhidao.takevideo.test") {
-                //视频
-                takeVideo(p1.getIntExtra("duration", 10))
-            } else if (p1.action == "com.zhidao.takepic.test") {
-                //视频
-                takePhoto(1)
             }
         }
     }
@@ -144,14 +136,6 @@ class MainService : Service() {
         }
     }
 
-    /**
-     * 发送获取图片
-     */
-    fun startUploadInformation() {
-        var customIntent = Intent(sendInformationAction)
-        sendBroadcast(customIntent)
-    }
-
     override fun onBind(intent: Intent?): IBinder? {
         return null
     }
@@ -159,7 +143,6 @@ class MainService : Service() {
 
     override fun onCreate() {
         super.onCreate()
-        Log.d(TAG, "onCreate ------> 1")
         init()
         //初始化定位
         LocationUtil.getInstance().initLocation()
@@ -295,7 +278,7 @@ class MainService : Service() {
         Observable.intervalRange(0, 1, 0, 2_000, TimeUnit.MILLISECONDS)
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(Consumer {
-                    CarCorderController.takePhoto(1, 1, false, isCustom, TANLU_ROAD_CURRENT)
+                    CarCorderController.takePhoto(1, 1, false, isCustom, TANLU_ROAD_CURRENT, mainInfoId, fromType)
                 })
 //        }
 
@@ -314,7 +297,7 @@ class MainService : Service() {
         Log.d("MainService", "takeVideo --------1---->")
 //        if (isAuthorization(BaseApplication.getAppContext())) {
 //            log(TAG, "takeVideo --------2---->")
-        CarCorderController.takeVideo(1, duration, isCustom, id, if (isCustom) shareType else TANLU_ROAD_CURRENT)
+        CarCorderController.takeVideo(1, duration, isCustom, id, if (isCustom) shareType else TANLU_ROAD_CURRENT, mainInfoId, fromType)
 //        }
         postVideoAlarmTask(isInterval)
 
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt
index a2dcfde83e..9fb7e4ee51 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt
@@ -226,16 +226,17 @@ class MainServiceController {
         trafficInfoType:String = "",
         isShare:Boolean = false,
         poiType:String,
+        mainInfoId:Long,
         customSend: ((Boolean) -> Unit)? = null
     ) {
         Log.d(TAG, " sendInformationMessage  poiType = $poiType");
         //删除测试数据
         var locationInfo = LocationUtil.getInstance().getLocationInfo();
         if (locationInfo.address.isNullOrEmpty()) {
-            geoLocation(type, url, locationInfo, isCustom,trafficInfoType, isShare, customSend,poiType)
+            geoLocation(type, url, locationInfo, isCustom,trafficInfoType, isShare, customSend,poiType,mainInfoId)
         } else {
             postInformationMessage(
-                getInformationBody(type, url, locationInfo, isCustom, trafficInfoType, isShare,poiType),
+                getInformationBody(type, url, locationInfo, isCustom, trafficInfoType, isShare,poiType,mainInfoId),
                 customSend
             )
         }
@@ -251,19 +252,20 @@ class MainServiceController {
         trafficInfoType:String,
         isShare: Boolean,
         customSend: ((Boolean) -> Unit)? = null,
-        poiType: String
+        poiType: String,
+        mainInfoId: Long
     ) {
         Log.d(TAG, " geoLocation -- poiType = $poiType");
         LocationUtil.getInstance()
             .geoCodeLocation(locationInfo.toLatLngPoint(), { locInfo: LocationInfo ->
                 postInformationMessage(
-                    getInformationBody(type, url, locationInfo, isCustom, trafficInfoType, isShare, poiType),
+                    getInformationBody(type, url, locationInfo, isCustom, trafficInfoType, isShare, poiType,mainInfoId),
                     customSend
                 )
             }, {
                 //转换失败的情况下再重试一次
                 geoRetryed = if (!geoRetryed) {
-                    geoLocation(type, url, locationInfo, isCustom, trafficInfoType, isShare, customSend, poiType)
+                    geoLocation(type, url, locationInfo, isCustom, trafficInfoType, isShare, customSend, poiType,mainInfoId)
                     true
                 } else {
                     false
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt
index 951c4aceec..60d97f3871 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt
@@ -28,7 +28,8 @@ fun getInformationBody(
     isCustom: Boolean,
     trafficInfoType:String = "",
     isShare:Boolean,
-    poiType: String
+    poiType: String,
+    mainInfoId: Long
 ): InformationBody {
     var jsonArray = JsonArray()
     var type: Int
@@ -65,7 +66,8 @@ fun getInformationBody(
         trafficInfoType,
         isShare,
         locationInfo.direction,
-        poiType
+        poiType,
+        mainInfoId
     )
 }
 

From 92503c4b8538c44a6bc46f6b77fc595d454b4bb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 14 Aug 2020 14:36:29 +0800
Subject: [PATCH 16/36] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB=E9=9D=A2=E6=9D=BF=E5=85=B3=E9=97=AD=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java | 1 +
 .../com/mogo/module/v2x/fragment/V2XShareEventsFragment.java     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
index 09cfa19bf7..f1ca65c970 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
@@ -73,6 +73,7 @@ public class V2XScenarioHistoryFragment
             @Override
             public void onShearClick() {
                 V2XServiceManager.getMogoShareManager().showShareDialog();
+                V2XEventPanelFragment.Companion.getInstance().hidePanel();
             }
 
             @Override
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
index c473c778ad..3c876c725e 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
@@ -77,6 +77,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
     /*
      * 获取热心指数,分享列表等分享内容
      * */
+    @Override
     public void getShareEventResponse() {
         animatioonAcction(View.VISIBLE);
         v2XShareNetworkModel.getShareEventResponse(pageNum, 10, new V2XRefreshCallback() {

From 5e52dca19f73d114422168ae1c75dc36980501e6 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Fri, 14 Aug 2020 15:04:44 +0800
Subject: [PATCH 17/36] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E5=86=85=E9=83=A8=E5=AF=B9=20api=20=E6=8E=A5=E5=8F=A3=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E5=AE=9E=E4=BE=8B=E5=8C=96=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/apps/AppNavigatorFragment.java     |  2 +-
 .../mogo/module/apps/AppServiceHandler.java   | 21 -------------------
 .../com/mogo/module/apps/AppsFragment.java    |  2 --
 .../module/apps/AppsFragmentProvider.java     |  1 -
 .../mogo/module/apps/AppsListPresenter.java   |  2 +-
 .../com/mogo/module/apps/AppsPresenter.java   | 13 +++---------
 6 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java
index dfa80f15fd..1a18f4acc9 100644
--- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java
@@ -148,7 +148,7 @@ public class AppNavigatorFragment extends MvpFragment< AppNavigatorView, AppNavi
         } else {
             properties.put( "appversion", CommonUtils.getVersionName( getContext() ) );
         }
-        AppServiceHandler.getMogoAnalytics().track( "Launcher_APP_Icon", properties );
+        AppServiceHandler.getApis().getAnalyticsApi().track( "Launcher_APP_Icon", properties );
     }
 
     @Override
diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppServiceHandler.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppServiceHandler.java
index 043d2cd2bf..4df55c25b6 100644
--- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppServiceHandler.java
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppServiceHandler.java
@@ -1,13 +1,9 @@
 package com.mogo.module.apps;
 
-import android.content.Context;
-
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.MogoServicePaths;
-import com.mogo.service.analytics.IMogoAnalytics;
-import com.mogo.service.cardmanager.IMogoCardManager;
 
 /**
  * author : zyz
@@ -21,23 +17,6 @@ public class AppServiceHandler {
     private static final String TAG = "AppServiceHandler";
 
     private static IMogoServiceApis mApis;
-    private static IMogoCardManager mMogoCardManager;
-    private static IMogoAnalytics mMogoAnalytics;
-
-    public static void init( final Context context ) {
-        mApis = ( IMogoServiceApis ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICE_APIS ).navigation( context );
-        mMogoCardManager = mApis.getCardManagerApi();
-        mMogoAnalytics = mApis.getAnalyticsApi();
-
-    }
-
-    public static IMogoCardManager getMogoCardManager() {
-        return mMogoCardManager;
-    }
-
-    public static IMogoAnalytics getMogoAnalytics() {
-        return mMogoAnalytics;
-    }
 
     public static IMogoServiceApis getApis() {
         if ( mApis == null ) {
diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragment.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragment.java
index ed3de2b4a8..8da89c2c69 100644
--- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragment.java
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragment.java
@@ -53,8 +53,6 @@ public class AppsFragment extends MvpFragment< AppsView, AppsPresenter > impleme
                 getActivity().overridePendingTransition( 0, R.anim.module_apps_anim_exit);
             }
         } );
-//        mAppsList = findViewById( R.id.module_apps_id_apps );
-//        mAppsList.setLayoutManager( new GridLayoutManager( getContext(), 8 ) );
         mLoadingView = findViewById( R.id.module_apps_id_loading );
         mLoadingView.setVisibility( View.VISIBLE );
         mIndicator = findViewById( R.id.module_apps_id_indicator );
diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragmentProvider.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragmentProvider.java
index 1f0dc91f16..3773d88963 100644
--- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragmentProvider.java
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragmentProvider.java
@@ -74,7 +74,6 @@ public class AppsFragmentProvider implements IMogoModuleProvider {
 
     @Override
     public void init( Context context ) {
-        AppServiceHandler.init( context );
     }
 
     @Override
diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListPresenter.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListPresenter.java
index 0ad09a3b10..09b8d91a2d 100644
--- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListPresenter.java
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListPresenter.java
@@ -37,7 +37,7 @@ public class AppsListPresenter extends Presenter< AppsListView > implements IMog
     @Override
     public void onCreate( @NonNull LifecycleOwner owner ) {
         super.onCreate( owner );
-        mIntentManager = ( IMogoIntentManager ) ARouter.getInstance().build( MogoServicePaths.PATH_INTENT_MANAGER ).navigation( getContext() );
+        mIntentManager = AppServiceHandler.getApis().getIntentManagerApi();
         mIntentManager.registerIntentListener( AppsConst.COMMAND_OPERATION, this );
         mIntentManager.registerIntentListener( Intent.ACTION_CLOSE_SYSTEM_DIALOGS, this );
         AIAssist.getInstance( getContext() ).registerUnWakeupCommand( AppsConst.CMD_UN_WAKE_CLOSE_APP_LIST, AppsConst.CMD_UN_WAKE_WORDS_CLOSE_APP_LIST, this );
diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java
index 41d756ef34..d1a51e55a8 100644
--- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java
@@ -3,7 +3,6 @@ package com.mogo.module.apps;
 import androidx.annotation.NonNull;
 import androidx.lifecycle.LifecycleOwner;
 
-import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.commons.mvp.Presenter;
 import com.mogo.module.apps.applaunch.AppLaunchFilter;
 import com.mogo.module.apps.applaunch.AppLauncher;
@@ -13,11 +12,8 @@ import com.mogo.module.apps.applaunch.InternalFunctionLauncher;
 import com.mogo.module.apps.model.AppInfo;
 import com.mogo.module.apps.model.AppsModel;
 import com.mogo.module.apps.model.UnScannedApps;
-import com.mogo.service.IMogoServiceApis;
-import com.mogo.service.MogoServicePaths;
 import com.mogo.service.analytics.IMogoAnalytics;
 import com.mogo.service.cardmanager.IMogoCardManager;
-import com.mogo.service.statusmanager.IMogoStatusManager;
 import com.mogo.utils.ThreadPoolService;
 import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.logger.Logger;
@@ -42,17 +38,14 @@ public class AppsPresenter extends Presenter< AppsView > {
     private IMogoAnalytics mAnalytics;
     private AppLaunchFilter mLauncher;
 
-    private IMogoServiceApis mApis;
-
     private IMogoCardManager mCardManager;
 
     public AppsPresenter( AppsView view ) {
         super( view );
-        mApis = ( IMogoServiceApis ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICE_APIS ).navigation( getContext() );
-        mCardManager = mApis.getCardManagerApi();
+        mCardManager = AppServiceHandler.getApis().getCardManagerApi();
         InternalFunctionLauncher internalFunctionLauncher = new InternalFunctionLauncher( getContext() );
         CardAppLauncher cardAppLauncher = new CardAppLauncher( this, mCardManager );
-        GuideShowLauncher guideShowLauncher = new GuideShowLauncher( mApis.getMapServiceApi().getNavi( getContext() ) );
+        GuideShowLauncher guideShowLauncher = new GuideShowLauncher( AppServiceHandler.getApis().getMapServiceApi().getNavi( getContext() ) );
         internalFunctionLauncher.setNext( cardAppLauncher );
         cardAppLauncher.setNext( guideShowLauncher );
         guideShowLauncher.setNext( new AppLauncher() );
@@ -69,7 +62,7 @@ public class AppsPresenter extends Presenter< AppsView > {
             }
         } );
 
-        mAnalytics = mApis.getAnalyticsApi();
+        mAnalytics = AppServiceHandler.getApis().getAnalyticsApi();
     }
 
     private void renderAppsList() {

From 8e262c320bca1a58c1725d13628dfa1e2498df92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 14 Aug 2020 15:19:43 +0800
Subject: [PATCH 18/36] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=BA=8C?=
 =?UTF-8?q?=E6=AC=A1=E6=89=93=E5=BC=80=E9=9D=A2=E6=9D=BF=E5=87=BA=E8=A1=8C?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=B2=A1=E6=9C=89=E5=88=B7=E6=96=B0=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/commons/mvp/MvpFragment.java     |   4 +
 .../v2x/fragment/V2XEventPanelFragment.kt     |  19 +-
 ...e_v2x_event_panel_fragment_event_panel.xml | 166 +++++++++---------
 3 files changed, 97 insertions(+), 92 deletions(-)

diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpFragment.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpFragment.java
index be7f2bac04..0e788e140a 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpFragment.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpFragment.java
@@ -83,6 +83,10 @@ public abstract class MvpFragment<V extends IView, P extends Presenter<V>> exten
     @NonNull
     protected abstract P createPresenter();
 
+    public P getPresenter() {
+        return mPresenter;
+    }
+
     @Nullable
     protected <T extends View> T findViewById(int id) {
         if (mRootView == null) {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
index ff0cfbf53c..016d087b53 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
@@ -29,12 +29,16 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
 
     private val TAG = "EventPanelFragment"
 
+    private var isFirstLoad = false
+
     private var fragments: Array<Fragment>? = null
 
     private var mediator: TabLayoutMediator? = null
 
     private var mV2XEventPanelHistoryCountView: V2XEventPanelHistoryCountView? = null
 
+    private val mV2XScenarioHistoryFragment = V2XScenarioHistoryFragment()
+
     companion object {
         private val fragment = V2XEventPanelFragment()
         fun getInstance(): V2XEventPanelFragment {
@@ -86,7 +90,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
         Logger.d(MODULE_NAME, "事件面板初始化……")
         try {
             fragments = arrayOf(
-                    V2XScenarioHistoryFragment(),
+                    mV2XScenarioHistoryFragment,
                     V2XSurroundingFragment(),
                     V2XShareEventsFragment()
             )
@@ -143,21 +147,24 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
     fun showPanel() {
         Logger.d(MODULE_NAME, "in fragment show panel")
         clPanelContainer.visibility = View.VISIBLE
-//        V2XServiceManager.getMoGoV2XStatusManager().setEventPanelWindowShow(TAG, true)
-        // 注册语音交互
-
-        //Logger.w(MODULE_NAME, "列表View V2XPushEventDetailVH 触发 onViewAttachedToWindow");
         // 注册语音交互
         V2XVoiceManager.registerUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_HISTORY_EVENT_UN_WAKEUP, mCheckHistoryEventCb)
                 .registerUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_SURROUNDING_EVENT_UN_WAKEUP, mCheckSurroundingCb)
                 .registerUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_SHEAR_EVENT_UN_WAKEUP, mCheckShearEventCb)
                 .registerUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_CLOSE_WINDOW_UN_WAKEUP, mCloeEventCb)
+        try {
+            if (isFirstLoad) {
+                mV2XScenarioHistoryFragment.presenter.loadHistory()
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+        isFirstLoad = true
     }
 
     fun hidePanel() {
         Logger.d(MODULE_NAME, "in fragment hide panel")
         clPanelContainer.visibility = View.GONE
-//        V2XServiceManager.getMoGoV2XStatusManager().setEventPanelWindowShow(TAG, false)
         // 注册语音交互
         V2XVoiceManager.unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_HISTORY_EVENT_UN_WAKEUP)
                 .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_SURROUNDING_EVENT_UN_WAKEUP)
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
index fc8f9f24ca..17d32282fe 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
@@ -1,100 +1,94 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.mogo.module.v2x.view.RoundConstraintLayout 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/clPanelContainer"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="#10121E"
+    android:clickable="true"
+    android:paddingStart="@dimen/dp_30"
+    android:paddingEnd="@dimen/dp_30"
+    android:visibility="gone"
+    app:roundLayoutRadius="@dimen/dp_40"
+    tools:visibility="visible">
 
-    <com.mogo.module.v2x.view.RoundConstraintLayout
-        android:id="@+id/clPanelContainer"
+    <RadioGroup
+        android:id="@+id/rgTabSelect"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#10121E"
-        android:clickable="true"
-        android:paddingStart="@dimen/dp_30"
-        android:paddingEnd="@dimen/dp_30"
-        android:visibility="gone"
-        app:roundLayoutRadius="@dimen/dp_40"
-        tools:visibility="visible">
+        android:layout_height="@dimen/dp_154"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
 
-        <RadioGroup
-            android:id="@+id/rgTabSelect"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_154"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+        <RadioButton
+            android:id="@+id/rbScenarioHistory"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:button="@null"
+            android:checked="true"
+            android:gravity="center"
+            android:paddingStart="@dimen/dp_40"
+            android:paddingEnd="@dimen/dp_40"
+            android:text="出行动态"
+            android:textColor="@color/radiobutton_textcolor"
+            android:textSize="@dimen/dp_40"
+            android:textStyle="bold" />
 
-            <RadioButton
-                android:id="@+id/rbScenarioHistory"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:button="@null"
-                android:checked="true"
-                android:gravity="center"
-                android:paddingStart="@dimen/dp_40"
-                android:paddingEnd="@dimen/dp_40"
-                android:text="出行动态"
-                android:textColor="@color/radiobutton_textcolor"
-                android:textSize="@dimen/dp_40"
-                android:textStyle="bold" />
+        <View
+            android:layout_width="2dp"
+            android:layout_height="@dimen/dp_42"
+            android:background="#757575" />
 
-            <View
-                android:layout_width="2dp"
-                android:layout_height="@dimen/dp_42"
-                android:background="#757575" />
+        <RadioButton
+            android:id="@+id/rbSurroundingEvent"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:button="@null"
+            android:gravity="center"
+            android:paddingStart="@dimen/dp_40"
+            android:paddingEnd="@dimen/dp_40"
+            android:text="周边事件"
+            android:textColor="@color/radiobutton_textcolor"
+            android:textSize="@dimen/dp_40"
+            android:textStyle="bold" />
 
-            <RadioButton
-                android:id="@+id/rbSurroundingEvent"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:button="@null"
-                android:gravity="center"
-                android:paddingStart="@dimen/dp_40"
-                android:paddingEnd="@dimen/dp_40"
-                android:text="周边事件"
-                android:textColor="@color/radiobutton_textcolor"
-                android:textSize="@dimen/dp_40"
-                android:textStyle="bold" />
+        <View
+            android:layout_width="2dp"
+            android:layout_height="@dimen/dp_42"
+            android:background="#757575" />
 
-            <View
-                android:layout_width="2dp"
-                android:layout_height="@dimen/dp_42"
-                android:background="#757575" />
+        <RadioButton
+            android:id="@+id/rbShareEvents"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:button="@null"
+            android:gravity="center"
+            android:paddingStart="@dimen/dp_40"
+            android:paddingEnd="@dimen/dp_40"
+            android:text="我的分享"
+            android:textColor="@color/radiobutton_textcolor"
+            android:textSize="@dimen/dp_40"
+            android:textStyle="bold" />
+    </RadioGroup>
 
-            <RadioButton
-                android:id="@+id/rbShareEvents"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:button="@null"
-                android:gravity="center"
-                android:paddingStart="@dimen/dp_40"
-                android:paddingEnd="@dimen/dp_40"
-                android:text="我的分享"
-                android:textColor="@color/radiobutton_textcolor"
-                android:textSize="@dimen/dp_40"
-                android:textStyle="bold" />
-        </RadioGroup>
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/vpEventPanel"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:nestedScrollingEnabled="false"
+        android:overScrollMode="never"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/rgTabSelect" />
 
-        <androidx.viewpager2.widget.ViewPager2
-            android:id="@+id/vpEventPanel"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:nestedScrollingEnabled="false"
-            android:overScrollMode="never"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/rgTabSelect" />
+    <ImageView
+        android:id="@+id/btnHidePanels"
+        android:layout_width="@dimen/dp_88"
+        android:layout_height="@dimen/dp_88"
+        android:background="@drawable/icon_window_close"
+        app:layout_constraintBottom_toBottomOf="@+id/rgTabSelect"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/rgTabSelect" />
 
-        <ImageView
-            android:id="@+id/btnHidePanels"
-            android:layout_width="@dimen/dp_88"
-            android:layout_height="@dimen/dp_88"
-            android:background="@drawable/icon_window_close"
-            app:layout_constraintBottom_toBottomOf="@+id/rgTabSelect"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/rgTabSelect" />
-
-    </com.mogo.module.v2x.view.RoundConstraintLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</com.mogo.module.v2x.view.RoundConstraintLayout>

From 40ca7eb01ef9680008232afefe7c2739437e7598 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Fri, 14 Aug 2020 16:04:54 +0800
Subject: [PATCH 19/36] =?UTF-8?q?1.=20=E4=BC=98=E5=8C=96=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=A1=8C=E9=9D=A2=E6=8E=A7=E4=BB=B6=E5=AE=9E=E7=8E=B0=202.=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=A9=E6=B0=94=E6=8E=A7=E4=BB=B6=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=203.=20=E5=B0=86=E6=A8=A1=E5=9D=97=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9A=84=E8=BF=87=E6=9C=9F=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E9=BB=98=E8=AE=A4=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |   1 -
 .../module/back/Back2LauncherFragment.java    |  33 ---
 .../back/BackToLauncherModuleProvider.java    |  35 ---
 .../module/back/BackToMainHomeManager.java    |  60 ++---
 .../com/mogo/module/back/utils/Utils.java     |  20 --
 .../back/utils/WindowManagerViewHelper.java   | 213 ------------------
 .../module/back/utils/WindowViewHandler.java  | 119 ----------
 .../back/utils/WindowViewUIController.java    |  16 --
 .../src/main/res/values-xhdpi/dimens.xml      |   4 +-
 .../src/main/res/values/dimens.xml            |   4 +-
 .../layout/module_ext_layout_extensions.xml   |   1 +
 .../service/module/IMogoModuleProvider.java   |  31 ++-
 12 files changed, 52 insertions(+), 485 deletions(-)
 delete mode 100644 modules/mogo-module-back/src/main/java/com/mogo/module/back/Back2LauncherFragment.java
 delete mode 100644 modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/Utils.java
 delete mode 100644 modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowManagerViewHelper.java
 delete mode 100644 modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowViewHandler.java
 delete mode 100644 modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowViewUIController.java

diff --git a/app/build.gradle b/app/build.gradle
index 9fa3526b19..011d1620a1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -266,7 +266,6 @@ dependencies {
             exclude group: 'com.mogo.module', module: 'module-share'
         }
         implementation rootProject.ext.dependencies.moduletanluapi
-
         implementation rootProject.ext.dependencies.mogomonitor
         implementation rootProject.ext.dependencies.mogomodulewidgets
     } else {
diff --git a/modules/mogo-module-back/src/main/java/com/mogo/module/back/Back2LauncherFragment.java b/modules/mogo-module-back/src/main/java/com/mogo/module/back/Back2LauncherFragment.java
deleted file mode 100644
index 68a9943451..0000000000
--- a/modules/mogo-module-back/src/main/java/com/mogo/module/back/Back2LauncherFragment.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.mogo.module.back;
-
-import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
-import com.mogo.utils.logger.Logger;
-
-/**
- * @author congtaowang
- * @since 2020-02-26
- * <p>
- * 描述
- */
-public class Back2LauncherFragment extends Fragment {
-
-    private static final String TAG = "Back2LauncherFragment";
-
-    @Override
-    public void onCreate( @Nullable Bundle savedInstanceState ) {
-        super.onCreate( savedInstanceState );
-        BackToMainHomeManager.addMainHomeView();
-        Logger.d( TAG, "addMainHomeView" );
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        BackToMainHomeManager.removeMainHomeView();
-        Logger.d( TAG, "removeMainHomeView" );
-    }
-}
diff --git a/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToLauncherModuleProvider.java b/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToLauncherModuleProvider.java
index a92fcecdee..c03d6944b3 100644
--- a/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToLauncherModuleProvider.java
+++ b/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToLauncherModuleProvider.java
@@ -49,46 +49,11 @@ public class BackToLauncherModuleProvider implements IMogoModuleProvider {
         return BackToLauncherConst.MODULE_NAME;
     }
 
-    @Override
-    public IMogoModuleLifecycle getCardLifecycle() {
-        return null;
-    }
-
-    @Override
-    public IMogoMapListener getMapListener() {
-        return null;
-    }
-
     @Override
     public int getType() {
         return ModuleType.TYPE_SERVICE;
     }
 
-    @Override
-    public IMogoNaviListener getNaviListener() {
-        return null;
-    }
-
-    @Override
-    public IMogoLocationListener getLocationListener() {
-        return null;
-    }
-
-    @Override
-    public IMogoMarkerClickListener getMarkerClickListener() {
-        return null;
-    }
-
-    @Override
-    public String getAppPackage() {
-        return null;
-    }
-
-    @Override
-    public String getAppName() {
-        return null;
-    }
-
     @Override
     public void init( Context context ) {
         if ( CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ) {
diff --git a/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToMainHomeManager.java b/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToMainHomeManager.java
index db17ed40fc..ea748c53fe 100644
--- a/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToMainHomeManager.java
+++ b/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToMainHomeManager.java
@@ -1,28 +1,20 @@
 package com.mogo.module.back;
 
-import android.content.Context;
 import android.content.Intent;
-import android.graphics.PixelFormat;
-import android.os.Build;
 import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
 import android.view.WindowManager;
 
 import com.mogo.commons.AbsMogoApplication;
-import com.mogo.module.back.utils.WindowManagerViewHelper;
+import com.mogo.module.common.wm.WindowManagerView;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.fragmentmanager.IMogoFragmentManager;
 import com.mogo.service.statusmanager.IMogoStatusManager;
-import com.mogo.utils.AppUtils;
 import com.mogo.utils.logger.Logger;
 
 public class BackToMainHomeManager {
 
     private static final String TAG = "BackToMainHomeManager";
 
-    private static View mBackView;
-
     private static IMogoFragmentManager mFragmentManager;
     private static IMogoStatusManager mStatusManager;
     private static IMogoServiceApis mApis;
@@ -45,7 +37,7 @@ public class BackToMainHomeManager {
             return;
         }
 
-        Intent intent2 = new Intent(  );
+        Intent intent2 = new Intent();
         // 是否发自系统消息
         intent2.putExtra( "isHomeKeyDown", false );
         mApis.getIntentManagerApi().invoke( Intent.ACTION_CLOSE_SYSTEM_DIALOGS, intent2 );
@@ -58,40 +50,34 @@ public class BackToMainHomeManager {
         AbsMogoApplication.getApp().startActivity( intent );
     }
 
+    private static WindowManagerView mWindowManagerView;
+
     public static void addMainHomeView() {
         Logger.d( "BackToMainHomeManager", "addMainHomeView" );
-        if ( mBackView != null ) WindowManagerViewHelper.removeView( mBackView );
-        mBackView = LayoutInflater.from( AbsMogoApplication.getApp() ).inflate( R.layout.mogo_module_back_home_back_layout, null );
-        final Context context = mBackView.getContext();
-        if ( context == null || context.getApplicationContext() == null ) {
-            return;
+
+        if ( mWindowManagerView == null ) {
+            mWindowManagerView = new WindowManagerView.Builder( AbsMogoApplication.getApp() )
+                    .contentView( R.layout.mogo_module_back_home_back_layout )
+                    .position( AbsMogoApplication.getApp().getResources().getDimensionPixelOffset( R.dimen.module_back_main_home_icon_left ),
+                            AbsMogoApplication.getApp().getResources().getDimensionPixelOffset( R.dimen.module_back_main_home_icon_top ) )
+                    .size( WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT )
+                    .gravity( Gravity.LEFT | Gravity.TOP )
+                    .showInWindowManager();
+            mWindowManagerView.attachTouchEvent( view -> {
+                backToLauncher();
+            } );
         }
-        WindowManager windowManager = ( WindowManager ) context.getApplicationContext().getSystemService( Context.WINDOW_SERVICE );
-        if ( windowManager == null ) {
-            return;
+        try {
+            mWindowManagerView.show();
+        } catch ( Exception e ) {
+            e.printStackTrace();
         }
-        mBackView.setOnClickListener( view -> {
-            backToLauncher();
-        } );
-        WindowManager.LayoutParams params = new WindowManager.LayoutParams();
-        params.height = WindowManager.LayoutParams.WRAP_CONTENT;
-        params.width = WindowManager.LayoutParams.WRAP_CONTENT;
-        params.x = AbsMogoApplication.getApp().getResources().getDimensionPixelOffset( R.dimen.module_back_main_home_icon_left );
-        params.y = AbsMogoApplication.getApp().getResources().getDimensionPixelOffset( R.dimen.module_back_main_home_icon_top );
-        params.gravity = Gravity.LEFT | Gravity.CENTER;
-        if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ) {
-            params.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
-        } else {
-            params.type = WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
-        }
-        params.format = PixelFormat.RGBA_8888;
-        params.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON;
-        windowManager.addView( mBackView, params );
-        WindowManagerViewHelper.attachMovementEvent( mBackView, params );
     }
 
     public static void removeMainHomeView() {
-        WindowManagerViewHelper.removeView( mBackView );
+        if ( mWindowManagerView != null ) {
+            mWindowManagerView.dismiss();
+        }
     }
 
 }
diff --git a/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/Utils.java b/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/Utils.java
deleted file mode 100644
index ace6e4bdae..0000000000
--- a/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/Utils.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.mogo.module.back.utils;
-
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-
-import com.mogo.commons.AbsMogoApplication;
-
-public class Utils {
-    public static boolean isActivityExits( String packageName, String classStr ) {
-        Intent intent = new Intent();
-        intent.setClassName( packageName, classStr );
-        ResolveInfo resolveInfo = AbsMogoApplication.getApp().getPackageManager().resolveActivity( intent, PackageManager.MATCH_DEFAULT_ONLY );
-        if ( resolveInfo != null ) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-}
diff --git a/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowManagerViewHelper.java b/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowManagerViewHelper.java
deleted file mode 100644
index ff03d5ab96..0000000000
--- a/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowManagerViewHelper.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.mogo.module.back.utils;
-
-import android.content.Context;
-import android.graphics.PixelFormat;
-import android.os.Build;
-import android.view.Gravity;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.WindowManager;
-
-/**
- * @author congtaowang
- * @since 2019-04-30
- * <p>
- * 向 window manager 添加 view
- */
-public class WindowManagerViewHelper {
-
-    public static void addView( View view ) {
-
-        final Context context = view.getContext();
-        if ( context == null || context.getApplicationContext() == null ) {
-            return;
-        }
-        WindowManager windowManager = ( WindowManager ) context.getApplicationContext().getSystemService( Context.WINDOW_SERVICE );
-        if ( windowManager == null ) {
-            return;
-        }
-        WindowManager.LayoutParams params = new WindowManager.LayoutParams();
-        params.height = WindowManager.LayoutParams.WRAP_CONTENT;
-        params.width = WindowManager.LayoutParams.WRAP_CONTENT;
-        params.gravity = Gravity.LEFT | Gravity.CENTER;
-        params.type = getFitWindowParamsType();
-        params.format = PixelFormat.RGBA_8888;
-        params.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON;
-        windowManager.addView( view, params );
-
-        attachMovementEvent( view, params );
-    }
-
-    private static int getFitWindowParamsType() {
-        int type;
-        if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1 ) {
-            // Need request permission.
-            type = WindowManager.LayoutParams.TYPE_PHONE;
-        } else if ( Build.MODEL.equalsIgnoreCase( "MI 5" ) ) {
-            // MI 5 phone not display crawler dot in android 7.0
-            type = WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
-        } else {
-            // It's will be dismissed automatically 3s after showing in Android 25.
-            type = WindowManager.LayoutParams.TYPE_TOAST;
-        }
-        return type;
-    }
-
-    public static void removeView( View view ) {
-        if ( view == null || view.getContext() == null || view.getContext().getApplicationContext() == null ) {
-            return;
-        }
-        WindowManager windowManager = ( WindowManager ) view.getContext().getApplicationContext().getSystemService( Context.WINDOW_SERVICE );
-        if ( windowManager == null ) {
-            return;
-        }
-        windowManager.removeViewImmediate( view );
-        DispatchTouchEventWrapper.getInstance().release();
-
-    }
-
-    public static void attachMovementEvent( View view, WindowManager.LayoutParams params ) {
-        if ( view == null ) {
-            return;
-        }
-        view.setOnTouchListener( ( v, event ) -> {
-            DispatchTouchEventWrapper.getInstance()
-                    .attach( view, params )
-                    .handle( event );
-            return false;
-        } );
-    }
-
-    static class DispatchTouchEventWrapper {
-
-        private WindowViewHandler mWindowViewHandler;
-
-        int mActionDownX = -1;
-        int mActionDownY = -1;
-
-        /**
-         * Flag whether move after touch down.
-         */
-        boolean mMoveFlag = false;
-
-        private static volatile DispatchTouchEventWrapper INST;
-
-        private DispatchTouchEventWrapper() {
-        }
-
-        public static DispatchTouchEventWrapper getInstance() {
-            if ( INST == null ) {
-                synchronized ( DispatchTouchEventWrapper.class ) {
-                    if ( INST == null ) {
-                        INST = new DispatchTouchEventWrapper();
-                    }
-                }
-            }
-            return INST;
-        }
-
-        public DispatchTouchEventWrapper attach( View windowView, WindowManager.LayoutParams params ) {
-            if ( mWindowViewHandler == null || mWindowViewHandler.getWindowView() != windowView ) {
-                mWindowViewHandler = new WindowViewHandler.DefaultHandler( windowView, params );
-            }
-            return this;
-        }
-
-        public boolean handle( MotionEvent event ) {
-            switch ( event.getAction() & MotionEvent.ACTION_MASK ) {
-                case MotionEvent.ACTION_DOWN:
-                    if ( onActionDown( event ) ) {
-                        return true;
-                    }
-                    break;
-                case MotionEvent.ACTION_MOVE:
-                    if ( onActionMove( event ) ) {
-                        return true;
-                    }
-                    break;
-                case MotionEvent.ACTION_UP:
-                    if ( onActionUp( event ) ) {
-                        return true;
-                    }
-                    break;
-            }
-            return false;
-        }
-
-        private boolean onActionDown( MotionEvent event ) {
-            mActionDownX = ( ( int ) event.getRawX() );
-            mActionDownY = ( ( int ) event.getRawY() );
-            if ( mWindowViewHandler != null ) {
-                mWindowViewHandler.recordNewPosition();
-                return true;
-            }
-            return false;
-        }
-
-        private boolean onActionMove( MotionEvent event ) {
-
-            if ( Math.abs( event.getRawX() - mActionDownX ) >= 20
-                    || Math.abs( event.getRawY() - mActionDownY ) >= 20 ) {
-                mMoveFlag = true;
-            }
-
-            if ( isLastDownValueLegal() ) {
-                moveWindowView( event );
-                return true;
-            }
-            return false;
-        }
-
-        private boolean onActionUp( MotionEvent event ) {
-            if ( isClickEventLike() ) {
-                if ( mWindowViewHandler != null ) {
-                    mWindowViewHandler.performClickLike();
-                }
-            } else {
-                if ( mWindowViewHandler != null ) {
-                    mWindowViewHandler.moveToEdge();
-                    mWindowViewHandler.recordNewPosition();
-                }
-            }
-            mMoveFlag = false;
-            clearLastDownAxisValue();
-            return true;
-        }
-
-        private void clearLastDownAxisValue() {
-            mActionDownX = mActionDownY = -1;
-        }
-
-        private boolean isLastDownValueLegal() {
-            return mActionDownX != -1 && mActionDownY != -1;
-        }
-
-        private void moveWindowView( MotionEvent event ) {
-            if ( mWindowViewHandler != null ) {
-                mWindowViewHandler.move( event, mActionDownX, mActionDownY );
-            }
-        }
-
-        /**
-         * Simulate click event just like set {@link View.OnClickListener}
-         *
-         * @return
-         */
-        private boolean isClickEventLike() {
-            System.out.println( mMoveFlag );
-            return isLastDownValueLegal() && !mMoveFlag;
-        }
-
-        public void release() {
-            if ( mWindowViewHandler != null ) {
-                mWindowViewHandler.release();
-            }
-            mWindowViewHandler = null;
-            mActionDownX = -1;
-            mActionDownY = -1;
-            mMoveFlag = false;
-            INST = null;
-        }
-    }
-
-}
diff --git a/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowViewHandler.java b/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowViewHandler.java
deleted file mode 100644
index bbd48717cd..0000000000
--- a/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowViewHandler.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.mogo.module.back.utils;
-
-import android.content.Context;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.WindowManager;
-
-import com.mogo.commons.AbsMogoApplication;
-import com.mogo.utils.WindowUtils;
-
-
-/**
- * Created by congtaowang on 2017/6/20.
- */
-
-public interface WindowViewHandler {
-
-    View getWindowView();
-
-    void recordNewPosition();
-
-    void move(MotionEvent event, int downX, int downY);
-
-    void release();
-
-    void moveToEdge();
-
-    void performClickLike();
-
-    class DefaultHandler implements WindowViewHandler {
-
-        protected View mWindowView;
-
-        protected int mWindowViewLeft = -1;
-        protected int mWindowViewTop = -1;
-
-        private WindowManager.LayoutParams mParams;
-
-        public DefaultHandler( View windowView, WindowManager.LayoutParams params ) {
-            this.mWindowView = windowView;
-            mParams = params;
-        }
-
-        @Override
-        public View getWindowView() {
-            return mWindowView;
-        }
-
-        @Override
-        public void recordNewPosition() {
-            mWindowViewLeft = mParams.x;
-            mWindowViewTop = mParams.y;
-        }
-
-        @Override
-        public void move( MotionEvent event, int downX, int downY ) {
-            move( ( ( int ) ( event.getRawX() - downX ) ),
-                    ( ( int ) ( event.getRawY() - downY ) ) );
-        }
-
-        private void move( int distanceX, int distanceY ) {
-            if ( mWindowView == null ) {
-                return;
-            }
-            mParams.x = mWindowViewLeft + distanceX;
-            mParams.y = mWindowViewTop + distanceY;
-            WindowManager wm = ( ( WindowManager ) mWindowView.getContext().getSystemService( Context.WINDOW_SERVICE ) );
-
-            if ( wm == null ) {
-                return;
-            }
-
-            if ( mWindowView instanceof WindowViewUIController ) {
-                if ( mParams.x > WindowUtils.getScreenWidth( AbsMogoApplication.getApp() ) / 2 ) {
-                    ( ( WindowViewUIController ) mWindowView ).rightMode();
-                } else {
-                    ( ( WindowViewUIController ) mWindowView ).leftMode();
-                }
-            }
-
-            wm.updateViewLayout( mWindowView, alignLayoutParamsBoundary( mParams ) );
-        }
-
-        @Override
-        public void moveToEdge() {
-            if ( mWindowView == null ) {
-                return;
-            }
-            WindowManager wm = ( ( WindowManager ) mWindowView.getContext().getSystemService( Context.WINDOW_SERVICE ) );
-
-            if ( mParams.x > WindowUtils.getScreenWidth( AbsMogoApplication.getApp() ) / 2 ) {
-                mParams.x = WindowUtils.getScreenWidth( AbsMogoApplication.getApp() ) - mWindowView.getMeasuredWidth();
-            } else {
-                mParams.x = 0;
-            }
-
-            wm.updateViewLayout( mWindowView, alignLayoutParamsBoundary( mParams ) );
-        }
-
-        protected WindowManager.LayoutParams alignLayoutParamsBoundary( WindowManager.LayoutParams params ) {
-            return params;
-        }
-
-        @Override
-        public void performClickLike() {
-            if ( mWindowView instanceof WindowViewUIController ) {
-                ( ( WindowViewUIController ) mWindowView ).performClickLike();
-            }
-        }
-
-        @Override
-        public void release() {
-            mWindowView = null;
-            mWindowViewLeft = -1;
-            mWindowViewTop = -1;
-        }
-    }
-
-}
diff --git a/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowViewUIController.java b/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowViewUIController.java
deleted file mode 100644
index e329cdea68..0000000000
--- a/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowViewUIController.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mogo.module.back.utils;
-
-/**
- * @author congtaowang
- * @since 2019-05-12
- * <p>
- * 描述
- */
-public interface WindowViewUIController {
-
-    void leftMode();
-
-    void rightMode();
-
-    void performClickLike();
-}
diff --git a/modules/mogo-module-back/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-back/src/main/res/values-xhdpi/dimens.xml
index bd57c0f8ae..e0b0d888aa 100644
--- a/modules/mogo-module-back/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-back/src/main/res/values-xhdpi/dimens.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="module_back_main_home_icon_size">140px</dimen>
-    <dimen name="module_back_main_home_icon_left">0px</dimen>
-    <dimen name="module_back_main_home_icon_top">190px</dimen>
+    <dimen name="module_back_main_home_icon_left">30px</dimen>
+    <dimen name="module_back_main_home_icon_top">230px</dimen>
 
 </resources>
 
diff --git a/modules/mogo-module-back/src/main/res/values/dimens.xml b/modules/mogo-module-back/src/main/res/values/dimens.xml
index dfab5dd86c..a50305933f 100644
--- a/modules/mogo-module-back/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-back/src/main/res/values/dimens.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="module_back_main_home_icon_size">80px</dimen>
-    <dimen name="module_back_main_home_icon_left">0px</dimen>
-    <dimen name="module_back_main_home_icon_top">100px</dimen>
+    <dimen name="module_back_main_home_icon_left">16px</dimen>
+    <dimen name="module_back_main_home_icon_top">140px</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml
index 446c7541b0..222f293173 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml
@@ -12,6 +12,7 @@
         android:gravity="center"
         android:paddingStart="@dimen/module_ext_weather_container_paddingLeft"
         android:paddingEnd="@dimen/module_ext_weather_container_paddingRight"
+        android:layout_marginEnd="@dimen/module_ext_msg_marginRight"
         android:visibility="invisible"
         app:layout_constraintRight_toLeftOf="@+id/module_ext_id_msg"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoModuleProvider.java b/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoModuleProvider.java
index 59dad0341e..524010759b 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoModuleProvider.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoModuleProvider.java
@@ -51,7 +51,10 @@ public interface IMogoModuleProvider extends IProvider {
      *
      * @return
      */
-    IMogoModuleLifecycle getCardLifecycle();
+    @Deprecated
+    default IMogoModuleLifecycle getCardLifecycle() {
+        return null;
+    }
 
     /**
      * 地图监听对象
@@ -60,7 +63,9 @@ public interface IMogoModuleProvider extends IProvider {
      * @return
      */
     @Deprecated
-    IMogoMapListener getMapListener();
+    default IMogoMapListener getMapListener() {
+        return null;
+    }
 
     /**
      * 是哪种类型的提供者
@@ -78,7 +83,9 @@ public interface IMogoModuleProvider extends IProvider {
      * @return
      */
     @Deprecated
-    IMogoNaviListener getNaviListener();
+    default IMogoNaviListener getNaviListener() {
+        return null;
+    }
 
     /**
      * 定位变化监听：此接口接受地图定位信息
@@ -87,7 +94,9 @@ public interface IMogoModuleProvider extends IProvider {
      * @return
      */
     @Deprecated
-    IMogoLocationListener getLocationListener();
+    default IMogoLocationListener getLocationListener() {
+        return null;
+    }
 
     /**
      * marker 点击回调
@@ -96,19 +105,27 @@ public interface IMogoModuleProvider extends IProvider {
      * @return
      */
     @Deprecated
-    IMogoMarkerClickListener getMarkerClickListener();
+    default IMogoMarkerClickListener getMarkerClickListener() {
+        return null;
+    }
 
     /**
      * 获取模块对应 app 的包名
      *
      * @return
      */
-    String getAppPackage();
+    @Deprecated
+    default String getAppPackage() {
+        return "";
+    }
 
     /**
      * 获取对应模块 app 名称
      *
      * @return
      */
-    String getAppName();
+    @Deprecated
+    default String getAppName() {
+        return "";
+    }
 }

From 0093886a355d54e9fa5e5376a86c2610c8f07137 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Fri, 14 Aug 2020 16:13:03 +0800
Subject: [PATCH 20/36] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=BB=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=AF=B9=E8=BF=94=E5=9B=9E=E6=A8=A1=E5=9D=97=E7=9A=84?=
 =?UTF-8?q?=E8=80=A6=E5=90=88=E5=85=B3=E7=B3=BB=EF=BC=8C=E5=B0=BD=E9=87=8F?=
 =?UTF-8?q?=E8=AE=A9=E5=8A=9F=E8=83=BD=E5=9C=A8application=E9=87=8C?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=8A=A0=E8=BD=BD=E5=92=8C=E5=88=86=E9=85=8D?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                      |  2 ++
 .../main/java/com/mogo/launcher/MogoApplication.java  |  3 ++-
 .../module/main/launcher/MainLauncherActivity.java    | 11 -----------
 modules/mogo-module-main/build.gradle                 |  2 --
 .../main/java/com/mogo/module/main/MainActivity.java  |  8 --------
 5 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 011d1620a1..9141820b14 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -268,6 +268,7 @@ dependencies {
         implementation rootProject.ext.dependencies.moduletanluapi
         implementation rootProject.ext.dependencies.mogomonitor
         implementation rootProject.ext.dependencies.mogomodulewidgets
+        implementation rootProject.ext.dependencies.mogomoduleback
     } else {
         launcherImplementation project(':main-extensions:mogo-module-main-launcher')
         independentImplementation project(':main-extensions:mogo-module-main-independent')
@@ -285,6 +286,7 @@ dependencies {
         implementation project(':libraries:mogo-tanlu-api')
         implementation project(':modules:mogo-module-monitor')
         implementation project(':modules:mogo-module-widgets')
+        implementation project(':modules:mogo-module-back')
     }
 
     apply from: "./functions/baseservices.gradle"
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index 99cd7e7447..9fe3dd3a05 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -12,6 +12,7 @@ import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.network.Utils;
 import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant;
+import com.mogo.module.back.BackToLauncherConst;
 import com.mogo.module.carchatting.card.CallChatConstant;
 import com.mogo.module.common.MogoModule;
 import com.mogo.module.common.MogoModulePaths;
@@ -57,8 +58,8 @@ public class MogoApplication extends AbsMogoApplication {
 //        MogoModulePaths.addModule(new MogoModule(PATH_GUIDE_FRAGMENT, PATH_GUIDE_MODULE_NAME));
         MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_AGREEMENT, AuthorizeConstant.PATH_AGREEMENT_MODULE_NAME ) );
 
-        //运营位卡片，需要默认显示，放在第一个加载
         if ( DebugConfig.isLauncher() ) {
+            MogoModulePaths.addModule( new MogoModule( BackToLauncherConst.MODULE_PATH, BackToLauncherConst.MODULE_NAME ) );
             MogoModulePaths.addModule( new MogoModule( MediaConstants.TAG, MediaConstants.MODULE_TYPE ) );
         } else {
             MogoModulePaths.addBaseModule( new MogoModule( MogoWidgetsProvider.PATH, MogoWidgetsProvider.NAME ) );
diff --git a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
index a788b150f9..48700344f5 100644
--- a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
+++ b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
@@ -7,15 +7,10 @@ import android.view.View;
 
 import androidx.annotation.Nullable;
 
-import com.mogo.module.back.BackToLauncherConst;
-import com.mogo.module.common.MogoModule;
-import com.mogo.module.common.MogoModulePaths;
-import com.mogo.module.common.utils.CarSeries;
 import com.mogo.module.extensions.utils.ExtensionsConfig;
 import com.mogo.module.main.MainActivity;
 import com.mogo.module.main.cards.MogoModulesManager;
 import com.mogo.service.intent.IMogoIntentListener;
-import com.mogo.utils.logger.Logger;
 
 /**
  * 针对作为Launcher的情况，做个性化操作
@@ -32,12 +27,6 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
         ExtensionsConfig.setNeedRequestUserInfo( true );
     }
 
-    @Override
-    protected void addModule() {
-        super.addModule();
-        MogoModulePaths.addModule( new MogoModule( BackToLauncherConst.MODULE_PATH, BackToLauncherConst.MODULE_NAME ) );
-    }
-
     @Override
     protected void loadContainerModules() {
         super.loadContainerModules();
diff --git a/modules/mogo-module-main/build.gradle b/modules/mogo-module-main/build.gradle
index 15cea46fba..f900dbe293 100644
--- a/modules/mogo-module-main/build.gradle
+++ b/modules/mogo-module-main/build.gradle
@@ -50,7 +50,6 @@ dependencies {
         api rootProject.ext.dependencies.moduleservice
         api rootProject.ext.dependencies.moduleapps
         api rootProject.ext.dependencies.moduleextensions
-        api rootProject.ext.dependencies.mogomoduleback
     } else {
         api project(":foudations:mogo-utils")
         api project(":foudations:mogo-commons")
@@ -61,7 +60,6 @@ dependencies {
         api project(':services:mogo-service')
         api project(':modules:mogo-module-apps')
         api project(':modules:mogo-module-extensions')
-        api project(':modules:mogo-module-back')
     }
 }
 
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
index 076535be25..7975e3c195 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -152,7 +152,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
             MapCenterPointStrategy.setMapCenterPointByScene( mMogoMapUIController, Scene.AIMLESS );
 
             // 加载地图，触发地图加载完毕回调，在初始化其他卡片模块，保证卡片模块可以正确获取地图相关服务。
-            addModule();
             loadContainerModules();
             MogoModulesManager.getInstance().loadModules();
             mPresenter.delayOperations();
@@ -185,13 +184,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
         startService( intent );
     }
 
-    /**
-     * 添加模块
-     */
-    protected void addModule() {
-
-    }
-
     protected void loadContainerModules() {
 //        MogoModulesManager.getInstance().loadExtensionsModule( R.id.module_main_id_header_fragment_container );
         MogoModulesManager.getInstance().loadEntrancesModule( R.id.module_main_id_entrance_fragment_container );

From 3f5124d1104b1d026619c8449d34470c5cd3a9ee Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Fri, 14 Aug 2020 16:04:54 +0800
Subject: [PATCH 21/36] =?UTF-8?q?1.=20=E4=BC=98=E5=8C=96=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=A1=8C=E9=9D=A2=E6=8E=A7=E4=BB=B6=E5=AE=9E=E7=8E=B0=202.=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=A9=E6=B0=94=E6=8E=A7=E4=BB=B6=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=203.=20=E5=B0=86=E6=A8=A1=E5=9D=97=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9A=84=E8=BF=87=E6=9C=9F=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E9=BB=98=E8=AE=A4=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |   1 -
 .../module/back/Back2LauncherFragment.java    |  33 ---
 .../back/BackToLauncherModuleProvider.java    |  35 ---
 .../module/back/BackToMainHomeManager.java    |  60 ++---
 .../com/mogo/module/back/utils/Utils.java     |  20 --
 .../back/utils/WindowManagerViewHelper.java   | 213 ------------------
 .../module/back/utils/WindowViewHandler.java  | 119 ----------
 .../back/utils/WindowViewUIController.java    |  16 --
 .../src/main/res/values-xhdpi/dimens.xml      |   4 +-
 .../src/main/res/values/dimens.xml            |   4 +-
 .../layout/module_ext_layout_extensions.xml   |   1 +
 .../service/module/IMogoModuleProvider.java   |  31 ++-
 12 files changed, 52 insertions(+), 485 deletions(-)
 delete mode 100644 modules/mogo-module-back/src/main/java/com/mogo/module/back/Back2LauncherFragment.java
 delete mode 100644 modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/Utils.java
 delete mode 100644 modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowManagerViewHelper.java
 delete mode 100644 modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowViewHandler.java
 delete mode 100644 modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowViewUIController.java

diff --git a/app/build.gradle b/app/build.gradle
index 9fa3526b19..011d1620a1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -266,7 +266,6 @@ dependencies {
             exclude group: 'com.mogo.module', module: 'module-share'
         }
         implementation rootProject.ext.dependencies.moduletanluapi
-
         implementation rootProject.ext.dependencies.mogomonitor
         implementation rootProject.ext.dependencies.mogomodulewidgets
     } else {
diff --git a/modules/mogo-module-back/src/main/java/com/mogo/module/back/Back2LauncherFragment.java b/modules/mogo-module-back/src/main/java/com/mogo/module/back/Back2LauncherFragment.java
deleted file mode 100644
index 68a9943451..0000000000
--- a/modules/mogo-module-back/src/main/java/com/mogo/module/back/Back2LauncherFragment.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.mogo.module.back;
-
-import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
-import com.mogo.utils.logger.Logger;
-
-/**
- * @author congtaowang
- * @since 2020-02-26
- * <p>
- * 描述
- */
-public class Back2LauncherFragment extends Fragment {
-
-    private static final String TAG = "Back2LauncherFragment";
-
-    @Override
-    public void onCreate( @Nullable Bundle savedInstanceState ) {
-        super.onCreate( savedInstanceState );
-        BackToMainHomeManager.addMainHomeView();
-        Logger.d( TAG, "addMainHomeView" );
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        BackToMainHomeManager.removeMainHomeView();
-        Logger.d( TAG, "removeMainHomeView" );
-    }
-}
diff --git a/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToLauncherModuleProvider.java b/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToLauncherModuleProvider.java
index a92fcecdee..c03d6944b3 100644
--- a/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToLauncherModuleProvider.java
+++ b/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToLauncherModuleProvider.java
@@ -49,46 +49,11 @@ public class BackToLauncherModuleProvider implements IMogoModuleProvider {
         return BackToLauncherConst.MODULE_NAME;
     }
 
-    @Override
-    public IMogoModuleLifecycle getCardLifecycle() {
-        return null;
-    }
-
-    @Override
-    public IMogoMapListener getMapListener() {
-        return null;
-    }
-
     @Override
     public int getType() {
         return ModuleType.TYPE_SERVICE;
     }
 
-    @Override
-    public IMogoNaviListener getNaviListener() {
-        return null;
-    }
-
-    @Override
-    public IMogoLocationListener getLocationListener() {
-        return null;
-    }
-
-    @Override
-    public IMogoMarkerClickListener getMarkerClickListener() {
-        return null;
-    }
-
-    @Override
-    public String getAppPackage() {
-        return null;
-    }
-
-    @Override
-    public String getAppName() {
-        return null;
-    }
-
     @Override
     public void init( Context context ) {
         if ( CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ) {
diff --git a/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToMainHomeManager.java b/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToMainHomeManager.java
index db17ed40fc..ea748c53fe 100644
--- a/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToMainHomeManager.java
+++ b/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToMainHomeManager.java
@@ -1,28 +1,20 @@
 package com.mogo.module.back;
 
-import android.content.Context;
 import android.content.Intent;
-import android.graphics.PixelFormat;
-import android.os.Build;
 import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
 import android.view.WindowManager;
 
 import com.mogo.commons.AbsMogoApplication;
-import com.mogo.module.back.utils.WindowManagerViewHelper;
+import com.mogo.module.common.wm.WindowManagerView;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.fragmentmanager.IMogoFragmentManager;
 import com.mogo.service.statusmanager.IMogoStatusManager;
-import com.mogo.utils.AppUtils;
 import com.mogo.utils.logger.Logger;
 
 public class BackToMainHomeManager {
 
     private static final String TAG = "BackToMainHomeManager";
 
-    private static View mBackView;
-
     private static IMogoFragmentManager mFragmentManager;
     private static IMogoStatusManager mStatusManager;
     private static IMogoServiceApis mApis;
@@ -45,7 +37,7 @@ public class BackToMainHomeManager {
             return;
         }
 
-        Intent intent2 = new Intent(  );
+        Intent intent2 = new Intent();
         // 是否发自系统消息
         intent2.putExtra( "isHomeKeyDown", false );
         mApis.getIntentManagerApi().invoke( Intent.ACTION_CLOSE_SYSTEM_DIALOGS, intent2 );
@@ -58,40 +50,34 @@ public class BackToMainHomeManager {
         AbsMogoApplication.getApp().startActivity( intent );
     }
 
+    private static WindowManagerView mWindowManagerView;
+
     public static void addMainHomeView() {
         Logger.d( "BackToMainHomeManager", "addMainHomeView" );
-        if ( mBackView != null ) WindowManagerViewHelper.removeView( mBackView );
-        mBackView = LayoutInflater.from( AbsMogoApplication.getApp() ).inflate( R.layout.mogo_module_back_home_back_layout, null );
-        final Context context = mBackView.getContext();
-        if ( context == null || context.getApplicationContext() == null ) {
-            return;
+
+        if ( mWindowManagerView == null ) {
+            mWindowManagerView = new WindowManagerView.Builder( AbsMogoApplication.getApp() )
+                    .contentView( R.layout.mogo_module_back_home_back_layout )
+                    .position( AbsMogoApplication.getApp().getResources().getDimensionPixelOffset( R.dimen.module_back_main_home_icon_left ),
+                            AbsMogoApplication.getApp().getResources().getDimensionPixelOffset( R.dimen.module_back_main_home_icon_top ) )
+                    .size( WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT )
+                    .gravity( Gravity.LEFT | Gravity.TOP )
+                    .showInWindowManager();
+            mWindowManagerView.attachTouchEvent( view -> {
+                backToLauncher();
+            } );
         }
-        WindowManager windowManager = ( WindowManager ) context.getApplicationContext().getSystemService( Context.WINDOW_SERVICE );
-        if ( windowManager == null ) {
-            return;
+        try {
+            mWindowManagerView.show();
+        } catch ( Exception e ) {
+            e.printStackTrace();
         }
-        mBackView.setOnClickListener( view -> {
-            backToLauncher();
-        } );
-        WindowManager.LayoutParams params = new WindowManager.LayoutParams();
-        params.height = WindowManager.LayoutParams.WRAP_CONTENT;
-        params.width = WindowManager.LayoutParams.WRAP_CONTENT;
-        params.x = AbsMogoApplication.getApp().getResources().getDimensionPixelOffset( R.dimen.module_back_main_home_icon_left );
-        params.y = AbsMogoApplication.getApp().getResources().getDimensionPixelOffset( R.dimen.module_back_main_home_icon_top );
-        params.gravity = Gravity.LEFT | Gravity.CENTER;
-        if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ) {
-            params.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
-        } else {
-            params.type = WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
-        }
-        params.format = PixelFormat.RGBA_8888;
-        params.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON;
-        windowManager.addView( mBackView, params );
-        WindowManagerViewHelper.attachMovementEvent( mBackView, params );
     }
 
     public static void removeMainHomeView() {
-        WindowManagerViewHelper.removeView( mBackView );
+        if ( mWindowManagerView != null ) {
+            mWindowManagerView.dismiss();
+        }
     }
 
 }
diff --git a/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/Utils.java b/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/Utils.java
deleted file mode 100644
index ace6e4bdae..0000000000
--- a/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/Utils.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.mogo.module.back.utils;
-
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-
-import com.mogo.commons.AbsMogoApplication;
-
-public class Utils {
-    public static boolean isActivityExits( String packageName, String classStr ) {
-        Intent intent = new Intent();
-        intent.setClassName( packageName, classStr );
-        ResolveInfo resolveInfo = AbsMogoApplication.getApp().getPackageManager().resolveActivity( intent, PackageManager.MATCH_DEFAULT_ONLY );
-        if ( resolveInfo != null ) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-}
diff --git a/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowManagerViewHelper.java b/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowManagerViewHelper.java
deleted file mode 100644
index ff03d5ab96..0000000000
--- a/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowManagerViewHelper.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.mogo.module.back.utils;
-
-import android.content.Context;
-import android.graphics.PixelFormat;
-import android.os.Build;
-import android.view.Gravity;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.WindowManager;
-
-/**
- * @author congtaowang
- * @since 2019-04-30
- * <p>
- * 向 window manager 添加 view
- */
-public class WindowManagerViewHelper {
-
-    public static void addView( View view ) {
-
-        final Context context = view.getContext();
-        if ( context == null || context.getApplicationContext() == null ) {
-            return;
-        }
-        WindowManager windowManager = ( WindowManager ) context.getApplicationContext().getSystemService( Context.WINDOW_SERVICE );
-        if ( windowManager == null ) {
-            return;
-        }
-        WindowManager.LayoutParams params = new WindowManager.LayoutParams();
-        params.height = WindowManager.LayoutParams.WRAP_CONTENT;
-        params.width = WindowManager.LayoutParams.WRAP_CONTENT;
-        params.gravity = Gravity.LEFT | Gravity.CENTER;
-        params.type = getFitWindowParamsType();
-        params.format = PixelFormat.RGBA_8888;
-        params.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON;
-        windowManager.addView( view, params );
-
-        attachMovementEvent( view, params );
-    }
-
-    private static int getFitWindowParamsType() {
-        int type;
-        if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1 ) {
-            // Need request permission.
-            type = WindowManager.LayoutParams.TYPE_PHONE;
-        } else if ( Build.MODEL.equalsIgnoreCase( "MI 5" ) ) {
-            // MI 5 phone not display crawler dot in android 7.0
-            type = WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
-        } else {
-            // It's will be dismissed automatically 3s after showing in Android 25.
-            type = WindowManager.LayoutParams.TYPE_TOAST;
-        }
-        return type;
-    }
-
-    public static void removeView( View view ) {
-        if ( view == null || view.getContext() == null || view.getContext().getApplicationContext() == null ) {
-            return;
-        }
-        WindowManager windowManager = ( WindowManager ) view.getContext().getApplicationContext().getSystemService( Context.WINDOW_SERVICE );
-        if ( windowManager == null ) {
-            return;
-        }
-        windowManager.removeViewImmediate( view );
-        DispatchTouchEventWrapper.getInstance().release();
-
-    }
-
-    public static void attachMovementEvent( View view, WindowManager.LayoutParams params ) {
-        if ( view == null ) {
-            return;
-        }
-        view.setOnTouchListener( ( v, event ) -> {
-            DispatchTouchEventWrapper.getInstance()
-                    .attach( view, params )
-                    .handle( event );
-            return false;
-        } );
-    }
-
-    static class DispatchTouchEventWrapper {
-
-        private WindowViewHandler mWindowViewHandler;
-
-        int mActionDownX = -1;
-        int mActionDownY = -1;
-
-        /**
-         * Flag whether move after touch down.
-         */
-        boolean mMoveFlag = false;
-
-        private static volatile DispatchTouchEventWrapper INST;
-
-        private DispatchTouchEventWrapper() {
-        }
-
-        public static DispatchTouchEventWrapper getInstance() {
-            if ( INST == null ) {
-                synchronized ( DispatchTouchEventWrapper.class ) {
-                    if ( INST == null ) {
-                        INST = new DispatchTouchEventWrapper();
-                    }
-                }
-            }
-            return INST;
-        }
-
-        public DispatchTouchEventWrapper attach( View windowView, WindowManager.LayoutParams params ) {
-            if ( mWindowViewHandler == null || mWindowViewHandler.getWindowView() != windowView ) {
-                mWindowViewHandler = new WindowViewHandler.DefaultHandler( windowView, params );
-            }
-            return this;
-        }
-
-        public boolean handle( MotionEvent event ) {
-            switch ( event.getAction() & MotionEvent.ACTION_MASK ) {
-                case MotionEvent.ACTION_DOWN:
-                    if ( onActionDown( event ) ) {
-                        return true;
-                    }
-                    break;
-                case MotionEvent.ACTION_MOVE:
-                    if ( onActionMove( event ) ) {
-                        return true;
-                    }
-                    break;
-                case MotionEvent.ACTION_UP:
-                    if ( onActionUp( event ) ) {
-                        return true;
-                    }
-                    break;
-            }
-            return false;
-        }
-
-        private boolean onActionDown( MotionEvent event ) {
-            mActionDownX = ( ( int ) event.getRawX() );
-            mActionDownY = ( ( int ) event.getRawY() );
-            if ( mWindowViewHandler != null ) {
-                mWindowViewHandler.recordNewPosition();
-                return true;
-            }
-            return false;
-        }
-
-        private boolean onActionMove( MotionEvent event ) {
-
-            if ( Math.abs( event.getRawX() - mActionDownX ) >= 20
-                    || Math.abs( event.getRawY() - mActionDownY ) >= 20 ) {
-                mMoveFlag = true;
-            }
-
-            if ( isLastDownValueLegal() ) {
-                moveWindowView( event );
-                return true;
-            }
-            return false;
-        }
-
-        private boolean onActionUp( MotionEvent event ) {
-            if ( isClickEventLike() ) {
-                if ( mWindowViewHandler != null ) {
-                    mWindowViewHandler.performClickLike();
-                }
-            } else {
-                if ( mWindowViewHandler != null ) {
-                    mWindowViewHandler.moveToEdge();
-                    mWindowViewHandler.recordNewPosition();
-                }
-            }
-            mMoveFlag = false;
-            clearLastDownAxisValue();
-            return true;
-        }
-
-        private void clearLastDownAxisValue() {
-            mActionDownX = mActionDownY = -1;
-        }
-
-        private boolean isLastDownValueLegal() {
-            return mActionDownX != -1 && mActionDownY != -1;
-        }
-
-        private void moveWindowView( MotionEvent event ) {
-            if ( mWindowViewHandler != null ) {
-                mWindowViewHandler.move( event, mActionDownX, mActionDownY );
-            }
-        }
-
-        /**
-         * Simulate click event just like set {@link View.OnClickListener}
-         *
-         * @return
-         */
-        private boolean isClickEventLike() {
-            System.out.println( mMoveFlag );
-            return isLastDownValueLegal() && !mMoveFlag;
-        }
-
-        public void release() {
-            if ( mWindowViewHandler != null ) {
-                mWindowViewHandler.release();
-            }
-            mWindowViewHandler = null;
-            mActionDownX = -1;
-            mActionDownY = -1;
-            mMoveFlag = false;
-            INST = null;
-        }
-    }
-
-}
diff --git a/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowViewHandler.java b/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowViewHandler.java
deleted file mode 100644
index bbd48717cd..0000000000
--- a/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowViewHandler.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.mogo.module.back.utils;
-
-import android.content.Context;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.WindowManager;
-
-import com.mogo.commons.AbsMogoApplication;
-import com.mogo.utils.WindowUtils;
-
-
-/**
- * Created by congtaowang on 2017/6/20.
- */
-
-public interface WindowViewHandler {
-
-    View getWindowView();
-
-    void recordNewPosition();
-
-    void move(MotionEvent event, int downX, int downY);
-
-    void release();
-
-    void moveToEdge();
-
-    void performClickLike();
-
-    class DefaultHandler implements WindowViewHandler {
-
-        protected View mWindowView;
-
-        protected int mWindowViewLeft = -1;
-        protected int mWindowViewTop = -1;
-
-        private WindowManager.LayoutParams mParams;
-
-        public DefaultHandler( View windowView, WindowManager.LayoutParams params ) {
-            this.mWindowView = windowView;
-            mParams = params;
-        }
-
-        @Override
-        public View getWindowView() {
-            return mWindowView;
-        }
-
-        @Override
-        public void recordNewPosition() {
-            mWindowViewLeft = mParams.x;
-            mWindowViewTop = mParams.y;
-        }
-
-        @Override
-        public void move( MotionEvent event, int downX, int downY ) {
-            move( ( ( int ) ( event.getRawX() - downX ) ),
-                    ( ( int ) ( event.getRawY() - downY ) ) );
-        }
-
-        private void move( int distanceX, int distanceY ) {
-            if ( mWindowView == null ) {
-                return;
-            }
-            mParams.x = mWindowViewLeft + distanceX;
-            mParams.y = mWindowViewTop + distanceY;
-            WindowManager wm = ( ( WindowManager ) mWindowView.getContext().getSystemService( Context.WINDOW_SERVICE ) );
-
-            if ( wm == null ) {
-                return;
-            }
-
-            if ( mWindowView instanceof WindowViewUIController ) {
-                if ( mParams.x > WindowUtils.getScreenWidth( AbsMogoApplication.getApp() ) / 2 ) {
-                    ( ( WindowViewUIController ) mWindowView ).rightMode();
-                } else {
-                    ( ( WindowViewUIController ) mWindowView ).leftMode();
-                }
-            }
-
-            wm.updateViewLayout( mWindowView, alignLayoutParamsBoundary( mParams ) );
-        }
-
-        @Override
-        public void moveToEdge() {
-            if ( mWindowView == null ) {
-                return;
-            }
-            WindowManager wm = ( ( WindowManager ) mWindowView.getContext().getSystemService( Context.WINDOW_SERVICE ) );
-
-            if ( mParams.x > WindowUtils.getScreenWidth( AbsMogoApplication.getApp() ) / 2 ) {
-                mParams.x = WindowUtils.getScreenWidth( AbsMogoApplication.getApp() ) - mWindowView.getMeasuredWidth();
-            } else {
-                mParams.x = 0;
-            }
-
-            wm.updateViewLayout( mWindowView, alignLayoutParamsBoundary( mParams ) );
-        }
-
-        protected WindowManager.LayoutParams alignLayoutParamsBoundary( WindowManager.LayoutParams params ) {
-            return params;
-        }
-
-        @Override
-        public void performClickLike() {
-            if ( mWindowView instanceof WindowViewUIController ) {
-                ( ( WindowViewUIController ) mWindowView ).performClickLike();
-            }
-        }
-
-        @Override
-        public void release() {
-            mWindowView = null;
-            mWindowViewLeft = -1;
-            mWindowViewTop = -1;
-        }
-    }
-
-}
diff --git a/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowViewUIController.java b/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowViewUIController.java
deleted file mode 100644
index e329cdea68..0000000000
--- a/modules/mogo-module-back/src/main/java/com/mogo/module/back/utils/WindowViewUIController.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mogo.module.back.utils;
-
-/**
- * @author congtaowang
- * @since 2019-05-12
- * <p>
- * 描述
- */
-public interface WindowViewUIController {
-
-    void leftMode();
-
-    void rightMode();
-
-    void performClickLike();
-}
diff --git a/modules/mogo-module-back/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-back/src/main/res/values-xhdpi/dimens.xml
index bd57c0f8ae..e0b0d888aa 100644
--- a/modules/mogo-module-back/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-back/src/main/res/values-xhdpi/dimens.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="module_back_main_home_icon_size">140px</dimen>
-    <dimen name="module_back_main_home_icon_left">0px</dimen>
-    <dimen name="module_back_main_home_icon_top">190px</dimen>
+    <dimen name="module_back_main_home_icon_left">30px</dimen>
+    <dimen name="module_back_main_home_icon_top">230px</dimen>
 
 </resources>
 
diff --git a/modules/mogo-module-back/src/main/res/values/dimens.xml b/modules/mogo-module-back/src/main/res/values/dimens.xml
index dfab5dd86c..a50305933f 100644
--- a/modules/mogo-module-back/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-back/src/main/res/values/dimens.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="module_back_main_home_icon_size">80px</dimen>
-    <dimen name="module_back_main_home_icon_left">0px</dimen>
-    <dimen name="module_back_main_home_icon_top">100px</dimen>
+    <dimen name="module_back_main_home_icon_left">16px</dimen>
+    <dimen name="module_back_main_home_icon_top">140px</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml
index 446c7541b0..222f293173 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml
@@ -12,6 +12,7 @@
         android:gravity="center"
         android:paddingStart="@dimen/module_ext_weather_container_paddingLeft"
         android:paddingEnd="@dimen/module_ext_weather_container_paddingRight"
+        android:layout_marginEnd="@dimen/module_ext_msg_marginRight"
         android:visibility="invisible"
         app:layout_constraintRight_toLeftOf="@+id/module_ext_id_msg"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoModuleProvider.java b/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoModuleProvider.java
index 59dad0341e..524010759b 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoModuleProvider.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoModuleProvider.java
@@ -51,7 +51,10 @@ public interface IMogoModuleProvider extends IProvider {
      *
      * @return
      */
-    IMogoModuleLifecycle getCardLifecycle();
+    @Deprecated
+    default IMogoModuleLifecycle getCardLifecycle() {
+        return null;
+    }
 
     /**
      * 地图监听对象
@@ -60,7 +63,9 @@ public interface IMogoModuleProvider extends IProvider {
      * @return
      */
     @Deprecated
-    IMogoMapListener getMapListener();
+    default IMogoMapListener getMapListener() {
+        return null;
+    }
 
     /**
      * 是哪种类型的提供者
@@ -78,7 +83,9 @@ public interface IMogoModuleProvider extends IProvider {
      * @return
      */
     @Deprecated
-    IMogoNaviListener getNaviListener();
+    default IMogoNaviListener getNaviListener() {
+        return null;
+    }
 
     /**
      * 定位变化监听：此接口接受地图定位信息
@@ -87,7 +94,9 @@ public interface IMogoModuleProvider extends IProvider {
      * @return
      */
     @Deprecated
-    IMogoLocationListener getLocationListener();
+    default IMogoLocationListener getLocationListener() {
+        return null;
+    }
 
     /**
      * marker 点击回调
@@ -96,19 +105,27 @@ public interface IMogoModuleProvider extends IProvider {
      * @return
      */
     @Deprecated
-    IMogoMarkerClickListener getMarkerClickListener();
+    default IMogoMarkerClickListener getMarkerClickListener() {
+        return null;
+    }
 
     /**
      * 获取模块对应 app 的包名
      *
      * @return
      */
-    String getAppPackage();
+    @Deprecated
+    default String getAppPackage() {
+        return "";
+    }
 
     /**
      * 获取对应模块 app 名称
      *
      * @return
      */
-    String getAppName();
+    @Deprecated
+    default String getAppName() {
+        return "";
+    }
 }

From 0b26d689a5e5ad7c82dc8a552dd0dfff1d4afac5 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Fri, 14 Aug 2020 16:13:03 +0800
Subject: [PATCH 22/36] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=BB=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=AF=B9=E8=BF=94=E5=9B=9E=E6=A8=A1=E5=9D=97=E7=9A=84?=
 =?UTF-8?q?=E8=80=A6=E5=90=88=E5=85=B3=E7=B3=BB=EF=BC=8C=E5=B0=BD=E9=87=8F?=
 =?UTF-8?q?=E8=AE=A9=E5=8A=9F=E8=83=BD=E5=9C=A8application=E9=87=8C?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=8A=A0=E8=BD=BD=E5=92=8C=E5=88=86=E9=85=8D?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                      |  2 ++
 .../main/java/com/mogo/launcher/MogoApplication.java  |  3 ++-
 .../module/main/launcher/MainLauncherActivity.java    | 11 -----------
 modules/mogo-module-main/build.gradle                 |  2 --
 .../main/java/com/mogo/module/main/MainActivity.java  |  8 --------
 5 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 011d1620a1..9141820b14 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -268,6 +268,7 @@ dependencies {
         implementation rootProject.ext.dependencies.moduletanluapi
         implementation rootProject.ext.dependencies.mogomonitor
         implementation rootProject.ext.dependencies.mogomodulewidgets
+        implementation rootProject.ext.dependencies.mogomoduleback
     } else {
         launcherImplementation project(':main-extensions:mogo-module-main-launcher')
         independentImplementation project(':main-extensions:mogo-module-main-independent')
@@ -285,6 +286,7 @@ dependencies {
         implementation project(':libraries:mogo-tanlu-api')
         implementation project(':modules:mogo-module-monitor')
         implementation project(':modules:mogo-module-widgets')
+        implementation project(':modules:mogo-module-back')
     }
 
     apply from: "./functions/baseservices.gradle"
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index 99cd7e7447..9fe3dd3a05 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -12,6 +12,7 @@ import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.network.Utils;
 import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant;
+import com.mogo.module.back.BackToLauncherConst;
 import com.mogo.module.carchatting.card.CallChatConstant;
 import com.mogo.module.common.MogoModule;
 import com.mogo.module.common.MogoModulePaths;
@@ -57,8 +58,8 @@ public class MogoApplication extends AbsMogoApplication {
 //        MogoModulePaths.addModule(new MogoModule(PATH_GUIDE_FRAGMENT, PATH_GUIDE_MODULE_NAME));
         MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_AGREEMENT, AuthorizeConstant.PATH_AGREEMENT_MODULE_NAME ) );
 
-        //运营位卡片，需要默认显示，放在第一个加载
         if ( DebugConfig.isLauncher() ) {
+            MogoModulePaths.addModule( new MogoModule( BackToLauncherConst.MODULE_PATH, BackToLauncherConst.MODULE_NAME ) );
             MogoModulePaths.addModule( new MogoModule( MediaConstants.TAG, MediaConstants.MODULE_TYPE ) );
         } else {
             MogoModulePaths.addBaseModule( new MogoModule( MogoWidgetsProvider.PATH, MogoWidgetsProvider.NAME ) );
diff --git a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
index a788b150f9..48700344f5 100644
--- a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
+++ b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
@@ -7,15 +7,10 @@ import android.view.View;
 
 import androidx.annotation.Nullable;
 
-import com.mogo.module.back.BackToLauncherConst;
-import com.mogo.module.common.MogoModule;
-import com.mogo.module.common.MogoModulePaths;
-import com.mogo.module.common.utils.CarSeries;
 import com.mogo.module.extensions.utils.ExtensionsConfig;
 import com.mogo.module.main.MainActivity;
 import com.mogo.module.main.cards.MogoModulesManager;
 import com.mogo.service.intent.IMogoIntentListener;
-import com.mogo.utils.logger.Logger;
 
 /**
  * 针对作为Launcher的情况，做个性化操作
@@ -32,12 +27,6 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
         ExtensionsConfig.setNeedRequestUserInfo( true );
     }
 
-    @Override
-    protected void addModule() {
-        super.addModule();
-        MogoModulePaths.addModule( new MogoModule( BackToLauncherConst.MODULE_PATH, BackToLauncherConst.MODULE_NAME ) );
-    }
-
     @Override
     protected void loadContainerModules() {
         super.loadContainerModules();
diff --git a/modules/mogo-module-main/build.gradle b/modules/mogo-module-main/build.gradle
index 15cea46fba..f900dbe293 100644
--- a/modules/mogo-module-main/build.gradle
+++ b/modules/mogo-module-main/build.gradle
@@ -50,7 +50,6 @@ dependencies {
         api rootProject.ext.dependencies.moduleservice
         api rootProject.ext.dependencies.moduleapps
         api rootProject.ext.dependencies.moduleextensions
-        api rootProject.ext.dependencies.mogomoduleback
     } else {
         api project(":foudations:mogo-utils")
         api project(":foudations:mogo-commons")
@@ -61,7 +60,6 @@ dependencies {
         api project(':services:mogo-service')
         api project(':modules:mogo-module-apps')
         api project(':modules:mogo-module-extensions')
-        api project(':modules:mogo-module-back')
     }
 }
 
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
index 076535be25..7975e3c195 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -152,7 +152,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
             MapCenterPointStrategy.setMapCenterPointByScene( mMogoMapUIController, Scene.AIMLESS );
 
             // 加载地图，触发地图加载完毕回调，在初始化其他卡片模块，保证卡片模块可以正确获取地图相关服务。
-            addModule();
             loadContainerModules();
             MogoModulesManager.getInstance().loadModules();
             mPresenter.delayOperations();
@@ -185,13 +184,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
         startService( intent );
     }
 
-    /**
-     * 添加模块
-     */
-    protected void addModule() {
-
-    }
-
     protected void loadContainerModules() {
 //        MogoModulesManager.getInstance().loadExtensionsModule( R.id.module_main_id_header_fragment_container );
         MogoModulesManager.getInstance().loadEntrancesModule( R.id.module_main_id_entrance_fragment_container );

From 6dad21af4bb289e8e53dd4d021689c0501aff906 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Fri, 14 Aug 2020 16:36:24 +0800
Subject: [PATCH 23/36] ui

---
 .../src/main/res/layout/item_v2x_event_share_no_more.xml    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_no_more.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_no_more.xml
index 79f0a1a814..9e55b321e9 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_no_more.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_no_more.xml
@@ -2,8 +2,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="40px"
-    android:paddingBottom="40px">
+    android:paddingTop="16px"
+    android:paddingBottom="30px">
 
     <TextView
         android:id="@+id/event_share_load_no_more"
@@ -15,7 +15,7 @@
         android:paddingBottom="12px"
         android:text="没有更多记录了"
         android:textColor="#FFFFFF"
-        android:textSize="18px" />
+        android:textSize="14px" />
 
     <ImageView
         android:id="@+id/left_line"

From 4a43fb4d6e45a282a3c3f7b143e688876c015761 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Fri, 14 Aug 2020 16:36:24 +0800
Subject: [PATCH 24/36] ui

---
 .../src/main/res/layout/item_v2x_event_share_no_more.xml    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_no_more.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_no_more.xml
index 79f0a1a814..9e55b321e9 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_no_more.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_no_more.xml
@@ -2,8 +2,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="40px"
-    android:paddingBottom="40px">
+    android:paddingTop="16px"
+    android:paddingBottom="30px">
 
     <TextView
         android:id="@+id/event_share_load_no_more"
@@ -15,7 +15,7 @@
         android:paddingBottom="12px"
         android:text="没有更多记录了"
         android:textColor="#FFFFFF"
-        android:textSize="18px" />
+        android:textSize="14px" />
 
     <ImageView
         android:id="@+id/left_line"

From 05d87df108ed801d3e6f8701ff539af2805d5b76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 14 Aug 2020 16:41:55 +0800
Subject: [PATCH 25/36] =?UTF-8?q?=E3=80=90=E6=99=BA=E6=85=A7=E9=A9=BE?=
 =?UTF-8?q?=E9=A9=B61.1.2=E3=80=91=E8=AF=AD=E9=9F=B3tab=E9=A1=B5=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=EF=BC=8C=E4=BC=9A=E5=A4=9A=E8=A7=A6=E5=8F=91=E5=9F=8B?=
 =?UTF-8?q?=E7=82=B9=20http://jira.zhidaohulian.com/browse/E85XJD-161?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |  2 +-
 .../adapter/holder/V2XOtherSeekHelpVH.java    | 22 ++++++++++++++-----
 .../V2XScenarioHistoryOtherSeekHelpVH.java    | 21 +++++++++++++-----
 .../v2x/fragment/V2XEventPanelFragment.kt     |  6 ++---
 .../src/main/res/raw/scenario_seek_help.json  |  2 +-
 5 files changed, 36 insertions(+), 17 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/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java
index 57bb85ae10..537f4f2b45 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java
@@ -170,12 +170,22 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder<V2XEventShowEntity> {
                         .displayImage(mV2XPushMessageEntity.getHeadImgUrl(), ivHead);
             }
             tvName.setText(mV2XPushMessageEntity.getDisplayName());
-            SpanUtils.with(tvDistance)
-                    .append("" + (int) mV2XPushMessageEntity.getDistance())
-                    .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_text))
-                    .append("m")
-                    .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_title))
-                    .create();
+
+            if (mV2XPushMessageEntity.getDistance() > 1000) {
+                SpanUtils.with(tvDistance)
+                        .append("" + (int) mV2XPushMessageEntity.getDistance() / 1000)
+                        .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_text))
+                        .append("km")
+                        .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_title))
+                        .create();
+            } else {
+                SpanUtils.with(tvDistance)
+                        .append("" + (int) mV2XPushMessageEntity.getDistance())
+                        .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_text))
+                        .append("m")
+                        .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_title))
+                        .create();
+            }
             SimpleDateFormat sdf = new SimpleDateFormat("HH:mm", Locale.CHINA);
             String eventTime = String.format("%s发布求助信息",
                     sdf.format(new Date(mV2XPushMessageEntity.getCreateTime())));
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
index e729e747b3..a6fe789e8f 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
@@ -80,12 +80,21 @@ public class V2XScenarioHistoryOtherSeekHelpVH extends V2XBaseViewHolder<V2XHist
                         .displayImage(xPushMessageEntity.getHeadImgUrl(), mIvFaultHelpHead);
             }
 
-            SpanUtils.with(mTvFaultHelpDistance)
-                    .append("" + (int) xPushMessageEntity.getDistance())
-                    .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_text))
-                    .append("m")
-                    .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_title))
-                    .create();
+            if (xPushMessageEntity.getDistance() > 1000) {
+                SpanUtils.with(mTvFaultHelpDistance)
+                        .append("" + (int) xPushMessageEntity.getDistance() / 1000)
+                        .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_text))
+                        .append("km")
+                        .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_title))
+                        .create();
+            } else {
+                SpanUtils.with(mTvFaultHelpDistance)
+                        .append("" + (int) xPushMessageEntity.getDistance())
+                        .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_text))
+                        .append("m")
+                        .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_title))
+                        .create();
+            }
             SimpleDateFormat sdf = new SimpleDateFormat("HH:mm", Locale.CHINA);
             String eventTime = String.format("%s发布求助信息",
                     sdf.format(new Date(xPushMessageEntity.getCreateTime())));
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
index 016d087b53..c4e71eae6f 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
@@ -49,7 +49,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
     // 打开出行动态TAB
     private val mCheckHistoryEventCb = V2XVoiceCallbackListener { command: String?, intent: Intent? ->
         try {
-            rgTabSelect?.check(R.id.rbScenarioHistory)
+            rbScenarioHistory?.isChecked=true
         } catch (e: java.lang.Exception) {
             e.printStackTrace()
         }
@@ -58,7 +58,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
     // 打开周边事件TAB
     private val mCheckSurroundingCb = V2XVoiceCallbackListener { command: String?, intent: Intent? ->
         try {
-            rgTabSelect?.check(R.id.rbSurroundingEvent)
+            rbSurroundingEvent?.isChecked=true
         } catch (e: java.lang.Exception) {
             e.printStackTrace()
         }
@@ -67,7 +67,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
     // 打开我的分享TAB
     private val mCheckShearEventCb = V2XVoiceCallbackListener { command: String?, intent: Intent? ->
         try {
-            rgTabSelect?.check(R.id.rbShareEvents)
+            rbShareEvents?.isChecked=true
         } catch (e: java.lang.Exception) {
             e.printStackTrace()
         }
diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_seek_help.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_seek_help.json
index a4667dded3..cd5cf436af 100644
--- a/modules/mogo-module-v2x/src/main/res/raw/scenario_seek_help.json
+++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_seek_help.json
@@ -3,7 +3,7 @@
     {
       "createTime":1593678359872,
       "distance":100,
-      "lat":39.966668,
+      "lat":39.866668,
       "lon":116.411211,
       "sn":"ZD801B1932L00041",
       "targetId":20007,

From f18bd5c863fa02b8f17ad56f935640e5f58873ef Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Fri, 14 Aug 2020 16:44:10 +0800
Subject: [PATCH 26/36] =?UTF-8?q?[rm]=20=20=E5=88=A0=E9=99=A4=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/adapter/V2XShareEventAdapter.java     |  2 +-
 .../layout/item_v2x_event_share_no_more.xml   | 45 -------------------
 2 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_no_more.xml

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
index 1768ed13bf..3a84438115 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
@@ -66,7 +66,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
             shareLoadStatusViewHolder holder = new shareLoadStatusViewHolder(v);
             return holder;
         }else {
-            View v = shareLayoutInflater.inflate(R.layout.item_v2x_event_share_no_more, parent,
+            View v = shareLayoutInflater.inflate(R.layout.footer_nomore_view, parent,
                     false);
             shareLoadNoMoreViewHolder holder = new shareLoadNoMoreViewHolder(v);
             return holder;
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_no_more.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_no_more.xml
deleted file mode 100644
index 9e55b321e9..0000000000
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_no_more.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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="wrap_content"
-    android:paddingTop="16px"
-    android:paddingBottom="30px">
-
-    <TextView
-        android:id="@+id/event_share_load_no_more"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:alpha="0.6"
-        android:paddingTop="12px"
-        android:paddingBottom="12px"
-        android:text="没有更多记录了"
-        android:textColor="#FFFFFF"
-        android:textSize="14px" />
-
-    <ImageView
-        android:id="@+id/left_line"
-        android:layout_width="wrap_content"
-        android:layout_height="0.5px"
-        android:alpha="0.5"
-        android:layout_alignParentLeft="true"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="46px"
-        android:layout_marginRight="16px"
-        android:layout_toLeftOf="@id/event_share_load_no_more"
-        android:background="#FFFFFF" />
-
-    <ImageView
-        android:id="@+id/right_line"
-        android:layout_width="wrap_content"
-        android:layout_height="0.5px"
-        android:alpha="0.5"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="16px"
-        android:layout_marginRight="46px"
-        android:layout_toRightOf="@id/event_share_load_no_more"
-        android:background="#FFFFFF" />
-
-
-</RelativeLayout>
\ No newline at end of file

From 819b6ad1764553bab35fb197390d894fd773232b Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Fri, 14 Aug 2020 16:44:10 +0800
Subject: [PATCH 27/36] =?UTF-8?q?[rm]=20=20=E5=88=A0=E9=99=A4=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/adapter/V2XShareEventAdapter.java     |  2 +-
 .../layout/item_v2x_event_share_no_more.xml   | 45 -------------------
 2 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_no_more.xml

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
index 1768ed13bf..3a84438115 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
@@ -66,7 +66,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
             shareLoadStatusViewHolder holder = new shareLoadStatusViewHolder(v);
             return holder;
         }else {
-            View v = shareLayoutInflater.inflate(R.layout.item_v2x_event_share_no_more, parent,
+            View v = shareLayoutInflater.inflate(R.layout.footer_nomore_view, parent,
                     false);
             shareLoadNoMoreViewHolder holder = new shareLoadNoMoreViewHolder(v);
             return holder;
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_no_more.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_no_more.xml
deleted file mode 100644
index 9e55b321e9..0000000000
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_no_more.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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="wrap_content"
-    android:paddingTop="16px"
-    android:paddingBottom="30px">
-
-    <TextView
-        android:id="@+id/event_share_load_no_more"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:alpha="0.6"
-        android:paddingTop="12px"
-        android:paddingBottom="12px"
-        android:text="没有更多记录了"
-        android:textColor="#FFFFFF"
-        android:textSize="14px" />
-
-    <ImageView
-        android:id="@+id/left_line"
-        android:layout_width="wrap_content"
-        android:layout_height="0.5px"
-        android:alpha="0.5"
-        android:layout_alignParentLeft="true"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="46px"
-        android:layout_marginRight="16px"
-        android:layout_toLeftOf="@id/event_share_load_no_more"
-        android:background="#FFFFFF" />
-
-    <ImageView
-        android:id="@+id/right_line"
-        android:layout_width="wrap_content"
-        android:layout_height="0.5px"
-        android:alpha="0.5"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="16px"
-        android:layout_marginRight="46px"
-        android:layout_toRightOf="@id/event_share_load_no_more"
-        android:background="#FFFFFF" />
-
-
-</RelativeLayout>
\ No newline at end of file

From adb590e7e453f4790267ba57559874c6501fedf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 14 Aug 2020 16:45:30 +0800
Subject: [PATCH 28/36] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo-module-v2x/src/main/res/raw/scenario_seek_help.json    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_seek_help.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_seek_help.json
index cd5cf436af..2f6a9823ac 100644
--- a/modules/mogo-module-v2x/src/main/res/raw/scenario_seek_help.json
+++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_seek_help.json
@@ -2,7 +2,7 @@
   "coordinates":[
     {
       "createTime":1593678359872,
-      "distance":100,
+      "distance":1100,
       "lat":39.866668,
       "lon":116.411211,
       "sn":"ZD801B1932L00041",

From de31de92b9fea14575d769421c41c9aa6f7be0a2 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Fri, 14 Aug 2020 18:13:39 +0800
Subject: [PATCH 29/36] =?UTF-8?q?=E6=97=A0=E5=88=86=E4=BA=AB=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9,=E9=A2=91=E7=B9=81=E5=88=B7=E6=96=B0=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB=E5=88=97=E8=A1=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/v2x/fragment/V2XShareEventsFragment.java    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
index 3c876c725e..2d8049e13c 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
@@ -32,7 +32,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
     private static final String TAG = "ShareEventsFragment";
     private RecyclerView recyclerView;
     private V2XShareEventAdapter adapter;
-    private ArrayList dataArrayList =new ArrayList();
+    private ArrayList dataArrayList = new ArrayList();
     ;
     private int pageNum = 1;
     private V2XShareNetworkModel v2XShareNetworkModel;
@@ -80,6 +80,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
     @Override
     public void getShareEventResponse() {
         animatioonAcction(View.VISIBLE);
+
         v2XShareNetworkModel.getShareEventResponse(pageNum, 10, new V2XRefreshCallback() {
             @Override
             public void onSuccess(Object result) {
@@ -88,6 +89,9 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
 
                     if (resultData != null && resultData.getResult() != null
                             && resultData.getResult().getEnthusiasmIndex() != null) {
+                        if (dataArrayList.size() > 0) {
+                            dataArrayList.clear();
+                        }
                         dataArrayList.add(resultData.getResult().getEnthusiasmIndex());
                         Log.d(TAG, "热心指数:" + resultData.getResult().getEnthusiasmIndex());
                     }
@@ -98,7 +102,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
 
             @Override
             public void onFail(String msg) {
-                loadingView.stopWithError(msg,View.VISIBLE);
+                loadingView.stopWithError(msg, View.VISIBLE);
                 loadingView.refresButton.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -184,7 +188,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
 
             @Override
             public void onFail(String msg) {
-                loadingView.stopWithError(msg,View.INVISIBLE);
+                loadingView.stopWithError(msg, View.INVISIBLE);
             }
         });
     }

From c5ea99903615694202ab5a3a4e809c7282eaab6a Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Fri, 14 Aug 2020 18:13:39 +0800
Subject: [PATCH 30/36] =?UTF-8?q?=E6=97=A0=E5=88=86=E4=BA=AB=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9,=E9=A2=91=E7=B9=81=E5=88=B7=E6=96=B0=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB=E5=88=97=E8=A1=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/v2x/fragment/V2XShareEventsFragment.java    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
index 3c876c725e..2d8049e13c 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
@@ -32,7 +32,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
     private static final String TAG = "ShareEventsFragment";
     private RecyclerView recyclerView;
     private V2XShareEventAdapter adapter;
-    private ArrayList dataArrayList =new ArrayList();
+    private ArrayList dataArrayList = new ArrayList();
     ;
     private int pageNum = 1;
     private V2XShareNetworkModel v2XShareNetworkModel;
@@ -80,6 +80,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
     @Override
     public void getShareEventResponse() {
         animatioonAcction(View.VISIBLE);
+
         v2XShareNetworkModel.getShareEventResponse(pageNum, 10, new V2XRefreshCallback() {
             @Override
             public void onSuccess(Object result) {
@@ -88,6 +89,9 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
 
                     if (resultData != null && resultData.getResult() != null
                             && resultData.getResult().getEnthusiasmIndex() != null) {
+                        if (dataArrayList.size() > 0) {
+                            dataArrayList.clear();
+                        }
                         dataArrayList.add(resultData.getResult().getEnthusiasmIndex());
                         Log.d(TAG, "热心指数:" + resultData.getResult().getEnthusiasmIndex());
                     }
@@ -98,7 +102,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
 
             @Override
             public void onFail(String msg) {
-                loadingView.stopWithError(msg,View.VISIBLE);
+                loadingView.stopWithError(msg, View.VISIBLE);
                 loadingView.refresButton.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -184,7 +188,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
 
             @Override
             public void onFail(String msg) {
-                loadingView.stopWithError(msg,View.INVISIBLE);
+                loadingView.stopWithError(msg, View.INVISIBLE);
             }
         });
     }

From 22fd42d9235efad99a87c1452861b6f0b0024bcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 14 Aug 2020 19:01:27 +0800
Subject: [PATCH 31/36] =?UTF-8?q?=E3=80=90=E6=99=BA=E6=85=A7=E9=A9=BE?=
 =?UTF-8?q?=E9=A9=B61.1.2=E3=80=91=E7=82=B9=E5=87=BB=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E8=BD=A6=E5=8F=8B=E6=B1=82=E5=8A=A9=E7=9A=84=E3=80=90=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E3=80=91=E6=8C=89=E9=92=AE=EF=BC=8C=E5=88=86=E6=95=B0?=
 =?UTF-8?q?=E6=9C=AA=E5=A2=9E=E5=8A=A0=20http://jira.zhidaohulian.com/brow?=
 =?UTF-8?q?se/E85XJD-163?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
index a6fe789e8f..b8b3d16bba 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
@@ -111,6 +111,7 @@ public class V2XScenarioHistoryOtherSeekHelpVH extends V2XBaseViewHolder<V2XHist
             }
 
             mIvFaultHelpEventNavi.setOnClickListener(v -> {
+                V2XServiceManager.getV2XRefreshModel().respondingToHelp(mUserInfo.getSn());
                 triggerStartNavi(mNoveltyInfo);
             });
 
@@ -134,6 +135,7 @@ public class V2XScenarioHistoryOtherSeekHelpVH extends V2XBaseViewHolder<V2XHist
 
                 mIvFaultHelpEventCall.setOnClickListener(v -> {
                     if (!V2XUtils.isFastClick()) {
+                        V2XServiceManager.getV2XRefreshModel().respondingToHelp(mUserInfo.getSn());
                         try {
                             mUserInfo.setSn(xPushMessageEntity.getSn());
                             mUserInfo.setUserHead(xPushMessageEntity.getHeadImgUrl());
@@ -156,7 +158,6 @@ public class V2XScenarioHistoryOtherSeekHelpVH extends V2XBaseViewHolder<V2XHist
     @Override
     public void delayedCloseWindow() {
         try {
-            V2XServiceManager.getV2XRefreshModel().respondingToHelp(mUserInfo.getSn());
 
             hideControlButton(View.GONE);
             // 进行数据库存储

From 434c3334678c19abaa8ecc03ae1fbe08babf030c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 14 Aug 2020 19:07:45 +0800
Subject: [PATCH 32/36] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E8=AF=AD?=
 =?UTF-8?q?=E9=9F=B3=E5=85=B3=E9=97=AD=E9=9D=A2=E6=9D=BF=E7=9A=84=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
index c4e71eae6f..297ac9d014 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
@@ -76,6 +76,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
     // 打关闭事件面板
     private val mCloeEventCb = V2XVoiceCallbackListener { command: String?, intent: Intent? ->
         try {
+            TrackUtils.trackV2xHistoryEvent(5)
             hidePanel()
         } catch (e: java.lang.Exception) {
             e.printStackTrace()

From 5ddbffd7f8104fd683259dde377cb0125996f0a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 14 Aug 2020 21:17:58 +0800
Subject: [PATCH 33/36] =?UTF-8?q?=E5=88=A0=E6=8E=89=E4=BA=86canLive?=
 =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manager/impl/MoGoV2XMarkerManager.java    | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java
index bef7d59ab0..6ab7028046 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java
@@ -132,20 +132,17 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
 
                 if (exploreWayList != null) {
                     for (MarkerExploreWay markerExploreWay : exploreWayList) {
-                        // 因为目前探路卡片不支持直播，所以这里做了过滤 @李小鹏
-                        if (!markerExploreWay.getCanLive()) {
-                            if (EventTypeUtils.isRoadEvent(markerExploreWay.getPoiType())) {
-                                MarkerLocation markerLocation = markerExploreWay.getLocation();
-                                // 记录道路事件
-                                V2XRoadEventEntity v2XRoadEventEntity = new V2XRoadEventEntity();
-                                v2XRoadEventEntity.setLocation(markerLocation);
-                                // 探路目前只有上报拥堵
-                                v2XRoadEventEntity.setPoiType(markerExploreWay.getPoiType());
+                        if (EventTypeUtils.isRoadEvent(markerExploreWay.getPoiType())) {
+                            MarkerLocation markerLocation = markerExploreWay.getLocation();
+                            // 记录道路事件
+                            V2XRoadEventEntity v2XRoadEventEntity = new V2XRoadEventEntity();
+                            v2XRoadEventEntity.setLocation(markerLocation);
+                            // 探路目前只有上报拥堵
+                            v2XRoadEventEntity.setPoiType(markerExploreWay.getPoiType());
 
-                                v2XRoadEventEntity.setNoveltyInfo(markerExploreWay);
-                                v2XRoadEventEntity.setExpireTime(20000);
-                                mV2XRoadEventEntityArrayList.add(v2XRoadEventEntity);
-                            }
+                            v2XRoadEventEntity.setNoveltyInfo(markerExploreWay);
+                            v2XRoadEventEntity.setExpireTime(20000);
+                            mV2XRoadEventEntityArrayList.add(v2XRoadEventEntity);
                         }
                     }
                 }

From 6d24a57eaf7a150fc31058b4001b8e3319aed036 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, 17 Aug 2020 11:14:51 +0800
Subject: [PATCH 34/36] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=20=E3=80=90?=
 =?UTF-8?q?=E6=99=BA=E6=85=A7=E9=A9=BE=E9=A9=B61.1.2=E3=80=91=E5=87=BA?=
 =?UTF-8?q?=E8=A1=8C=E5=8A=A8=E6=80=81=EF=BC=8C=E6=97=B6=E9=97=B4=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E4=B8=BA=E7=AC=AC=E4=BA=8C=E6=97=A5=EF=BC=8C=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=9C=AA=E6=B8=85=E7=A9=BA=20http:/?=
 =?UTF-8?q?/jira.zhidaohulian.com/browse/E85XJD-167?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mogo/module/v2x/V2XModuleProvider.java   | 3 ---
 .../mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java   | 3 +++
 2 files changed, 3 insertions(+), 3 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 ba01c75bbf..c966d01ef4 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
@@ -31,7 +31,6 @@ import com.mogo.module.v2x.scenario.scene.park.V2XIllegalParkScenario;
 import com.mogo.module.v2x.scenario.scene.park.V2XIllegalParkWindow;
 import com.mogo.module.v2x.utils.FatigueDrivingUtils;
 import com.mogo.module.v2x.utils.TimeUtils;
-import com.mogo.module.v2x.utils.V2XSQLiteUtils;
 import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.module.v2x.voice.V2XVoiceManager;
 import com.mogo.service.module.IMogoModuleLifecycle;
@@ -156,8 +155,6 @@ public class V2XModuleProvider implements
         }
         // 刷新配置文件
         refreshStrategyConfig();
-        // 清除V2X事件数据库中过期的数据，数据有效期为24小时
-        V2XSQLiteUtils.clearYesterdayScenarioHistoryData();
     }
 
     /**
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
index f1ca65c970..9211a4f569 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
@@ -19,6 +19,7 @@ import com.mogo.module.v2x.manager.IMoGoV2XStatusChangedListener;
 import com.mogo.module.v2x.manager.V2XStatusDescriptor;
 import com.mogo.module.v2x.presenter.ScenarioHistoryPresenter;
 import com.mogo.module.v2x.utils.ThreadUtils;
+import com.mogo.module.v2x.utils.V2XSQLiteUtils;
 import com.mogo.module.v2x.view.V2XListEmptyView;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.utils.GsonUtil;
@@ -130,6 +131,8 @@ public class V2XScenarioHistoryFragment
     @Override
     public void onResume() {
         super.onResume();
+        // 清除V2X事件数据库中过期的数据，数据有效期为24小时
+        V2XSQLiteUtils.clearYesterdayScenarioHistoryData();
         mPresenter.loadHistory();
     }
 

From aa0081990a65e5ba1a92ed97dd7013c47707a586 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, 17 Aug 2020 11:53:17 +0800
Subject: [PATCH 35/36] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E5=8C=B9=E9=85=8D=E7=AD=96=E7=95=A5=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mogo/module/v2x/V2XConst.java   |  1 +
 .../module/v2x/listener/V2XLocationListener.java  |  2 ++
 .../v2x/listener/V2XMessageListener_401012.java   |  2 ++
 .../com/mogo/module/v2x/utils/TrackUtils.java     | 15 +++++++++++++++
 4 files changed, 20 insertions(+)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java
index bb79de34e4..986804044a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java
@@ -60,6 +60,7 @@ public class V2XConst {
     public static final String V2X_ROAD_SHOW = "v2x_road_show";
     public static final String V2X_ROAD_EVET = "v2x_road_event";
     public static final String V2X_ROAD_EVET_HISTORY_BUTTON = "V2X_button_click";
+    public static final String V2X_ROAD_PRODUCE = "v2x_road_produce";
     /**
      * V2X 道路事件操作类型
      */
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 15654165b7..c70ac2c702 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
@@ -26,6 +26,7 @@ import com.mogo.module.v2x.utils.ADASUtils;
 import com.mogo.module.v2x.utils.DrivingDirectionUtils;
 import com.mogo.module.v2x.utils.LocationUtils;
 import com.mogo.module.v2x.utils.MarkerUtils;
+import com.mogo.module.v2x.utils.TrackUtils;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.utils.GsonUtil;
 
@@ -157,6 +158,7 @@ public class V2XLocationListener implements IMogoLocationListener, CarStatusList
             );
             // Logger.w(MODULE_NAME, "V2X预警--前方数据距离:" + v2XRoadEventEntity.getDistance());
             // 触发展示操作
+            TrackUtils.trackV2xRoadProduceEvent(1);
             V2XMessageEntity<V2XRoadEventEntity> v2XMessageEntity = new V2XMessageEntity<>();
             v2XMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING);
             v2XMessageEntity.setContent(v2XRoadEventEntity);
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 2c794c6e75..aeb1c8d287 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
@@ -17,6 +17,7 @@ import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.alarm.V2XAlarmServer;
 import com.mogo.module.v2x.utils.TimeConstants;
 import com.mogo.module.v2x.utils.TimeUtils;
+import com.mogo.module.v2x.utils.TrackUtils;
 import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.service.connection.IMogoOnMessageListener;
 import com.mogo.utils.logger.Logger;
@@ -42,6 +43,7 @@ public class V2XMessageListener_401012 implements IMogoOnMessageListener<MarkerC
     public void onMsgReceived(MarkerCardResult response) {
         Logger.d(MODULE_NAME, "V2XMessageListener_401012==V2X服务端下发：\n"
                 + GsonUtil.jsonFromObject(response));
+        TrackUtils.trackV2xRoadProduceEvent(2);
         try {
             long timeSpan = TimeUtils.getTimeSpan(TimeUtils.getNowMills(), response.getMessageTime(), TimeConstants.MIN);
             // 三分钟以内的消息才会提示用户
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TrackUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TrackUtils.java
index 9a99e81db8..2fcce52d42 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TrackUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TrackUtils.java
@@ -62,4 +62,19 @@ public class TrackUtils {
             e.printStackTrace();
         }
     }
+
+
+    /**
+     * @param type type=1 短距离角度匹配
+     *             type=2 历史轨迹匹配
+     */
+    public static void trackV2xRoadProduceEvent(int type) {
+        try {
+            Map<String, Object> properties = new HashMap<>();
+            properties.put("type", type);
+            V2XServiceManager.getMogoAnalytics().track(V2XConst.V2X_ROAD_PRODUCE, properties);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }

From 5edc2401b953ec82f2a44d9a61e3a5239a3f9f39 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Fri, 14 Aug 2020 15:44:24 +0800
Subject: [PATCH 36/36] modify tl lib

---
 .../service/CarCorderController.kt            | 44 ++++++++++++++-----
 .../service/CosStatusController.kt            | 23 +++++++---
 .../roadcondition/service/MainService.kt      | 15 ++++---
 .../service/MainServiceController.kt          | 14 +++---
 .../com/zhidao/roadcondition/util/PdUtil.kt   |  9 ++--
 5 files changed, 74 insertions(+), 31 deletions(-)

diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
index 24002c1042..63bb1e8d6b 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
@@ -34,6 +34,8 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
     var mType: String = "" //1 上报拥堵, 2 封路和查车
     var mainInfoId: Long = 0
     var mFromType: String = ""
+    private var mLongitude: Double = 0.0
+    private var mLatitude: Double = 0.0
 
     private var getVideoFailed: (() -> Unit)? = null
     private var interceptors: ArrayList<TakePhotoInterceptor> = ArrayList(1)
@@ -69,12 +71,16 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
             isCustom: Boolean = false,
             type: String,
             mainInfoId: Long,
-            fromType: String
+            fromType: String,
+            longitude: Double,
+            latitude: Double
     ) {
         Log.d(TAG, "takePhoto ---------- type = $type  --- mType = $mType ---fromType = $fromType")
         this.mType = type
         this.mainInfoId = mainInfoId
         this.mFromType = fromType
+        this.mLongitude = longitude
+        this.mLatitude = latitude
         CustomStatusHandler.offerPhotoStatus(isCustom)
         zdCarCoderController.takePhoto(photoType, cameraId, haveVoice)
         trackGetPhoto(1)
@@ -91,13 +97,16 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
             id: Long = 0L,
             type: String,
             mainInfoId: Long,
-            fromType: String
+            fromType: String,
+            longitude: Double,
+            latitude: Double
     ) {
-        Log.d(TAG, "takeVideo -------- type = $type")
-        Log.d(TAG, "takeVideo -------- isCustom = $isCustom ---mFromType = $mFromType")
+        Log.d(TAG, "takeVideo -------- isCustom = $isCustom ---mFromType = $mFromType ---type = $type" )
         this.mType = type
         this.mainInfoId = mainInfoId
         this.mFromType = fromType
+        this.mLongitude = longitude
+        this.mLatitude = latitude
         if (DebugConfig.getCarMachineType() == 0) { //自研车机
             outputVideoPath = getCompressVideoPath()
             CustomStatusHandler.offerVideoStatus(TakeEntity(isCustom, id))
@@ -118,7 +127,9 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
                     videoAndThumbMap,
                     mType,
                     entity,
-                    mainInfoId
+                    mainInfoId,
+                    mLongitude,
+                    mLatitude
             )
 
             //地图上打点
@@ -177,7 +188,9 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
                         mutableMapOf("pic" to "" as String),
                         mType,
                         entity,
-                        mainInfoId
+                        mainInfoId,
+                        mLongitude,
+                        mLatitude
                 );
             }
         }
@@ -219,7 +232,8 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
 
         if (!TextUtils.isEmpty(mType)) {
             Log.d(TAG, "onTakePhotoSuccess mType != null")
-            CosStatusController().uploadFile(mutableListOf(photoPath as String), entity, mType, mainInfoId, mFromType)
+            CosStatusController().uploadFile(mutableListOf(photoPath as String), entity, mType, mainInfoId, mFromType, mLongitude,
+                    mLatitude)
         } else {
             Log.d(TAG, "onTakePhotoSuccess mType == null")
             Log.d(
@@ -234,7 +248,9 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
                             entity,
                             mType,
                             mainInfoId,
-                            mFromType
+                            mFromType,
+                            mLongitude,
+                            mLatitude
                     )
                 }
             }
@@ -247,7 +263,9 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
                             entity,
                             mType,
                             mainInfoId,
-                            mFromType
+                            mFromType,
+                            mLongitude,
+                            mLatitude
                     )
                 }
             }
@@ -336,7 +354,9 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
                 videoAndThumbMap,
                 mType,
                 entity,
-                mainInfoId
+                mainInfoId,
+                mLongitude,
+                mLatitude
         )
 
         //地图上打点
@@ -375,7 +395,9 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
                         entity,
                         mType,
                         mainInfoId,
-                        mFromType
+                        mFromType,
+                        mLongitude,
+                        mLatitude
                 )
                 //删除压缩前的视频
                 deletePicFile(videoPath)
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
index 464744387b..8502395eb3 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
@@ -38,16 +38,21 @@ class CosStatusController : CosStatusCallback {
     private var mType: String = ""
     private var mainInfoId: Long = 0
     private var mFromType: String = ""
+    private var mLongitude: Double = 0.0
+    private var mLatitude: Double = 0.0
 
     //上传文件
-    fun uploadFile(picPath: MutableList<String>, entity: TakeEntity, type: String, mainInfoId: Long, fromType: String) {
+    fun uploadFile(picPath: MutableList<String>, entity: TakeEntity, type: String, mainInfoId: Long,
+                   fromType: String, longitude: Double, latitude: Double) {
         CosCallbackMapController.registerCallback(picPath, this)
 //        CosLogger.setLogStatus(true)
 
         this.entity = entity
         this.mType = type
         this.mainInfoId = mainInfoId
-        this.mFromType = fromType;
+        this.mFromType = fromType
+        this.mLongitude = longitude
+        this.mLatitude = latitude
         Log.d(TAG, "uploadFile type===$type ---- mainInfoId =$mainInfoId ----mFromType = $mFromType ---- picPath = $picPath ")
         trackUploadCos(3)
         if (picPath.contains("backPic")) return
@@ -161,7 +166,9 @@ class CosStatusController : CosStatusCallback {
                     mutableMapOf("pic" to downloadUrl as String),
                     mType,
                     entity,
-                    mainInfoId
+                    mainInfoId,
+                    mLongitude,
+                    mLatitude
             )
 //            }
         }
@@ -177,7 +184,7 @@ class CosStatusController : CosStatusCallback {
 //                CosCallbackMapController.mainService?.sendCustomResult(it)
 //            }
 //        } else {
-        sendInformationDirectly(type, map, mType, entity, mainInfoId)
+        sendInformationDirectly(type, map, mType, entity, mainInfoId, mLongitude, mLatitude)
 //        }
     }
 
@@ -189,7 +196,9 @@ class CosStatusController : CosStatusCallback {
             map: Map<String, String>,
             poiType: String,
             entity: TakeEntity,
-            mainInfoId: Long
+            mainInfoId: Long,
+            longitude: Double,
+            latitude: Double
     ) {
         Log.d(TAG, "sendInformationDirectly  isCustomSend = ${entity?.isCustom}")
         Log.d(TAG, "sendInformationDirectly  poiType= $poiType ---- mainInfoId= $mainInfoId")
@@ -198,7 +207,9 @@ class CosStatusController : CosStatusCallback {
                 url = map,
                 isCustom = entity?.isCustom,
                 poiType = poiType,
-                mainInfoId = mainInfoId
+                mainInfoId = mainInfoId,
+                longitude = longitude,
+                latitude = latitude
         ) { success ->
             CosCallbackMapController.unregisterCallbacks(map)
             CosCallbackMapController.mainService?.let {
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
index 91700ea1cc..ea5004e607 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
@@ -62,6 +62,8 @@ class MainService : Service() {
 
     var params: UploadParams? = null
     var mainInfoId: Long = 0
+    private var mLongitude: Double = 0.0
+    private var mLatitude: Double = 0.0
 
     //发送主动上报结果广播给外部
     fun sendCustomResult(result: Boolean) {
@@ -88,13 +90,14 @@ class MainService : Service() {
                 shareType = it.eventType
                 fromType = it.fromType
                 mainInfoId = 0 //TODO
+
                 Log.d(TAG, "onStartCommand  shareType = $shareType")
                 if (shareType == TANLU_ROAD_CONGESTION || shareType == TANLU_TRAFFIC_CHECK || shareType == TANLU_ROAD_CLOSURE || shareType == TANLU_ROAD_CURRENT
                         || shareType == TANLU_ROAD_PONDING || shareType == TANLU_ROAD_ICING || shareType == TANLU_ROAD_HEAVY_FOG
                         || shareType == TANLU_ROAD_ACCIDENT || shareType == TANLU_ROAD_WORK
                 ) {
 //                takePhoto(1, false, true)
-                    if (!fromType.equals(UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO)) { // 是策略触发，不提示
+                    if (fromType != UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO) { // 是策略触发，不提示
                         takeVideo(it.duration, isCustom = true, id = id)
                     } else {
                         takeVideo(it.duration)
@@ -131,7 +134,7 @@ class MainService : Service() {
         override fun onReceive(p0: Context?, p1: Intent) {
             val id = p1.getLongExtra("id", 0L)
             if (p1.action == sendInformationAction) {
-                takeVideo(10, isCustom = true, id = id)
+                takeVideo(DEFAULT_VIDEO_DURATION, isCustom = true, id = id)
             }
         }
     }
@@ -181,7 +184,7 @@ class MainService : Service() {
     @Subscribe(threadMode = ThreadMode.MAIN, sticky = true, priority = 98)
     fun getImageEvent(getImageSuccessEvent: GetImageSuccessEvent) {
         var info = LocationUtil.getInstance().getLocationInfo()
-        Log.e("MainService", "getImageEvent long = ${info.longitude} ----> lat= ${info.latitude}")
+        Log.d("MainService", "getImageEvent long = ${info.longitude} ----> lat= ${info.latitude}")
         Log.d(
                 "MainService",
                 "getImageEvent url = " + getImageSuccessEvent.getImageUrl() + ">>>>type =" + getImageSuccessEvent.getType()
@@ -250,7 +253,7 @@ class MainService : Service() {
         }
 
         if (videoType == 1) {
-            takeVideo(10)
+            takeVideo(DEFAULT_VIDEO_DURATION)
         } else if (videoType == 2) {
             postVideoAlarmTask(true)
         }
@@ -278,7 +281,7 @@ class MainService : Service() {
         Observable.intervalRange(0, 1, 0, 2_000, TimeUnit.MILLISECONDS)
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(Consumer {
-                    CarCorderController.takePhoto(1, 1, false, isCustom, TANLU_ROAD_CURRENT, mainInfoId, fromType)
+                    CarCorderController.takePhoto(1, 1, false, isCustom, TANLU_ROAD_CURRENT, mainInfoId, fromType, mLongitude, mLatitude)
                 })
 //        }
 
@@ -297,7 +300,7 @@ class MainService : Service() {
         Log.d("MainService", "takeVideo --------1---->")
 //        if (isAuthorization(BaseApplication.getAppContext())) {
 //            log(TAG, "takeVideo --------2---->")
-        CarCorderController.takeVideo(1, duration, isCustom, id, if (isCustom) shareType else TANLU_ROAD_CURRENT, mainInfoId, fromType)
+        CarCorderController.takeVideo(1, duration, isCustom, id, if (isCustom) shareType else TANLU_ROAD_CURRENT, mainInfoId, fromType, mLongitude, mLatitude)
 //        }
         postVideoAlarmTask(isInterval)
 
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt
index 9fb7e4ee51..58aff2ab9f 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt
@@ -227,16 +227,18 @@ class MainServiceController {
         isShare:Boolean = false,
         poiType:String,
         mainInfoId:Long,
+        longitude: Double,
+        latitude: Double,
         customSend: ((Boolean) -> Unit)? = null
     ) {
         Log.d(TAG, " sendInformationMessage  poiType = $poiType");
         //删除测试数据
         var locationInfo = LocationUtil.getInstance().getLocationInfo();
         if (locationInfo.address.isNullOrEmpty()) {
-            geoLocation(type, url, locationInfo, isCustom,trafficInfoType, isShare, customSend,poiType,mainInfoId)
+            geoLocation(type, url, locationInfo, isCustom,trafficInfoType, isShare, customSend,poiType,mainInfoId,longitude,latitude)
         } else {
             postInformationMessage(
-                getInformationBody(type, url, locationInfo, isCustom, trafficInfoType, isShare,poiType,mainInfoId),
+                getInformationBody(type, url, locationInfo, isCustom, trafficInfoType, isShare,poiType,mainInfoId,longitude,latitude),
                 customSend
             )
         }
@@ -253,19 +255,21 @@ class MainServiceController {
         isShare: Boolean,
         customSend: ((Boolean) -> Unit)? = null,
         poiType: String,
-        mainInfoId: Long
+        mainInfoId: Long,
+        longitude: Double,
+        latitude: Double
     ) {
         Log.d(TAG, " geoLocation -- poiType = $poiType");
         LocationUtil.getInstance()
             .geoCodeLocation(locationInfo.toLatLngPoint(), { locInfo: LocationInfo ->
                 postInformationMessage(
-                    getInformationBody(type, url, locationInfo, isCustom, trafficInfoType, isShare, poiType,mainInfoId),
+                    getInformationBody(type, url, locationInfo, isCustom, trafficInfoType, isShare, poiType,mainInfoId,longitude,latitude),
                     customSend
                 )
             }, {
                 //转换失败的情况下再重试一次
                 geoRetryed = if (!geoRetryed) {
-                    geoLocation(type, url, locationInfo, isCustom, trafficInfoType, isShare, customSend, poiType,mainInfoId)
+                    geoLocation(type, url, locationInfo, isCustom, trafficInfoType, isShare, customSend, poiType,mainInfoId,longitude,latitude)
                     true
                 } else {
                     false
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt
index 60d97f3871..cc4cb781f1 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt
@@ -4,6 +4,7 @@ import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.network.Utils
+import com.zhidao.roadcondition.constant.TANLU_ROAD_CURRENT
 import com.zhidao.roadcondition.model.InformationBody
 import com.zhidao.roadcondition.model.LocationInfo
 import com.zhidao.roadcondition.model.proxy.INFO_TYPE_IMG
@@ -29,7 +30,9 @@ fun getInformationBody(
     trafficInfoType:String = "",
     isShare:Boolean,
     poiType: String,
-    mainInfoId: Long
+    mainInfoId: Long,
+    latitude: Double,
+    longitude: Double
 ): InformationBody {
     var jsonArray = JsonArray()
     var type: Int
@@ -54,8 +57,8 @@ fun getInformationBody(
         locationInfo.cityCode,
         locationInfo.cityName,
         System.currentTimeMillis(),
-        locationInfo.latitude,
-        locationInfo.longitude,
+        if (latitude == 0.0) locationInfo.latitude else latitude,
+        if (longitude == 0.0) locationInfo.longitude else longitude,
         locationInfo.provinceName,
         Utils.getSn(),
         locationInfo.street,