diff --git a/gradle.properties b/gradle.properties
index 0531e07889..a672326161 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7
######## 外部依赖引用
# 车聊聊
-CARCHATTING_VERSION=1.9.0
+CARCHATTING_VERSION=1.9.3
# 车聊聊接口
CARCHATTINGPROVIDER_VERSION=1.1.7
# loglib
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java
index b39f1dfb0c..d70fa857b7 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java
@@ -7,7 +7,9 @@ import android.view.WindowManager;
import androidx.annotation.NonNull;
import com.mogo.commons.debug.DebugConfig;
+import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.R;
+import com.mogo.utils.logger.Logger;
/**
* 浮在各种wm上面的dialog基类，调用了window.setType
@@ -15,13 +17,16 @@ import com.mogo.module.common.R;
* @author tongchenfei
*/
public class BaseFloatDialog extends Dialog {
+
+ private static final String TAG = "BaseFloatDialog";
+
public BaseFloatDialog(@NonNull Context context) {
this(context, R.style.BaseFloatDialogStyle);
}
public BaseFloatDialog(@NonNull Context context, int themeResId) {
super(context, themeResId);
- if(DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD) {
+ if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD) {
addFlag();
}
}
@@ -32,4 +37,23 @@ public class BaseFloatDialog extends Dialog {
| WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION
| WindowManager.LayoutParams.FLAG_LOCAL_FOCUS_MODE);
}
+
+ @Override
+ public void show() {
+ Logger.d(TAG, "onShow====");
+ if (DebugConfig.isNeedHideAdasWhenShare()) {
+ MogoApisHandler.getInstance().getApis().getAdasControllerApi().closeADAS();
+ }
+ super.show();
+ }
+
+ @Override
+ public void dismiss() {
+ Logger.d(TAG, "onDismiss====");
+ if (DebugConfig.isNeedHideAdasWhenShare()
+ && MogoApisHandler.getInstance().getApis().getStatusManagerApi().isMainPageOnResume()) {
+ MogoApisHandler.getInstance().getApis().getAdasControllerApi().showADAS();
+ }
+ super.dismiss();
+ }
}
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt
index c91a4a13af..6c47af485f 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt
@@ -105,22 +105,10 @@ class GridFixableShareDialog(context: Context) : BaseFloatDialog(context) {
}
override fun show() {
- Logger.d(TAG, "onShow====")
- if (DebugConfig.isNeedHideAdasWhenShare()) {
- mApis.adasControllerApi.closeADAS()
- }
gridBtnManager.showShareButton()
super.show()
}
- override fun dismiss() {
- Logger.d(TAG, "onDismiss=====")
- if (DebugConfig.isNeedHideAdasWhenShare() && mApis.statusManagerApi.isMainPageOnResume) {
- mApis.adasControllerApi.showADAS()
- }
- super.dismiss()
- }
-
companion object {
private const val TAG = "GridFixableShareDialog"
}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java
index b5104f1925..e2d5333ec9 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java
@@ -35,6 +35,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import static com.mogo.module.common.entity.MarkerPoiTypeEnum.FOURS_BLOCK_UP;
import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
/**
@@ -167,6 +168,12 @@ public class V2XLocationListener implements IMogoLocationListener, CarStatusList
v2XMessageEntity.setContent(v2XRoadEventEntity);
v2XMessageEntity.setShowState(true);
V2XScenarioManager.getInstance().handlerMessage(v2XMessageEntity);
+
+ //如果poiType是道路拥堵，则调用接口查询拥堵状态
+ String poiType = v2XRoadEventEntity.getPoiType();
+ if(poiType != null && poiType.equals(FOURS_BLOCK_UP)){
+ V2XServiceManager.getIMogoTrafficUploadProvider().verifyCurrentTrafficStatus();
+ }
}
}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java
index bf65720439..e0c344ca6a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java
@@ -170,12 +170,6 @@ public class V2XRoadEventWindow extends RelativeLayout
// 道路事件行驶到了50米附近，弹出事件纠错框给用户
//Logger.d(MODULE_NAME, "V2X===道路事件：" + v2XRoadEventEntity);
- //如果poiType是道路拥堵，则调用接口查询拥堵状态
- String poiType = v2XRoadEventEntity.getPoiType();
- if(poiType != null && poiType.equals(FOURS_BLOCK_UP)){
- V2XServiceManager.getIMogoTrafficUploadProvider().verifyCurrentTrafficStatus();
- }
-
// 进行类型分发
switch (v2XRoadEventEntity.getPoiType()) {
case V2XPoiTypeEnum.TRAFFIC_CHECK: // 交通检查
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
index f656dd22e9..aaa1eba0c2 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
@@ -9,51 +9,50 @@
android:layout_marginBottom="@dimen/dp_14"
android:background="@drawable/bg_v2x_event_list_item">
-
-
+
+
+
+
-
-
26px
25px
2px
+ 82px
+ 55px
+ 95px
+
24px
diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
index c371aabb58..a4124c9e9f 100644
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -66,6 +66,9 @@
29px
-8px
84px
+ 67px
+ 45px
+ 52px
13px
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml
index 534a55cc22..77ada92145 100644
--- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml
@@ -1,7 +1,7 @@
-
+
\ No newline at end of file