diff --git a/gradle.properties b/gradle.properties index 0531e07889..d584595fab 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.7 # 车聊聊接口 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-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index e0321d28af..b2471ce6ec 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -400,7 +400,7 @@ public class MogoServices implements IMogoMapListener, */ private void closeAllPanel() { - if ( mCallProviderResponse != null ) { + if ( mCallProviderResponse == null ) { mCallProviderResponse = new ICallChatResponse() { @Override public void hideUserWindowError(@NotNull String errorMsg) { @@ -411,9 +411,11 @@ public class MogoServices implements IMogoMapListener, MogoApisHandler.getInstance().getApis().getOnlineCarPanelApi().hidePanel(); MogoApisHandler.getInstance().getApis().getAdasControllerApi().setSettingStatus(false); MogoApisHandler.getInstance().getApis().getEventPanelManager().hidePanel(); - carsChattingProvider = (ICarsChattingProvider) ARouter.getInstance().build(CallChattingProviderConstant.CAR_CALL_PROVIDER).navigation(); + if ( carsChattingProvider == null ) { + carsChattingProvider = (ICarsChattingProvider) ARouter.getInstance().build(CallChattingProviderConstant.CAR_CALL_PROVIDER).navigation(); + } if ( carsChattingProvider != null ) { - carsChattingProvider.hideUserWindow("MOGO_COMMON_SERVICE", mContext, mCallProviderResponse); + carsChattingProvider.hideUserWindow(TAG, mContext, mCallProviderResponse); } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java index 4b04d99478..17f2bd0459 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java @@ -65,6 +65,13 @@ class AccStatusIntentHandler implements IntentHandler { if ( state != ACC_OFF && state != ACC_ON && state != ACC_OFF_DELAY ) { return; } + if ( state == ACC_ON || state == ACC_OFF_DELAY ) { + Intent newIntent = new Intent( "com.freedom.ser.ACTION" ); + newIntent.putExtra( "acc", true ); + newIntent.addFlags( Intent.FLAG_INCLUDE_STOPPED_PACKAGES ); + context.sendBroadcast( newIntent ); + Logger.d( TAG, "发送广播：com.freedom.ser.ACTION" ); + } boolean accOn = state == ACC_ON; if ( MarkerServiceHandler.getMogoStatusManager().isAccOn() == accOn ) { return; 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/fragment/V2XSurroundingFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java index 571707afcb..ddb5c38c6b 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java @@ -198,6 +198,8 @@ public class V2XSurroundingFragment extends MvpFragment 0) { + if (!hasBroadTts) { + if (eventCount > 0) { AIAssist.getInstance(V2XUtils.getApp()). - speakTTSVoice("发现周边" + poiInfosList.size() + "条交通信息", null); + speakTTSVoice("发现周边" + eventCount + "条交通信息", null); } else { + Logger.e(TAG,"周边没有发现交通信息"); } } } diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml index 57fd474a50..b9b2ecf8f1 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml @@ -92,7 +92,7 @@ android:layout_marginTop="@dimen/module_v2x_surrounding_empty_tv_margin_top" android:gravity="center_horizontal" android:text="周边5公里，暂无交通事件" - android:textColor="@color/v2x_FFF_333" + android:textColor="@color/v2x_FFF_666" android:textSize="@dimen/module_v2x_surrounding_top_textsize" /> - - + + + + - - 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-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml index 045e0686d6..3b290c7bc7 100644 --- a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml +++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml @@ -3,6 +3,6 @@ \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_event_panel_more_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_event_panel_more_light.png new file mode 100644 index 0000000000..62e3039df2 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_event_panel_more_light.png differ 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 diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_go_to_share_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_go_to_share_light.xml index ca225040f2..20e37b284b 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_go_to_share_light.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_go_to_share_light.xml @@ -2,6 +2,9 @@ - + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_normal_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_normal_light.png index a37dc6a948..96bcc0308c 100644 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_normal_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_normal_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_select_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_select_light.png index 87bedfbda0..d4e3d08fc6 100644 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_select_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_select_light.png differ