diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java index ffce83b1a0..3fcba0f13c 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java @@ -191,25 +191,26 @@ public class V2XCarForHelpScenario extends AbsV2XScenario implements IM if (v2xFaultHelpDialog == null) { v2xFaultHelpDialog = new V2XSeekHelpDialog(V2XServiceManager.getContext()); } - v2xFaultHelpDialog.setOnClickListener(new V2XSeekHelpDialog.OnClickListener() { - @Override - public void onClickLeft() { - //放弃求助 - /* if (V2XServiceManager.getMoGoStatusManager().isSeekHelping()) { - V2XServiceManager.getMoGoStatusManager().setSeekHelping(TAG, false); - }*/ - closeButton(); - v2xFaultHelpDialog.dismiss(); - } - - @Override - public void onClickRight() { - //继续求助 - v2xFaultHelpDialog.dismiss(); - - } - }); - v2xFaultHelpDialog.show(); +// v2xFaultHelpDialog.setOnClickListener(new V2XSeekHelpDialog.OnClickListener() { +// @Override +// public void onClickLeft() { +// //放弃求助 +// /* if (V2XServiceManager.getMoGoStatusManager().isSeekHelping()) { +// V2XServiceManager.getMoGoStatusManager().setSeekHelping(TAG, false); +// }*/ +// closeButton(); +// v2xFaultHelpDialog.dismiss(); +// } +// +// @Override +// public void onClickRight() { +// //继续求助 +// v2xFaultHelpDialog.dismiss(); +// +// } +// }); +// v2xFaultHelpDialog.show(); + closeButton(); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java index 54ba834788..c032668c54 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java @@ -68,7 +68,7 @@ public class V2XSeekHelpButton implements IV2XButton { @Override public void close() { if (tv != null) { - AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("将为您取消", null); + AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("已取消", null); tv.setVisibility(View.GONE); V2XServiceManager.getV2XRefreshModel().cancelHelpSignal(new V2XRefreshCallback() { @Override diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpDialog.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpDialog.java index a4d8161609..97821c1f1a 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpDialog.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpDialog.java @@ -84,15 +84,18 @@ public class V2XSeekHelpDialog extends ConstraintLayout implements View.OnClickL public void show() { try { Logger.d(TAG, "使用windowManager实现"); - if ( windowManager == null ) { - windowManager = new WindowManagerView.Builder( - V2XServiceManager.getMogoEntranceButtonController().getButton(ButtonIndex.BUTTON2).getContext() - ).contentView(this).build(); - } - AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("确定要解除求助状态吗"); - unRegisterVoiceCmd(); - registerVoiceCmd(); - windowManager.show(); +// if ( windowManager == null ) { +// windowManager = new WindowManagerView.Builder( +// V2XServiceManager.getMogoEntranceButtonController().getButton(ButtonIndex.BUTTON2).getContext() +// ).contentView(this).build(); +// } +// AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("确定要解除求助状态吗"); +// unRegisterVoiceCmd(); +// registerVoiceCmd(); +// windowManager.show(); + handleLeft(); + AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("已取消"); + } catch (Exception e) { e.printStackTrace(); } @@ -120,7 +123,7 @@ public class V2XSeekHelpDialog extends ConstraintLayout implements View.OnClickL if (mListener != null) { mListener.onClickLeft(); } - unRegisterVoiceCmd(); +// unRegisterVoiceCmd(); } //继续求助 @@ -128,7 +131,7 @@ public class V2XSeekHelpDialog extends ConstraintLayout implements View.OnClickL if (mListener != null) { mListener.onClickRight(); } - unRegisterVoiceCmd(); +// unRegisterVoiceCmd(); } private void registerVoiceCmd() { 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(), diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt index 3d2697ed9e..be83a6236d 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt @@ -83,12 +83,12 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer { } override fun updateStartImage() { -// super.updateStartImage() -// -// when (mCurrentState) { -// GSYVideoView.CURRENT_STATE_PAUSE -> start.visibility = View.VISIBLE -// else -> start.visibility = View.INVISIBLE -// } + super.updateStartImage() + + when (mCurrentState) { + GSYVideoView.CURRENT_STATE_PAUSE -> start.visibility = View.VISIBLE + else -> start.visibility = View.INVISIBLE + } } fun setFullClickListener(listener: OnClickListener) { diff --git a/modules/mogo-module-v2x/src/main/res/layout/v2x_road_video_plyer_layout.xml b/modules/mogo-module-v2x/src/main/res/layout/v2x_road_video_plyer_layout.xml index 61ff05d18a..d706253444 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/v2x_road_video_plyer_layout.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/v2x_road_video_plyer_layout.xml @@ -71,13 +71,14 @@ //加载中圈圈 - + +