From 4ff860a9e9d6747fcb8530b0273ff1bd85bf1713 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 9 Nov 2020 10:58:49 +0800 Subject: [PATCH 1/4] opt --- .../main/java/com/mogo/module/share/manager/UploadHelper.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt index 4bd01b72f7..d99e437e32 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt @@ -39,6 +39,7 @@ object UploadHelper { // } // } else { if (ServiceApisManager.serviceApis.statusManagerApi.isUploading) { + Logger.d("UploadHelper", "upload is going -- ") // 上报即成功，当前还有正在上报的事件，仅做界面展示，不做具体操作 ServiceApisManager.serviceApis.tanluUiApi.shareSuccess(type.eventType, type.location) } else { @@ -59,6 +60,7 @@ object UploadHelper { } else { // 没网就直接提示失败 + Logger.e("UploadHelper", "upload not net ") AIAssist.getInstance(context).speakTTSVoice("分享失败，请检查网络") TipToast.tip("分享失败，请检查网络", TipDrawable(context.resources.getDrawable(R.drawable.module_share_upload_fail))) } @@ -72,7 +74,6 @@ object UploadHelper { if (shareItemSum < VOICE_ALERT_COUNT) { Log.d("UploadHelper", "shareItemSum = $shareItemSum --- intervalTime = $intervalTime --type = ${type}") var time = System.currentTimeMillis() - Log.d("UploadHelper", "time = $time ") if (intervalTime == 0.toLong()) { SharedPrefsMgr.getInstance(context).putLong(KEY_CLICK_SHARE_ITEM_TIME, time) SharedPrefsMgr.getInstance(context).putInt(KEY_CLICK_SHARE_ITEM_BUTTON, ++shareItemSum) From d1ff61cadc431dc6cc9cf658839a5812a6ae8cdc Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 9 Nov 2020 11:11:08 +0800 Subject: [PATCH 2/4] update callchat --- .idea/gradle.xml | 1 - gradle.properties | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index b59a552525..8e9756d758 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -77,7 +77,6 @@ diff --git a/gradle.properties b/gradle.properties index 5563739527..59320cacf4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -106,7 +106,7 @@ TTS_NOOP_VERSION=2.0.6 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=2.0.0 +CARCHATTING_VERSION=2.0.1 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.4.1 # loglib From 47a9f4bbd683f6157c0333b2d467e0b0507c2470 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 9 Nov 2020 11:28:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?sn=E5=88=A4=E6=96=AD,=E8=AF=B4=E8=87=AA?= =?UTF-8?q?=E5=B7=B1=E9=9A=90=E8=97=8F=E6=8B=A8=E6=89=93=E7=94=B5=E8=AF=9D?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/v2x/utils/ChartingUtil.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/ChartingUtil.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/ChartingUtil.java index 63a723fa47..d9cc294f8b 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/ChartingUtil.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/ChartingUtil.java @@ -1,10 +1,12 @@ package com.mogo.module.v2x.utils; +import com.mogo.commons.network.Utils; import com.mogo.module.common.entity.MarkerLocation; import com.mogo.module.common.entity.MarkerUserInfo; import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.V2XServiceManager; import com.mogo.utils.logger.Logger; +import com.mogo.utils.network.utils.Util; import com.zhidao.carchattingprovider.CallChattingProviderConstant; import com.zhidao.carchattingprovider.ICallChatResponse; @@ -62,6 +64,16 @@ public class ChartingUtil { */ public static void isOnLine(String sn, ChartStatusListener chartStatusListener) { try { + String isMe = Utils.getSn(); + if (isMe.equals(sn)) { + Logger.d("", "是我的分享"); + if (chartStatusListener != null) { + chartStatusListener.canCall(false); + return; + } + } else { + Logger.d("", "不是我的分享"); + } V2XServiceManager.getCarsChattingProvider().isOnLine( "CAR_CALL_TO_" + V2XConst.MODULE_NAME, V2XUtils.getApp(), From 6c4f74050269ca954130401ea5f91a8577f343d2 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 9 Nov 2020 12:44:58 +0800 Subject: [PATCH 4/4] fix bug --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 59320cacf4..a95ab390e3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -106,7 +106,7 @@ TTS_NOOP_VERSION=2.0.6 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=2.0.1 +CARCHATTING_VERSION=2.0.2 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.4.1 # loglib