Merge branch 'qa_1.1.7_fix' into dev

2020-11-16 11:01:47 +08:00
parent 2ee5513bc6 ae6346254c
commit eef9999556
4 changed files with 52 additions and 33 deletions
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt
@@ -213,8 +213,11 @@ class MainServiceController {
            }
            onSuccess {
                if (it.result != null) {
-                    Log.i(TAG, "upload message success id" + it.result.id)
-                    sendUgcStatusReceiver(it.result.id, mPoiType, mFromType)
+                    Log.i(TAG, "upload success id = " + it.result.id)
+                    Log.i(TAG, "upload success mFromType =  $mFromType")
+                    if (mFromType == "6") {
+                        sendUgcStatusReceiver(it.result.id, mPoiType, mFromType)
+                    }
                }

                trackUploadServer(1)
@@ -224,7 +227,10 @@ class MainServiceController {
            onError {
                Log.i(TAG, "$it upload message ${it.message}")
                trackUploadServer(2)
-                sendUgcStatusReceiver(0, mPoiType, mFromType)
+                Log.i(TAG, "upload onError mFromType =  $mFromType")
+                if (mFromType == "6") {
+                    sendUgcStatusReceiver(0, mPoiType, mFromType)
+                }
 //                CosStatusController().videoAndThumbMap.clear()
                customSend?.invoke(false)
            }
@@ -232,7 +238,7 @@ class MainServiceController {
    }

    private fun sendUgcStatusReceiver(id: Long, type: String?, fromType: String?) {
-        Log.e(TAG, "sendUgcStatusReceiver ----> id = $id ---type = $type --fromType = $fromType ")
+        Log.d(TAG, "sendUgcStatusReceiver ----> id = $id ---type = $type --fromType = $fromType ")
        var intent = Intent()
        intent.action = "com.v2x.ugc.upload.status"
        intent.putExtra("id", id)
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java
@@ -9,6 +9,7 @@ import android.widget.TextView;

 import com.mogo.commons.voice.AIAssist;
 import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
+import com.mogo.map.MogoLatLng;
 import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.entity.V2XEventShowEntity;
 import com.mogo.module.common.entity.V2XRoadEventEntity;
@@ -21,6 +22,8 @@ import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
 import com.mogo.module.v2x.voice.V2XVoiceConstants;
 import com.mogo.module.v2x.voice.V2XVoiceManager;
+import com.mogo.service.share.IMogoTanluProvider;
+import com.mogo.service.share.TanluUploadParams;
 import com.mogo.utils.network.utils.GsonUtil;

 import java.util.HashMap;
@@ -74,23 +77,27 @@ public class V2XEventUgcVH extends V2XBaseViewHolder<V2XEventShowEntity> {
            @Override
            public void onViewDetachedFromWindow(View v) {
                //Logger.w(MODULE_NAME, "列表View V2XPushEventDetailVH 触发 onViewDetachedFromWindow");
-                // 反注册语音交互
-                V2XVoiceManager.INSTANCE
-                        .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_YONG_DU_YES_UN_WAKEUP)
-                        .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_YONG_DU_NO_UN_WAKEUP)
-
-                        .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_YES_UN_WAKEUP)
-                        .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_NO_UN_WAKEUP)
-
-                        .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GU_YES_UN_WAKEUP)
-                        .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GU_NO_UN_WAKEUP)
-
-                        .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_YES_UN_WAKEUP)
-                        .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_NO_UN_WAKEUP);
+                unRegisterVoice();
            }
        });
    }

+    void unRegisterVoice() {
+        // 反注册语音交互
+        V2XVoiceManager.INSTANCE
+                .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_YONG_DU_YES_UN_WAKEUP)
+                .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_YONG_DU_NO_UN_WAKEUP)
+
+                .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_YES_UN_WAKEUP)
+                .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_NO_UN_WAKEUP)
+
+                .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GU_YES_UN_WAKEUP)
+                .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GU_NO_UN_WAKEUP)
+
+                .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_YES_UN_WAKEUP)
+                .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_NO_UN_WAKEUP);
+    }
+
    @Override
    public void initView(V2XEventShowEntity v2XEventShowEntity) {
        try {
@@ -133,15 +140,14 @@ public class V2XEventUgcVH extends V2XBaseViewHolder<V2XEventShowEntity> {
                ivEventReportTrue.setOnClickListener(new View.OnClickListener() {
                    @Override
                    public void onClick(View v) {
+
                        manualMarkingTrafficJam(1);
-                        dataStatistics(1);
                    }
                });
                ivEventReportErr.setOnClickListener(new View.OnClickListener() {
                    @Override
                    public void onClick(View v) {
                        manualMarkingTrafficJam(0);
-                        dataStatistics(2);
                    }
                });
            }
@@ -162,6 +168,25 @@ public class V2XEventUgcVH extends V2XBaseViewHolder<V2XEventShowEntity> {
     * 对道路事件进行反馈
     */
    void manualMarkingTrafficJam(int status) {
+        unRegisterVoice();
+
+        if (status == 1) {
+            // 上报事故
+            TanluUploadParams params =
+                    new TanluUploadParams(
+                            mNoveltyInfo.getPoiType(),
+                            IMogoTanluProvider.UPLOAD_FROM_STRATEGY_UGC,
+                            mNoveltyInfo.getInfoIdInt(),
+                            new MogoLatLng(mNoveltyInfo.getLocation().getLat(),
+                                    mNoveltyInfo.getLocation().getLon())
+                    );
+            V2XServiceManager.getTanluManager().uploadRoadCondition(params);
+
+            dataStatistics(1);
+        } else if (status == 0) {
+            dataStatistics(2);
+        }
+
        AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("谢谢，您的反馈将帮助更多车友。", null);
        V2XServiceManager
                .getV2XRefreshModel()
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XEarlyWarningServer.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XEarlyWarningServer.java
@@ -82,18 +82,6 @@ public class V2XEarlyWarningServer {
                            intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2xMessageEntity);
                            LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent);

-
-                            // 上报事故
-                            TanluUploadParams params =
-                                    new TanluUploadParams(
-                                            v2XRoadEventEntity.getPoiType(),
-                                            IMogoTanluProvider.UPLOAD_FROM_STRATEGY_UGC,
-                                            v2XRoadEventEntity.getNoveltyInfo().getInfoIdInt(),
-                                            new MogoLatLng(v2XRoadEventEntity.getLocation().getLat(),
-                                                    v2XRoadEventEntity.getLocation().getLon())
-                                    );
-                            V2XServiceManager.getTanluManager().uploadRoadCondition(params);
-
                        }
                        // 移出已经预警的事件列表
                        //V2XAlarmServer.mAlertRoadEventList.remove(v2XRoadEventEntity);
--- a/modules/mogo-module-v2x/src/main/res/raw/scenario_road_event_data.json
+++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_road_event_data.json
@@ -30,7 +30,7 @@
      "lat":39.966668,
      "lon":116.411211
    },
-    "poiType":"10006",
+    "poiType":"10003",
    "type":"CARD_TYPE_ROAD_CONDITION",
    "uploadType":"2",
    "userInfo":{
@@ -41,5 +41,5 @@
      "userName":"零下的雨"
    }
  },
-  "poiType":"10006"
+  "poiType":"10003"
 }