From fe1ae68d91c9f5ca02c10d27a7729f290e31fa97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 13 Nov 2020 18:32:51 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=B0=86=E4=B8=8A=E4=BC=A0=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E7=94=A8=E6=88=B7=E7=82=B9=E5=87=BB=E5=90=8E=E5=86=8D?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/v2x/adapter/holder/V2XEventUgcVH.java | 14 ++++++++++++++ .../module/v2x/alarm/V2XEarlyWarningServer.java | 12 ------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git 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 index 7451f280ac..a9e376acef 100644 --- 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; @@ -133,6 +136,17 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { ivEventReportTrue.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + // 上报事故 + TanluUploadParams params = + new TanluUploadParams( + mV2XRoadEventEntity.getPoiType(), + IMogoTanluProvider.UPLOAD_FROM_STRATEGY_UGC, + mV2XRoadEventEntity.getNoveltyInfo().getInfoIdInt(), + new MogoLatLng(mV2XRoadEventEntity.getLocation().getLat(), + mV2XRoadEventEntity.getLocation().getLon()) + ); + V2XServiceManager.getTanluManager().uploadRoadCondition(params); + manualMarkingTrafficJam(1); dataStatistics(1); } diff --git 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 index 157793b9e3..80c91f14f8 100644 --- 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); From 739a7a5f55ea1c919b84c742f11a9b521b631d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Sun, 15 Nov 2020 15:08:40 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=AD=E9=9F=B3?= =?UTF-8?q?=E7=9A=84=E4=BA=A4=E4=BA=92=E7=9A=84=E6=95=B0=E6=8D=AE=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git 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 index a9e376acef..695ac276f9 100644 --- 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 @@ -148,14 +148,12 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { V2XServiceManager.getTanluManager().uploadRoadCondition(params); manualMarkingTrafficJam(1); - dataStatistics(1); } }); ivEventReportErr.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { manualMarkingTrafficJam(0); - dataStatistics(2); } }); } @@ -176,6 +174,12 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { * 对道路事件进行反馈 */ void manualMarkingTrafficJam(int status) { + if (status == 1) { + dataStatistics(1); + } else if (status == 0) { + dataStatistics(2); + } + AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("谢谢，您的反馈将帮助更多车友。", null); V2XServiceManager .getV2XRefreshModel() From 2076713daf0bc6794d1567d110b5fa481b0b8a6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Sun, 15 Nov 2020 16:05:19 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E7=9A=84=E7=B1=BB=E5=9E=8B=E4=B8=8Eugc=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git 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 index 695ac276f9..f842e7604a 100644 --- 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 @@ -139,11 +139,11 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { // 上报事故 TanluUploadParams params = new TanluUploadParams( - mV2XRoadEventEntity.getPoiType(), + mNoveltyInfo.getPoiType(), IMogoTanluProvider.UPLOAD_FROM_STRATEGY_UGC, - mV2XRoadEventEntity.getNoveltyInfo().getInfoIdInt(), - new MogoLatLng(mV2XRoadEventEntity.getLocation().getLat(), - mV2XRoadEventEntity.getLocation().getLon()) + mNoveltyInfo.getInfoIdInt(), + new MogoLatLng(mNoveltyInfo.getLocation().getLat(), + mNoveltyInfo.getLocation().getLon()) ); V2XServiceManager.getTanluManager().uploadRoadCondition(params); From 0db3824f3aa0e5f64348d4209b46fcb29a736297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Sun, 15 Nov 2020 17:16:50 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=AD=E9=9F=B3?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=B2=A1=E6=9C=89=E4=B8=8A=E4=BC=A0=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/adapter/holder/V2XEventUgcVH.java | 21 ++++++++++--------- .../res/raw/scenario_road_event_data.json | 4 ++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git 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 index f842e7604a..efa9981fe1 100644 --- 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 @@ -136,16 +136,6 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { ivEventReportTrue.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - // 上报事故 - 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); manualMarkingTrafficJam(1); } @@ -175,6 +165,17 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { */ void manualMarkingTrafficJam(int status) { 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); diff --git 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 index 92470209e1..f491d85a2e 100644 --- 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" } \ No newline at end of file From 583fd43368e788e2f8d6230b2557c38225abfba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Sun, 15 Nov 2020 17:18:18 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=90=8E=E5=8F=8D=E6=B3=A8=E5=86=8C=E8=AF=AD=E9=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/adapter/holder/V2XEventUgcVH.java | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git 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 index efa9981fe1..36847bf09e 100644 --- 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 @@ -77,23 +77,27 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { @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 { @@ -164,6 +168,8 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { * 对道路事件进行反馈 */ void manualMarkingTrafficJam(int status) { + unRegisterVoice(); + if (status == 1) { // 上报事故 TanluUploadParams params = From ae6346254ca1c8c3200f679f32f8a36e53374c7f Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 16 Nov 2020 10:47:45 +0800 Subject: [PATCH 6/6] opt --- .../roadcondition/service/MainServiceController.kt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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 a471d75362..e6db78ac75 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 @@ -309,8 +309,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) @@ -320,7 +323,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) } @@ -328,7 +334,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)