From 3f910b39095c0600a0e203c11038557dcb80b233 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 4 Dec 2020 17:57:21 +0800 Subject: [PATCH 1/5] 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 2/5] 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 85a400b9077aa2f19d34838413ac2a6e295d8238 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Sun, 6 Dec 2020 12:10:04 +0800 Subject: [PATCH 3/5] 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 83b52353ee5c6d9faaf83965f75cf58c5f33d200 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 7 Dec 2020 10:41:09 +0800 Subject: [PATCH 4/5] 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 5/5] 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