Merge remote-tracking branch 'origin/qa_1.1.7' into qa_1.1.7

gradle.properties

@@ -106,7 +106,7 @@ TTS_NOOP_VERSION=2.0.6
 
 ######## 外部依赖引用
 # 车聊聊
-CARCHATTING_VERSION=2.0.0
+CARCHATTING_VERSION=2.0.2
 # 车聊聊接口
 CARCHATTINGPROVIDER_VERSION=1.4.1
 # loglib

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)

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(),