From 18c31db124d7e77e64c5d5cf74b6c0b23757aced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 30 Nov 2020 20:10:14 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/v2x/listener/V2XLocationListener.java | 7 +++++++ .../module/v2x/scenario/scene/road/V2XRoadEventWindow.java | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) 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: // 交通检查 From 91cb2891cbca76bdb523c17e2e4c5d933c054009 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 30 Nov 2020 20:13:49 +0800 Subject: [PATCH 2/7] fix bug --- gradle.properties | 2 +- .../module/common/dialog/BaseFloatDialog.java | 26 ++++++++++++++++++- .../share/dialog/GridFixableShareDialog.kt | 12 --------- 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0531e07889..125dc02de4 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.1-SNAPSHOT # 车聊聊接口 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" } From 0a9040ea4d58c4d5af945947eaa34d12c4a9ded4 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 30 Nov 2020 20:20:13 +0800 Subject: [PATCH 3/7] UI --- .../module-v2x-res/drawable/bg_v2x_event_list_item_light.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 0f9fc1adbdad6d15329eea087232a4366f697d14 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 30 Nov 2020 21:11:31 +0800 Subject: [PATCH 4/7] =?UTF-8?q?ui-=E5=88=86=E4=BA=AB=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout/module_v2x_event_share_item.xml | 52 +++++++++---------- .../src/main/res/values-xhdpi/dimens.xml | 4 ++ .../src/main/res/values/dimens.xml | 3 ++ 3 files changed, 33 insertions(+), 26 deletions(-) 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..1258242d0d 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,51 @@ 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 From 57376bce282f599ccd5bfef361973c5a1def30f1 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 30 Nov 2020 21:13:26 +0800 Subject: [PATCH 5/7] no message --- .../src/main/res/layout/module_v2x_event_share_item.xml | 1 - 1 file changed, 1 deletion(-) 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 1258242d0d..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 @@ -49,7 +49,6 @@ android:layout_alignLeft="@+id/road_case_useful" android:gravity="left" android:paddingLeft="@dimen/num_padding_left" - android:paddingRight="@dimen/dp_28" android:text="10009" android:textColor="@color/v2x_FFF_333" android:textSize="@dimen/share_item_text_size" /> From b45595497668ab8e601f8bdba520a3ad6ef8928d Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 30 Nov 2020 21:57:33 +0800 Subject: [PATCH 6/7] fix bug --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 125dc02de4..cfd79540ae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.9.1-SNAPSHOT +CARCHATTING_VERSION=1.9.2 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib From 5abf15ccb00294fbb624436d1ad86839dab7d40e Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Dec 2020 10:00:04 +0800 Subject: [PATCH 7/7] update callchat --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index cfd79540ae..a672326161 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.9.2 +CARCHATTING_VERSION=1.9.3 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib