From 0d258c71b46181a6f46d3fc1884e5e0b0b434514 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Fri, 6 Nov 2020 10:43:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/share/strategyreceiver/BlockStrategy.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt index eb0c2dc0d9..89901b3c1d 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt @@ -135,7 +135,7 @@ class BlockStrategy(private val context: Context, private val apis: IMogoService // 超过阈值，准备判断是否拥堵 startRecordDistanceTime = 0L if (tripDistance < 1000 && isClose() && currentSpeed < 40) { - Logger.d(TAG, "根据距离，判定为拥堵，准备上报") + Logger.d(TAG, "根据距离，判定为拥堵，准备上报, tripDistance: $tripDistance, frontDistance: $frontDistance, currentSpeed: $currentSpeed") val p = TanluUploadParams(IMogoTanluProvider.TYPE_BLOCK, IMogoTanluProvider.UPLOAD_FROM_STRATEGY_BLOCK_AUTO) val latLon = MogoLatLng(lat, lon) p.location = latLon From 0bb4dfca1c6ec1db3bdad76fddbd76d6154ea482 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Fri, 6 Nov 2020 11:36:15 +0800 Subject: [PATCH 2/4] =?UTF-8?q?bug=20fix:=20=E6=8B=A5=E5=A0=B5=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E4=B8=8A=E6=8A=A5=E9=98=B6=E6=AE=B5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=B8=85=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/share/strategyreceiver/BlockStrategy.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt index 89901b3c1d..85e8a2645e 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt @@ -144,6 +144,8 @@ class BlockStrategy(private val context: Context, private val apis: IMogoService Logger.d(TAG, "根据距离，没有判定为拥堵, tripDistance: $tripDistance, frontDistance: $frontDistance, currentSpeed: $currentSpeed") } tripDistance = 0 + lastLat = 0.0 + lastLon = 0.0 } } } From d92c5de5ce076ee1af087bcdf1a60d55d3b8783c Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Fri, 6 Nov 2020 11:48:06 +0800 Subject: [PATCH 3/4] opt strategy --- .../com/mogo/module/share/strategyreceiver/BlockStrategy.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt index 85e8a2645e..365021a41c 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt @@ -154,7 +154,7 @@ class BlockStrategy(private val context: Context, private val apis: IMogoService * 没有有效前车距离或者前车距离小于5m */ private fun isClose(): Boolean { - return frontDistance in 1..4 + return frontDistance in 1..4 || frontDistance == -1 } private fun uploadAverageSpeed(average: Float) { From 193b46f28b5c6abaf9560b7bed16ec9820fa9747 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 6 Nov 2020 12:17:25 +0800 Subject: [PATCH 4/4] opt --- .idea/gradle.xml | 1 + app/src/main/java/com/mogo/launcher/MogoApplication.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 8e9756d758..b59a552525 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -77,6 +77,7 @@ diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 3173447fb9..276f5f39c8 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -21,6 +21,7 @@ import com.mogo.module.main.service.MogoMainService; import com.mogo.module.media.MediaConstants; import com.mogo.module.push.base.PushUIConstants; import com.mogo.module.service.ServiceConst; +import com.mogo.module.share.constant.ShareConstants; import com.mogo.module.v2x.V2XConst; import com.mogo.service.IMogoServiceApis; import com.mogo.service.MogoServicePaths; @@ -74,7 +75,7 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addModule( new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME ) ); } -// MogoModulePaths.addBaseModule( new MogoModule( TanluConstants.TAG, TanluConstants.MODEL_NAME ) ); + MogoModulePaths.addBaseModule( new MogoModule( ShareConstants.TAG, ShareConstants.MODEL_NAME ) ); MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_TANLU_API, "TanluApi" ) ); MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_SHARE, "ShareControl" ) );