事件上报逻辑开发

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)

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)