From 7918bdb7917c6486d71d1dbb3b9f36b9dbc5569e 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, 31 Aug 2020 11:51:00 +0800
Subject: [PATCH] Fix current car seek help status refresh

---
 .idea/codeStyles/Project.xml                   | 18 ++++++++++++++++++
 app/src/e8xx/AndroidManifest.xml               |  1 -
 .../com/mogo/module/v2x/V2XModuleProvider.java | 14 ++++++--------
 .../scene/help/V2XCarForHelpScenario.java      |  1 -
 .../{seek => help}/V2XSeekHelpDialog.java      |  2 +-
 5 files changed, 25 insertions(+), 11 deletions(-)
 rename modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/{seek => help}/V2XSeekHelpDialog.java (99%)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 681f41ae2a..0d156937bb 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,5 +1,23 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+    </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
diff --git a/app/src/e8xx/AndroidManifest.xml b/app/src/e8xx/AndroidManifest.xml
index d755054676..01afff1292 100644
--- a/app/src/e8xx/AndroidManifest.xml
+++ b/app/src/e8xx/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:sharedUserId="android.uid.system"
     package="com.mogo.launcher">
 </manifest>
\ No newline at end of file
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 c966d01ef4..4fdf2ba1f5 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
@@ -270,6 +270,7 @@ public class V2XModuleProvider implements
      * 刷新自车求助状态
      */
     private void initCarForHelpStatus() {
+        Logger.d(MODULE_NAME, "刷新自车求助状态……");
         //本地查询是否超时
         V2XServiceManager.getV2XRefreshModel().getHelpSignal(new V2XRefreshCallback<V2XSeekHelpRes>() {
             @Override
@@ -277,18 +278,15 @@ public class V2XModuleProvider implements
                 if (result != null) {
                     V2XSeekHelpRes.ResultBean resultBean = result.getResult();
                     if (resultBean != null) {
+                        Logger.d(MODULE_NAME, "刷新自车求助状态 resultBean："+resultBean);
                         int vehicleType = resultBean.getVehicleType();
                         //故障车
                         if (vehicleType == 4) {
-                            if (!V2XServiceManager.getMoGoStatusManager().isSeekHelping()) {
-                                refreshMeSeekHelp(true);
-                                V2XServiceManager.getMoGoStatusManager().setSeekHelping(MODULE_NAME, true);
-                            }
+                            refreshMeSeekHelp(true);
+                            V2XServiceManager.getMoGoStatusManager().setSeekHelping(MODULE_NAME, true);
                         } else {
-                            if (V2XServiceManager.getMoGoStatusManager().isSeekHelping()) {
-                                refreshMeSeekHelp(false);
-                                V2XServiceManager.getMoGoStatusManager().setSeekHelping(MODULE_NAME, false);
-                            }
+                            refreshMeSeekHelp(false);
+                            V2XServiceManager.getMoGoStatusManager().setSeekHelping(MODULE_NAME, false);
                         }
                     }
                 }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java
index 5cc1180a9a..eaee87ac30 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java
@@ -11,7 +11,6 @@ import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.scenario.impl.AbsV2XScenario;
 import com.mogo.module.v2x.scenario.scene.seek.V2XSeekHelpButton;
-import com.mogo.module.v2x.scenario.scene.seek.V2XSeekHelpDialog;
 import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
 import com.mogo.module.v2x.voice.V2XVoiceConstants;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpDialog.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpDialog.java
similarity index 99%
rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpDialog.java
rename to modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpDialog.java
index e88c985170..a4d8161609 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpDialog.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpDialog.java
@@ -1,4 +1,4 @@
-package com.mogo.module.v2x.scenario.scene.seek;
+package com.mogo.module.v2x.scenario.scene.help;
 
 import android.content.Context;
 import android.content.Intent;