From 077e0e3a97aecc3053af369f373b134594e12c9a Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Fri, 15 May 2020 10:37:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extensions/entrance/EntrancePresenter.java   | 16 ++++++++++++++--
 .../mogo/module/share/ShareVoiceCmdReceiver.kt   | 13 +++++++++----
 .../mogo/module/share/manager/UploadHelper.kt    |  2 +-
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
index 2f1d174767..86605ad0ab 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
@@ -27,6 +27,7 @@ import com.mogo.service.statusmanager.IMogoStatusManager;
 import com.mogo.service.statusmanager.StatusDescriptor;
 import com.mogo.utils.logger.Logger;
 
+import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.HashMap;
@@ -203,8 +204,19 @@ public class EntrancePresenter extends Presenter< EntranceView > implements IMog
                 if ( mIMogoAuthorizeModuleManager.needAuthorize( AUTHORIZE_TYPE_LAUNCHER_SHARE ) ) {
                     mIMogoAuthorizeModuleManager.invokeAuthorization( AUTHORIZE_TYPE_LAUNCHER_SHARE );
                 } else {
-                    uploadRoadCondition();
-                    Log.d( TAG, "mogoIntentListener 分享路况  唤醒  ----> " );
+                    JSONObject jsonObject = null;
+                    try {
+                        jsonObject = new JSONObject( data );
+                        String typeString = jsonObject.get( "obj" ).toString();
+                        Logger.d(TAG, "mogiIntentListener 准备上报拥堵： " + typeString);
+                        if("拥堵".equals(typeString)) {
+                            uploadRoadCondition();
+                            Log.d(TAG, "mogoIntentListener 上报拥堵  唤醒  ----> ");
+                        }
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                    }
+
                 }
             } else if ( intentStr.equals( ExtensionsModuleConst.SHARE_DIALOG_CLOSE ) ) { //关闭分享框 唤醒
                 if ( mIMogoAuthorizeModuleManager.needAuthorize( AUTHORIZE_TYPE_LAUNCHER_SHARE ) ) {
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareVoiceCmdReceiver.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareVoiceCmdReceiver.kt
index 57f39019d6..4966611d75 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareVoiceCmdReceiver.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareVoiceCmdReceiver.kt
@@ -7,6 +7,7 @@ import com.mogo.module.share.constant.ShareConstants
 import com.mogo.module.share.constant.ShareConstants.*
 import com.mogo.module.share.manager.UploadHelper
 import com.mogo.utils.logger.Logger
+import org.json.JSONObject
 
 /**
  * 用于接收唤醒词指令，现在只接收 com.zhidao.speech.awake.notify 这一条广播
@@ -25,23 +26,27 @@ class ShareVoiceCmdReceiver : BroadcastReceiver() {
                 context.startService(seekHelp)
             }
             VOICE_CMD_GO_TO_SHARE ->{
-                when (intent.getStringExtra("ob") ?: "") {
+                val ob = JSONObject(intent.getStringExtra("data") ?: "").opt("ob")
+                Logger.d(TAG, "ob: $ob")
+                when (ob) {
                     "积水"->{
                         UploadHelper.upload(context, TYPE_STAGNANT_WATER)
                     }
                     "积冰"->{
                         UploadHelper.upload(context, TYPE_ROAD_ICY)
                     }
-                    "大雾"->{
+                    "雾"->{
                         UploadHelper.upload(context, TYPE_DENSE_FOG)
                     }
-                    "事故"->{
+                    "交通事故"->{
                         UploadHelper.upload(context, TYPE_ACCIDENT)
                     }
                 }
             }
             VOICE_CMD_PUB_ROAD_CONDITION->{
-                if(intent.getStringExtra("ob")?:"" == "路况") {
+                val ob = JSONObject(intent.getStringExtra("data") ?: "").opt("obj")
+                Logger.d(TAG, "ob: $ob")
+                if(ob == "路况") {
                     // 上报实时路况
                     Logger.d(TAG, "分享框准备触发上报实时路况")
                     UploadHelper.upload(context, TYPE_REAL_TIME_TRAFFIC)
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt
index a5edbc9e34..906c291da8 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt
@@ -12,7 +12,7 @@ import com.mogo.utils.logger.Logger
 object UploadHelper {
     fun upload(context:Context, type: String) {
         ShareControl.getInstance(context).mogoServiceApis.statusManagerApi.setUploadingStatus("CARD_TYPE_ROAD_CONDITION", true)
-        Logger.d("UploadHelper", "upload ---->")
+        Logger.d("UploadHelper", "upload ----> $type")
         val intent = Intent()
         intent.action = "com.zhidao.roadcondition.share"
         intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND)