From 64fe650988b8c6f7304f3615b6d31c83817d1a71 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 23 Apr 2020 11:00:11 +0800 Subject: [PATCH 1/7] update moduel version of V2X to 1.0.3.4 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 821e403f79..5c7774b037 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,7 +66,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.1 # v2x -MOGO_MODULE_V2X_VERSION=1.0.3.3-SNAPSHOT +MOGO_MODULE_V2X_VERSION=1.0.3.4 # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.4.3 # 推送 From 093a7cad79e51b3da2d4b5bb4a70335ad32f47f4 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Thu, 23 Apr 2020 11:32:43 +0800 Subject: [PATCH 2/7] bug fix --- .../main/java/com/mogo/module/share/manager/SeekHelpManager.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt index 55cb1abf97..3bb03c157c 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt @@ -16,6 +16,7 @@ import com.mogo.module.share.net.ShareApiService import com.mogo.utils.TipToast import com.mogo.utils.logger.Logger import com.mogo.utils.network.RequestOptions +import com.mogo.utils.storage.SharedPrefsMgr import com.zhidao.auto.platform.util.DeviceUtil import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers @@ -155,6 +156,7 @@ object SeekHelpManager { super.onSuccess(o) // 接口请求成功，内部同步v2x状态，通知adas，改变自车图标 ShareControl.getInstance(context).mogoServiceApis.statusManagerApi.setSeekHelping("ShareDialog", true) + SharedPrefsMgr.getInstance(context!!).putLong("seek_help_time", System.currentTimeMillis()) isSeekHelp = true aiAssist?.speakTTSVoice("已发布求助信息，将为你通知其他车主") toast("已发布求助信息，将为你通知其他车主") From b248d88221d375b7662823a9fe5534c2228730cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 23 Apr 2020 15:13:47 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0V2X=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 5c7774b037..39d4c3a7f2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,7 +66,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.1 # v2x -MOGO_MODULE_V2X_VERSION=1.0.3.4 +MOGO_MODULE_V2X_VERSION=1.0.3.6 # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.4.3 # 推送 From bbd0cda4aae9e65306f7d598ad86c6d1c332bd62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 23 Apr 2020 15:21:27 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0V2X=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 2dc54c489f..707ee6e613 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 39d4c3a7f2..7d4fdb99a8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,7 +66,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.1 # v2x -MOGO_MODULE_V2X_VERSION=1.0.3.6 +MOGO_MODULE_V2X_VERSION=1.0.3.6-SNAPSHOT # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.4.3 # 推送 From 87a05f0ec87c8bcbd769ea8a3c6c90112b9f776a Mon Sep 17 00:00:00 2001 From: ihoudf <188816190@qq.com> Date: Thu, 23 Apr 2020 17:05:29 +0800 Subject: [PATCH 5/7] onlinecar smooth fix bug --- .../service/marker/MapMarkerManager.java | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index 3204a1aeeb..cd223a66ea 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -821,6 +821,10 @@ public class MapMarkerManager implements IMogoMarkerClickListener, if (mCurrentModuleName.equals(ServiceConst.CARD_TYPE_BUSINESS_OPERATION ) || mCurrentModuleName.equals(ServiceConst.CARD_TYPE_USER_DATA) ) { + if (MarkerServiceHandler.getMogoStatusManager().isSearchUIShow()){ + return; + } + mRefreshModel.queryOnLineCarWithRoute(mCarLatLng, false, false, new RefreshCallback() { @Override public void onSuccess(Object o) { @@ -829,11 +833,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, if (result == null) { return; } - - for (int i = 0; i < carMarkers.size(); i++) { - IMogoMarker marker = carMarkers.get(i); - marker.destroy(); - } + removeCarMarkers(); List onlineCarList = result.getOnlineCar(); dispatchDataToBis(ServiceConst.CARD_TYPE_USER_DATA, onlineCarList == null ? new ArrayList<>() : onlineCarList); drawOnlineCarMarkers(onlineCarList, ServiceConst.MAX_AMOUNT_SINGLE_CARD); @@ -845,10 +845,14 @@ public class MapMarkerManager implements IMogoMarkerClickListener, } }); }else { - for (int i = 0; i < carMarkers.size(); i++) { - IMogoMarker marker = carMarkers.get(i); - marker.destroy(); - } + removeCarMarkers(); + } + } + + private void removeCarMarkers(){ + for (int i = 0; i < carMarkers.size(); i++) { + IMogoMarker marker = carMarkers.get(i); + marker.destroy(); } } @@ -860,12 +864,13 @@ public class MapMarkerManager implements IMogoMarkerClickListener, List poisList = markerOnlineCar.getPois(); if (poisList != null && poisList.size() > 0) { -// Logger.d(TAG, "在线" + poisList.toString()); +// Logger.d(TAG, "坐标------"+markerLocation.getLon()+", "+markerLocation.getLat()); List points = new ArrayList<>(); for (int j = 0; j < poisList.size(); j++) { MarkerCarPois pois = poisList.get(j); if (pois != null && pois.getCoordinates() != null && pois.getCoordinates().size() >= 2) { +// Logger.d(TAG, "坐标点：" + pois.getCoordinates().toString()); double lat = Double.valueOf(pois.getCoordinates().get(1) + ""); double lng = Double.valueOf(pois.getCoordinates().get(0) + ""); points.add(new MogoLatLng(lat, lng)); From 4e2009c1fe702893c51f20cb5dd0779eac36cea0 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Thu, 23 Apr 2020 17:33:39 +0800 Subject: [PATCH 6/7] bug fix --- .../main/java/com/mogo/module/share/manager/SeekHelpManager.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt index 3bb03c157c..5fba742d6d 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt @@ -80,6 +80,7 @@ object SeekHelpManager { * @param useLocalVoiceNotice 使用自己的语音播报，如果是从语音助手过来的请求，语音助手可能会走自己的播报，默认是使用自己的播报 */ fun seekHelp(context: Context, seekHelpListener: ISeekHelpListener, useLocalVoiceNotice: Boolean = true) { + Logger.d(TAG, "seekHelp: $isSeeking") if(!isSeeking) { isSeeking = true if (this.context == null) { @@ -94,11 +95,13 @@ object SeekHelpManager { // 正在求助中，进行异常提示 toast("已发布故障求助，请耐心等待") aiAssist?.speakTTSVoice("已发布故障求助，请耐心等待") + isSeeking = false } getSeekAmountByLimitTime() >= SEEK_RECORD_LIMIT_AMOUNT -> { // 超过限制时间内的限制次数，进行异常提示 toast("已在求助状态，请勿连续发布哦") aiAssist?.speakTTSVoice("已在求助状态，请勿连续发布哦") + isSeeking = false } else -> { // 没有异常情况，开始故障求助 From a66db673f17aaada368c569146b09dbaf2ef123e Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Thu, 23 Apr 2020 18:38:22 +0800 Subject: [PATCH 7/7] bug fix --- .../module/share/manager/SeekHelpManager.kt | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt index 5fba742d6d..70050fb729 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt @@ -20,6 +20,7 @@ import com.mogo.utils.storage.SharedPrefsMgr import com.zhidao.auto.platform.util.DeviceUtil import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers +import java.util.* /** * 故障求助管理类，相关故障求助操作的具体实现类 @@ -94,14 +95,16 @@ object SeekHelpManager { isSeekHelp -> { // 正在求助中，进行异常提示 toast("已发布故障求助，请耐心等待") - aiAssist?.speakTTSVoice("已发布故障求助，请耐心等待") isSeeking = false + aiAssist?.speakTTSVoice("已发布故障求助，请耐心等待") + seekHelpSuccess() } getSeekAmountByLimitTime() >= SEEK_RECORD_LIMIT_AMOUNT -> { // 超过限制时间内的限制次数，进行异常提示 toast("已在求助状态，请勿连续发布哦") aiAssist?.speakTTSVoice("已在求助状态，请勿连续发布哦") isSeeking = false + seekHelpSuccess() } else -> { // 没有异常情况，开始故障求助 @@ -136,10 +139,10 @@ object SeekHelpManager { */ private fun getSeekAmountByLimitTime(): Int { val current = SystemClock.elapsedRealtime() - val recordIterator = seekRecordList.iterator() - while (recordIterator.hasNext()) { - if ((current - recordIterator.next().recordTime) >= SEEK_RECORD_LIMIT_TIME) { - recordIterator.remove() + val iterator = seekRecordList.iterator() + while (iterator.hasNext()) { + if ((current - iterator.next().recordTime) >= SEEK_RECORD_LIMIT_TIME) { + iterator.remove() } } return seekRecordList.size @@ -164,9 +167,7 @@ object SeekHelpManager { aiAssist?.speakTTSVoice("已发布求助信息，将为你通知其他车主") toast("已发布求助信息，将为你通知其他车主") seekRecordList.add(SeekRecord(SystemClock.elapsedRealtime())) - seekListenerList.forEach { - it.onSeekHelpSuccess() - } + seekHelpSuccess() isSeeking = false } @@ -189,11 +190,22 @@ object SeekHelpManager { }) } + private fun seekHelpSuccess(){ + val iterator = seekListenerList.iterator() + while (iterator.hasNext()) { + iterator.next().onSeekHelpSuccess() + } + } + private fun seekHelpFail() { isSeekHelp = false - seekListenerList.forEach { - it.onSeekHelpFail() + val iterator = seekListenerList.iterator() + while (iterator.hasNext()) { + iterator.next().onSeekHelpFail() } +// seekListenerList.forEach { +// it.onSeekHelpFail() +// } toast("求助上报失败，请稍后重试") aiAssist?.speakTTSVoice("求助上报失败，请稍后重试") }