From 3449eb61a3f8e4ab28d3ef6c2363568a39de6b4b Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Fri, 4 Dec 2020 18:22:15 +0800 Subject: [PATCH] =?UTF-8?q?1+16=E5=BC=BA=E5=88=B6=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E6=95=85=E9=9A=9C=E6=B1=82=E5=8A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/gradle.xml | 1 + .../java/com/mogo/module/share/manager/GridBtnManager.kt | 9 +++++++-- .../mogo/module/share/strategyreceiver/BlockStrategy.kt | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 6249850d4f..1f3d18c759 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -74,6 +74,7 @@ diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt index 07d436adba..d19e54e7df 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt @@ -6,6 +6,7 @@ import android.view.View import android.widget.GridLayout import android.widget.ImageView import android.widget.TextView +import com.mogo.commons.debug.DebugConfig import com.mogo.module.share.R import com.mogo.module.share.bean.FixableButton import com.mogo.module.share.constant.ShareConstants @@ -64,7 +65,9 @@ class GridBtnManager(val context: Context, private val container: GridLayout, pr generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_ACCIDENT, title = "事故")) generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_ROAD_CONSTRUCTION, title = "道路施工")) generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_REAL_TIME_TRAFFIC, title = "实时路况")) - generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_SEEK_HELP, title = "故障求助")) + if(DebugConfig.isMapBased()) { + generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_SEEK_HELP, title = "故障求助")) + } generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_STAGNANT_WATER, title = "道路积水")) generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_ROAD_ICY, title = "道路结冰")) generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_DENSE_FOG, title = "浓雾")) @@ -72,7 +75,9 @@ class GridBtnManager(val context: Context, private val container: GridLayout, pr val btnList = GsonUtil.arrayFromJson(config, FixableButton::class.java) if(btnList!=null&&btnList.isNotEmpty()) { btnList.forEach { btn -> - generateShareButton(btn) + if(btn.poiType != IMogoTanluProvider.TYPE_SEEK_HELP||btn.poiType == IMogoTanluProvider.TYPE_SEEK_HELP&&DebugConfig.isMapBased()){ + generateShareButton(btn) + } } } } 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 9f7b9cc036..19a7b967f5 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 @@ -136,7 +136,7 @@ class BlockStrategy(private val context: Context, private val apis: IMogoService if (current - startRecordDistanceTime >= DISTANCE_RECORD_TIME) { // 超过阈值，准备判断是否拥堵 startRecordDistanceTime = 0L - if (tripDistance in 30..1000 && isClose() && currentSpeed < 40) { + if (tripDistance in 100..1000 && isClose() && currentSpeed < 40) { 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)