From 3449eb61a3f8e4ab28d3ef6c2363568a39de6b4b Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Fri, 4 Dec 2020 18:22:15 +0800 Subject: [PATCH 01/19] =?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) From 1e545a283683e4f1dfba9b4517c8e6a493c988d2 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 4 Dec 2020 19:36:47 +0800 Subject: [PATCH 02/19] opt --- .../zhidao/roadcondition/service/CarCorderController.kt | 4 ++-- .../java/com/zhidao/roadcondition/service/MainService.kt | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt index 0d6f65cfc8..c2614d2464 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt @@ -142,8 +142,8 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { //地图上打点 taskAsync(3_000) { try { - LatLngStickyEventBus.getInstance() - .postSticky(GetImageSuccessEvent("", mType)) +// LatLngStickyEventBus.getInstance() +// .postSticky(GetImageSuccessEvent("", mType)) } catch (e: java.lang.Exception) { e.printStackTrace() } diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt index 330de85af0..5e21b5ee79 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt @@ -3,15 +3,13 @@ package com.zhidao.roadcondition.service import android.app.AlarmManager import android.app.PendingIntent import android.app.Service -import android.content.BroadcastReceiver -import android.content.Context -import android.content.Intent -import android.content.IntentFilter +import android.content.* import android.os.IBinder import android.util.Log import com.alibaba.android.arouter.launcher.ARouter import com.elegant.analytics.Analytics import com.mogo.commons.AbsMogoApplication +import com.mogo.module.common.MogoApisHandler import com.mogo.service.IMogoServiceApis import com.mogo.service.MogoServicePaths import com.mogo.utils.logger.Logger @@ -189,6 +187,9 @@ class MainService : Service() { "MainService", "getImageEvent url = " + getImageSuccessEvent.getImageUrl() + ">>>>type =" + getImageSuccessEvent.getType() ) + + MogoApisHandler.getInstance().apis.statusManagerApi.setUploadingStatus("CARD_TYPE_ROAD_CONDITION", false) + // sendMarkerInfoReceiver( // info.latitude, // info.longitude, From 3f910b39095c0600a0e203c11038557dcb80b233 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 4 Dec 2020 17:57:21 +0800 Subject: [PATCH 03/19] opt --- .../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 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) From 6031756093fe3fc96d2ca3af8cd4f9b543fb1770 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 4 Dec 2020 19:36:47 +0800 Subject: [PATCH 04/19] opt --- .../zhidao/roadcondition/service/CarCorderController.kt | 4 ++-- .../java/com/zhidao/roadcondition/service/MainService.kt | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt index 0d6f65cfc8..c2614d2464 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt @@ -142,8 +142,8 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { //地图上打点 taskAsync(3_000) { try { - LatLngStickyEventBus.getInstance() - .postSticky(GetImageSuccessEvent("", mType)) +// LatLngStickyEventBus.getInstance() +// .postSticky(GetImageSuccessEvent("", mType)) } catch (e: java.lang.Exception) { e.printStackTrace() } diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt index 330de85af0..5e21b5ee79 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt @@ -3,15 +3,13 @@ package com.zhidao.roadcondition.service import android.app.AlarmManager import android.app.PendingIntent import android.app.Service -import android.content.BroadcastReceiver -import android.content.Context -import android.content.Intent -import android.content.IntentFilter +import android.content.* import android.os.IBinder import android.util.Log import com.alibaba.android.arouter.launcher.ARouter import com.elegant.analytics.Analytics import com.mogo.commons.AbsMogoApplication +import com.mogo.module.common.MogoApisHandler import com.mogo.service.IMogoServiceApis import com.mogo.service.MogoServicePaths import com.mogo.utils.logger.Logger @@ -189,6 +187,9 @@ class MainService : Service() { "MainService", "getImageEvent url = " + getImageSuccessEvent.getImageUrl() + ">>>>type =" + getImageSuccessEvent.getType() ) + + MogoApisHandler.getInstance().apis.statusManagerApi.setUploadingStatus("CARD_TYPE_ROAD_CONDITION", false) + // sendMarkerInfoReceiver( // info.latitude, // info.longitude, From 8388bf3250c2192efb766f158d8f1d1f0b946ac2 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 4 Dec 2020 20:49:35 +0800 Subject: [PATCH 05/19] opt --- .../java/com/zhidao/roadcondition/service/MainService.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt index 5e21b5ee79..55ee740048 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt @@ -9,6 +9,7 @@ import android.util.Log import com.alibaba.android.arouter.launcher.ARouter import com.elegant.analytics.Analytics import com.mogo.commons.AbsMogoApplication +import com.mogo.commons.debug.DebugConfig import com.mogo.module.common.MogoApisHandler import com.mogo.service.IMogoServiceApis import com.mogo.service.MogoServicePaths @@ -188,7 +189,9 @@ class MainService : Service() { "getImageEvent url = " + getImageSuccessEvent.getImageUrl() + ">>>>type =" + getImageSuccessEvent.getType() ) - MogoApisHandler.getInstance().apis.statusManagerApi.setUploadingStatus("CARD_TYPE_ROAD_CONDITION", false) + if (!DebugConfig.isMapBased()) { + MogoApisHandler.getInstance().apis.statusManagerApi.setUploadingStatus("CARD_TYPE_ROAD_CONDITION", false) + } // sendMarkerInfoReceiver( // info.latitude, From 375511e8a09c7f98437c5d5cb129ee393f843f74 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Sun, 6 Dec 2020 11:26:43 +0800 Subject: [PATCH 06/19] bugfix --- .../main/java/com/mogo/module/share/TanluManager.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java index 49cf3c74f9..5990aaba0c 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java @@ -6,6 +6,7 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Rect; import android.net.Uri; +import android.text.TextUtils; import android.util.Log; import android.view.animation.AccelerateInterpolator; import android.view.animation.Interpolator; @@ -290,7 +291,7 @@ public class TanluManager implements IMogoMarkerClickListener, @Override public void onQueryRoadInfoSuccess(@NotNull List roadInfoList) { if (roadInfoList == null || (roadInfoList != null && roadInfoList.size() <= 0)) { - if (mKeywords.equals("附近")) { + if ( TextUtils.equals(mKeywords,"附近")) { speakFailVoice("未发现附近的特殊路况"); } else { speakFailVoice("未发现" + mKeywords + "附近的特殊路况"); @@ -311,7 +312,7 @@ public class TanluManager implements IMogoMarkerClickListener, public void onQueryRoadInfoFail(@NotNull String msg, int code) { Logger.e(TAG, "onQueryRoadInfoFail ----- msg = " + msg); // speakFailVoice(searchfaileVoiceStrings[1]); - if (mKeywords.equals("附近")) { + if (TextUtils.equals(mKeywords,"附近")) { speakFailVoice("未发现附近的特殊路况"); } else { speakFailVoice("未发现" + mKeywords + "附近的特殊路况"); @@ -457,7 +458,7 @@ public class TanluManager implements IMogoMarkerClickListener, MogoLatLng latLon = poi.getPoint(); Double longit; //经度 Double lat; //维度 - if (mKeywords.equals("附近")) { + if (TextUtils.equals(mKeywords,"附近")) { Logger.d(TAG, "附近 -onPoiSearched---1---"); longit = TanluServiceManager.getLocationClient().getLastKnowLocation().getLongitude(); lat = TanluServiceManager.getLocationClient().getLastKnowLocation().getLatitude(); @@ -472,7 +473,7 @@ public class TanluManager implements IMogoMarkerClickListener, Logger.e(TAG, "poi == null"); Double longit; //经度 Double lat; //维度 - if (mKeywords.equals("附近")) { + if (TextUtils.equals(mKeywords,"附近")) { Logger.d(TAG, "附近 -onPoiSearched---2---"); longit = TanluServiceManager.getLocationClient().getLastKnowLocation().getLongitude(); lat = TanluServiceManager.getLocationClient().getLastKnowLocation().getLatitude(); From 3272c60e46a3a228444b0ceb2480e7885ac1c7e6 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Sun, 6 Dec 2020 12:10:04 +0800 Subject: [PATCH 07/19] opt --- .../mogo/module/v2x/presenter/SurroundingEventPresenter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java index 4a25965f5b..fdc2662b15 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java @@ -63,7 +63,7 @@ public class SurroundingEventPresenter extends Presenter { } Center center = new Center(location.getLatitude(), location.getLongitude()); String[] poiTypes = {"10002", "10003", "10006", "10007", "10008", "10010", "10011", "10013", "10015"}; - SurroundingRequest request = new SurroundingRequest(center, poiTypes, 5, 15); + SurroundingRequest request = new SurroundingRequest(center, poiTypes, 5, 300); eventApiService.getSurroundingEventList(Utils.getSn(), convert(GsonUtil.jsonFromObject(request))) .subscribeOn(Schedulers.io()) From 85a400b9077aa2f19d34838413ac2a6e295d8238 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Sun, 6 Dec 2020 12:10:04 +0800 Subject: [PATCH 08/19] opt --- .../mogo/module/v2x/presenter/SurroundingEventPresenter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java index 4a25965f5b..fdc2662b15 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java @@ -63,7 +63,7 @@ public class SurroundingEventPresenter extends Presenter { } Center center = new Center(location.getLatitude(), location.getLongitude()); String[] poiTypes = {"10002", "10003", "10006", "10007", "10008", "10010", "10011", "10013", "10015"}; - SurroundingRequest request = new SurroundingRequest(center, poiTypes, 5, 15); + SurroundingRequest request = new SurroundingRequest(center, poiTypes, 5, 300); eventApiService.getSurroundingEventList(Utils.getSn(), convert(GsonUtil.jsonFromObject(request))) .subscribeOn(Schedulers.io()) From 6d5ef88ecbb31929e9c9f30c4a0deea6e8f97245 Mon Sep 17 00:00:00 2001 From: donghongyu <1358506549@qq.com> Date: Sun, 6 Dec 2020 12:40:47 +0800 Subject: [PATCH 09/19] =?UTF-8?q?=E4=BF=AE=E5=BE=A9bug=20http://jira.zhida?= =?UTF-8?q?ohulian.com/browse/E84XAD-248?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/fragment/V2XEventPanelFragment.kt | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt index 81ca75a3c9..985900eb31 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt @@ -76,9 +76,9 @@ class V2XEventPanelFragment : MvpFragment() - private val mV2XScenarioHistoryFragment = V2XScenarioHistoryFragment() - private val mV2XShareEventsFragment = V2XShareEventsFragment() - private val mV2XSurroundingFragment = V2XSurroundingFragment() + private var mV2XScenarioHistoryFragment: V2XScenarioHistoryFragment? = null + private var mV2XShareEventsFragment: V2XShareEventsFragment? = null + private var mV2XSurroundingFragment: V2XSurroundingFragment? = null companion object { private var fragment: V2XEventPanelFragment? = null @@ -143,6 +143,17 @@ class V2XEventPanelFragment : MvpFragment { try { mRbScenarioHistory?.isChecked = true - mV2XScenarioHistoryFragment.fromVoice = true + mV2XScenarioHistoryFragment?.fromVoice = true } catch (e: java.lang.Exception) { e.printStackTrace() } @@ -366,10 +372,10 @@ class V2XEventPanelFragment : MvpFragment { try { if (mRbSurroundingEvent?.isChecked == true) { - mV2XSurroundingFragment.ttsForVoiceCheckout() + mV2XSurroundingFragment?.ttsForVoiceCheckout() } else { mRbSurroundingEvent?.isChecked = true - mV2XSurroundingFragment.fromVoice = true + mV2XSurroundingFragment?.fromVoice = true } } catch (e: java.lang.Exception) { e.printStackTrace() @@ -378,10 +384,10 @@ class V2XEventPanelFragment : MvpFragment { try { if (mRbShareEvents?.isChecked == true) { - mV2XShareEventsFragment.ttsForVoiceCheckout() + mV2XShareEventsFragment?.ttsForVoiceCheckout() } else { mRbShareEvents?.isChecked = true - mV2XShareEventsFragment.fromVoice = true + mV2XShareEventsFragment?.fromVoice = true } } catch (e: java.lang.Exception) { e.printStackTrace() @@ -403,8 +409,8 @@ class V2XEventPanelFragment : MvpFragment Date: Sun, 6 Dec 2020 13:48:41 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=E4=BF=AE=E5=BE=A9bug=20http://jira.zhida?= =?UTF-8?q?ohulian.com/browse/E84XAD-245?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/v2x/alarm/V2XAlarmServer.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java index f0a32200d3..c85a80e593 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java @@ -70,12 +70,8 @@ public class V2XAlarmServer { CopyOnWriteArrayList v2XRoadEventEntityList, MogoLocation currentLocation) { try { - // M1低配车机限制 - // 不展示UGC问答 - if (DebugConfig.isMapBased()) { - // 检测道路事件是否需UGC问答 - V2XEarlyWarningServer.roadEventUgcCheck(currentLocation); - } + // 检测道路事件是否需UGC问答 + V2XEarlyWarningServer.roadEventUgcCheck(currentLocation); // 60(km/h) if (currentLocation != null && v2XRoadEventEntityList != null) { // 因为集合是按照距离排序后的所以这里检索出来第一个就发出警告 From 4d22cdbf9783d4918b2038c2d164234eb0e3e9f8 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 7 Dec 2020 10:41:09 +0800 Subject: [PATCH 11/19] fixed bug --- .../src/main/java/com/mogo/module/share/TanluManager.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java index 5990aaba0c..395a1ea61b 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java @@ -545,7 +545,11 @@ public class TanluManager implements IMogoMarkerClickListener, markerShowEntity.setMarkerLocation(markerLocation); IMogoMarker mogoMarker = TanluServiceManager.getServiceApis().getMarkerService().drawMarker(markerShowEntity); - mogoMarker.setClickable(false); + if (mogoMarker != null) { + mogoMarker.setClickable(false); + } else { + Logger.e(TAG, "mogoMarker == null "); + } //添加图片动画 Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.tanlu_circle_image, null); From 83b52353ee5c6d9faaf83965f75cf58c5f33d200 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 7 Dec 2020 10:41:09 +0800 Subject: [PATCH 12/19] fixed bug --- .../src/main/java/com/mogo/module/share/TanluManager.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java index 49cf3c74f9..84f0d8b06e 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java @@ -544,7 +544,11 @@ public class TanluManager implements IMogoMarkerClickListener, markerShowEntity.setMarkerLocation(markerLocation); IMogoMarker mogoMarker = TanluServiceManager.getServiceApis().getMarkerService().drawMarker(markerShowEntity); - mogoMarker.setClickable(false); + if (mogoMarker != null) { + mogoMarker.setClickable(false); + } else { + Logger.e(TAG, "mogoMarker == null "); + } //添加图片动画 Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.tanlu_circle_image, null); From 0037a9300bc60c4384a528c543c89ee7b5a2bf4e Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 7 Dec 2020 12:06:13 +0800 Subject: [PATCH 13/19] opt --- .../com/mogo/module/v2x/fragment/V2XSurroundingFragment.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java index ddb5c38c6b..969b142807 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java @@ -166,6 +166,7 @@ public class V2XSurroundingFragment extends MvpFragment Date: Mon, 7 Dec 2020 12:06:13 +0800 Subject: [PATCH 14/19] opt --- .../com/mogo/module/v2x/fragment/V2XSurroundingFragment.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java index ddb5c38c6b..969b142807 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java @@ -166,6 +166,7 @@ public class V2XSurroundingFragment extends MvpFragment Date: Mon, 7 Dec 2020 12:08:56 +0800 Subject: [PATCH 15/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=20http://jira.zhida?= =?UTF-8?q?ohulian.com/browse/E84XAD-250=3Ffilter=3D-1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt index 985900eb31..44ebe2db83 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt @@ -372,7 +372,9 @@ class V2XEventPanelFragment : MvpFragment { try { if (mRbSurroundingEvent?.isChecked == true) { - mV2XSurroundingFragment?.ttsForVoiceCheckout() + if (DebugConfig.isMapBased()) { + mV2XSurroundingFragment?.ttsForVoiceCheckout() + } } else { mRbSurroundingEvent?.isChecked = true mV2XSurroundingFragment?.fromVoice = true From 85eeac93d5621c4a8286f9fcceac36573c754a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 7 Dec 2020 14:29:09 +0800 Subject: [PATCH 16/19] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8Dbug?= =?UTF-8?q?=20http://jira.zhidaohulian.com/browse/E84XAD-255?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/v2x/V2XServiceManager.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java index 47f348aff0..d541614125 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java @@ -14,6 +14,7 @@ import com.mogo.module.v2x.manager.IMoGoV2XMarkerManager; import com.mogo.module.v2x.manager.IMoGoV2XPolylineManager; import com.mogo.module.v2x.manager.IMoGoV2XStatusManager; import com.mogo.module.v2x.network.V2XRefreshModel; +import com.mogo.module.v2x.utils.V2XUtils; import com.mogo.service.IMogoServiceApis; import com.mogo.service.MogoServicePaths; import com.mogo.service.adas.IMogoADASController; @@ -29,11 +30,11 @@ import com.mogo.service.module.IMogoMarkerService; import com.mogo.service.module.IMogoRegisterCenter; import com.mogo.service.module.IMogoSearchManager; import com.mogo.service.share.IMogoShareManager; +import com.mogo.service.share.IMogoTanluProvider; import com.mogo.service.share.IMogoTrafficUploadProvider; import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.service.strategy.IMogoOnlineCarListPanelProvider; import com.mogo.service.strategy.IMogoRefreshStrategyController; -import com.mogo.service.share.IMogoTanluProvider; import com.mogo.service.windowview.IMogoTopViewManager; import com.mogo.service.windowview.IMogoWindowManager; import com.zhidao.carchattingprovider.CallChattingProviderConstant; @@ -96,7 +97,7 @@ public class V2XServiceManager { private static IMoGoV2XPolylineManager moGoV2XPolylineManager; private static IMoGoV2XStatusManager moGoV2XStatusManager; - private V2XServiceManager(){ + private V2XServiceManager() { } @@ -126,7 +127,7 @@ public class V2XServiceManager { mIMogoTrafficUploadProvider = mMogoServiceApis.getTrafficUploadApi(); mMogoOnlineCarListPanelProvider = mMogoServiceApis.getOnlineCarPanelApi(); //事件面板 - mIEventPanelProvider = mMogoServiceApis.getEventPanelManager(); + mIEventPanelProvider = mMogoServiceApis.getEventPanelManager(); mMarkerManager = mMapService.getMarkerManager(context); mNavi = mMapService.getNavi(context); @@ -239,6 +240,9 @@ public class V2XServiceManager { } public static IMoGoV2XStatusManager getMoGoV2XStatusManager() { + if (moGoV2XStatusManager == null) { + moGoV2XStatusManager = (IMoGoV2XStatusManager) ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_STATUS_MANAGER).navigation(V2XUtils.getApp()); + } return moGoV2XStatusManager; } @@ -278,7 +282,7 @@ public class V2XServiceManager { return mIMogoTanluProvider; } - public static IMogoTrafficUploadProvider getIMogoTrafficUploadProvider(){ + public static IMogoTrafficUploadProvider getIMogoTrafficUploadProvider() { return mIMogoTrafficUploadProvider; } @@ -286,7 +290,7 @@ public class V2XServiceManager { return mMogoOnlineCarListPanelProvider; } - public static IEventPanelProvider getEventPanelProvider(){ + public static IEventPanelProvider getEventPanelProvider() { return mIEventPanelProvider; } } From da7e4aae4dc5cfe3f02166114650f101a622bfa0 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 7 Dec 2020 14:39:39 +0800 Subject: [PATCH 17/19] =?UTF-8?q?em1=E3=80=81em2=E3=80=81d82=E4=B8=8A?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E9=BB=98=E8=AE=A4=E9=80=9F=E5=BA=A6=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/functions/leftpanel.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/functions/leftpanel.gradle b/app/functions/leftpanel.gradle index d1ff2a99ea..a48cd07a81 100644 --- a/app/functions/leftpanel.gradle +++ b/app/functions/leftpanel.gradle @@ -4,9 +4,9 @@ project.dependencies { if (Boolean.valueOf(RELEASE)) { bydautoImplementation rootProject.ext.dependencies.moduleleftpanel - d82xImplementation rootProject.ext.dependencies.moduleleftpanelnoop - em1Implementation rootProject.ext.dependencies.moduleleftpanelnoop - em2Implementation rootProject.ext.dependencies.moduleleftpanelnoop + d82xImplementation rootProject.ext.dependencies.moduleleftpanel + em1Implementation rootProject.ext.dependencies.moduleleftpanel + em2Implementation rootProject.ext.dependencies.moduleleftpanel d8xxImplementation rootProject.ext.dependencies.moduleleftpanelnoop d80xImplementation rootProject.ext.dependencies.moduleleftpanelnoop em4Implementation rootProject.ext.dependencies.moduleleftpanelnoop @@ -18,9 +18,9 @@ project.dependencies { } else { bydautoImplementation project(':modules:mogo-module-left-panel') - d82xImplementation project(':modules:mogo-module-left-panel-noop') - em1Implementation project(':modules:mogo-module-left-panel-noop') - em2Implementation project(':modules:mogo-module-left-panel-noop') + d82xImplementation project(':modules:mogo-module-left-panel') + em1Implementation project(':modules:mogo-module-left-panel') + em2Implementation project(':modules:mogo-module-left-panel') d8xxImplementation project(':modules:mogo-module-left-panel-noop') d80xImplementation project(':modules:mogo-module-left-panel-noop') em4Implementation project(':modules:mogo-module-left-panel-noop') From 376f651a66600e1657fe68f5b75c7d90a5e2fb2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 7 Dec 2020 14:54:53 +0800 Subject: [PATCH 18/19] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8Dbug?= =?UTF-8?q?=20http://jira.zhidaohulian.com/browse/E84XAD-250?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt index 44ebe2db83..631900f819 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt @@ -247,7 +247,9 @@ class V2XEventPanelFragment : MvpFragment { try { if (mRbSurroundingEvent?.isChecked == true) { - if (DebugConfig.isMapBased()) { - mV2XSurroundingFragment?.ttsForVoiceCheckout() - } + mV2XSurroundingFragment?.ttsForVoiceCheckout() } else { mRbSurroundingEvent?.isChecked = true mV2XSurroundingFragment?.fromVoice = true From 7cdb659533dfc4aeb80b9eedc5a778f19a1aa4e6 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 7 Dec 2020 15:19:59 +0800 Subject: [PATCH 19/19] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=9F=E5=BA=A6?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhidao/mogo/module/left/panel/LeftPanelProvider.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/LeftPanelProvider.kt b/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/LeftPanelProvider.kt index 80a08427d4..a93aa8b11c 100644 --- a/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/LeftPanelProvider.kt +++ b/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/LeftPanelProvider.kt @@ -12,6 +12,7 @@ import com.mogo.map.marker.IMogoMarkerClickListener import com.mogo.map.navi.IMogoNaviListener import com.mogo.service.module.IMogoModuleLifecycle import com.mogo.service.module.IMogoModuleProvider +import com.mogo.utils.AppUtils import com.mogo.utils.logger.Logger import com.zhidao.mogo.module.left.panel.LeftPanelConst.MODULE_NAME import com.zhidao.mogo.module.left.panel.LeftPanelConst.PATH_NAME @@ -58,6 +59,9 @@ class LeftPanelProvider:IMogoModuleProvider { } override fun createFragment(context: Context?, data: Bundle?): Fragment? { + if (AppUtils.isAppInstalled(context, "com.zhidao.autopilot")) { + return null + } return SimpleSpeedFragment() }