From 75d83601cfbb4ac3fb2b9493a64ba9deae206065 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 2 Aug 2023 15:22:10 +0800 Subject: [PATCH 1/7] [3.4.0] fix ui --- .../java/com/mogo/och/taxi/passenger/ui/TaxiPSettingView.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPSettingView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPSettingView.kt index 9f7b164b0f..9d9bba9a4c 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPSettingView.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPSettingView.kt @@ -10,12 +10,14 @@ import android.media.AudioManager import android.provider.Settings import android.text.TextUtils import android.util.AttributeSet +import android.util.Log import android.view.Gravity import android.view.LayoutInflater import android.view.View import android.widget.SeekBar import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat +import androidx.core.view.isVisible import com.mogo.commons.module.intent.IMogoIntentListener import com.mogo.commons.module.intent.IntentManager import com.mogo.commons.module.receiver.MogoReceiver @@ -165,6 +167,9 @@ class TaxiPSettingView @JvmOverloads constructor( } override fun onIntentReceived(intentStr: String?, intent: Intent?) { + if(!isVisible){ + return + } if (TextUtils.equals(ACTION_VOLUME_CHANGE, intentStr)) { if (intent!!.getIntExtra( MogoReceiver.EXTRA_VOLUME_STREAM_TYPE, -1 From 7fc984ed329816e54de165e0a50ea3011657251b Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 2 Aug 2023 15:43:47 +0800 Subject: [PATCH 2/7] [3.4.0] resrt --- .../java/com/mogo/och/taxi/passenger/ui/TaxiPSettingView.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPSettingView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPSettingView.kt index 9d9bba9a4c..957ed9cb2f 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPSettingView.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPSettingView.kt @@ -167,9 +167,6 @@ class TaxiPSettingView @JvmOverloads constructor( } override fun onIntentReceived(intentStr: String?, intent: Intent?) { - if(!isVisible){ - return - } if (TextUtils.equals(ACTION_VOLUME_CHANGE, intentStr)) { if (intent!!.getIntExtra( MogoReceiver.EXTRA_VOLUME_STREAM_TYPE, -1 From 2d2315d7311b26f4411d54954f88d83b9f9ba16e Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Wed, 2 Aug 2023 16:36:22 +0800 Subject: [PATCH 3/7] =?UTF-8?q?[340][=E9=AD=94=E6=96=B9]=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=B7=BB=E5=8A=A0=E6=8C=AF=E5=8A=A8=E5=8F=8D?= =?UTF-8?q?=E9=A6=88=EF=BC=8C=E8=87=AA=E8=BD=A6=E6=95=B0=E6=8D=AE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96=EF=BC=8C=E7=A7=BB=E9=99=A4=E5=86=97?= =?UTF-8?q?=E4=BD=99=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/AndroidManifest.xml | 2 +- .../zhidao/adas/magic/ui/MainActivity.java | 20 +++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/app_mogo_magic_ring/src/main/AndroidManifest.xml b/app_mogo_magic_ring/src/main/AndroidManifest.xml index 98a158eb58..e0a51cb24e 100644 --- a/app_mogo_magic_ring/src/main/AndroidManifest.xml +++ b/app_mogo_magic_ring/src/main/AndroidManifest.xml @@ -9,7 +9,7 @@ - + { private final static String TAG = MainActivity.class.getSimpleName(); private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", Locale.getDefault()); - private static final String GNSS_HINT = "%s\n经度：%f 纬度：%f 海拔：%f 航向角：%f 加速度：%f 曲率：%f 惯导车速：%f 车辆车速：%f"; + private static final String GNSS_HINT = "%s\n经度：%f 纬度：%f 海拔：%f 航向角：%f 加速度：%f 车速：%f"; private static final int WHAT_IPC_IP = 0x00; private static final int WHAT_IPC_CONNECT_STATE = 0x01; @@ -116,7 +119,7 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas private ListPopupWindow listPopupWindow; private FloatWindow floatWindow; private View include_title; - + private Vibrator vibrator; @Override protected void onCreate(Bundle savedInstanceState) { @@ -129,6 +132,7 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas onUpdateConnectStateView(); showIPCIP(); AdasManager.getInstance().setEnableLog(false); + vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE); } @@ -472,8 +476,7 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas Message message = Message.obtain(); message.what = WHAT_UPDATE_GNSS; message.obj = String.format(Locale.getDefault(), GNSS_HINT, sdf.format(new Date((long) (header.getTimestamp() * 1000))), - gnssInfo.getLongitude(), gnssInfo.getLatitude(), gnssInfo.getAltitude(), gnssInfo.getHeading(), gnssInfo.getAcceleration(), - gnssInfo.getYawRate(), gnssInfo.getGnssSpeed(), gnssInfo.getVehicleSpeed()); + gnssInfo.getLongitude(), gnssInfo.getLatitude(), gnssInfo.getAltitude(), gnssInfo.getHeading(), gnssInfo.getAcceleration(), gnssInfo.getGnssSpeed()); getHandler().sendMessage(message); } @@ -734,6 +737,15 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas @Override public void onItemClick(int position, TitleBean data) { + if (vibrator != null) {//震动 + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) { + VibrationEffect vibe = VibrationEffect.createOneShot(80, 255); + vibrator.vibrate(vibe); + } else { + vibrator.vibrate(80); + } + } + if (connectStatus != IPC_CONNECTION_STATUS.CONNECTED) { String msg = "未连接工控机"; showToastCenter(msg); From 3610569ea83be1fed19fc77cd79951aa231fbfe0 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Wed, 2 Aug 2023 16:51:26 +0800 Subject: [PATCH 4/7] =?UTF-8?q?[3.4.0]=E8=BF=90=E8=90=A5=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BD=95=E5=8C=85=E5=BC=B9=E7=AA=97=E5=BC=80?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hmi/ui/msgbox/DriverMsgBoxBubbleView.kt | 2 +- .../function/hmi/ui/setting/SOPSettingView.kt | 6 ++++++ .../src/main/res/layout/view_sop_setting.xml | 16 +++++++++++++++- .../core/data/config/FunctionBuildConfig.kt | 7 +++++++ 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt index 55210ed9b4..f5c87af79d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt @@ -88,7 +88,7 @@ class DriverMsgBoxBubbleView @JvmOverloads constructor( } if(isShowData){ if(category == MsgCategory.RECORD_BAG){ - if(!FunctionBuildConfig.isDemoMode){ + if(!FunctionBuildConfig.isDemoMode && FunctionBuildConfig.isShowBagRecordWindow){ //弹出被动录包弹窗 CallerDevaToolsManager.onReceiveBadCaseRecord(msgBoxBean,context as Activity,true) CallerMsgBoxEventListenerManager.invokeUpdateTipListener(true) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt index 0eb27acdf8..3704c2ffec 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt @@ -271,6 +271,12 @@ internal class SOPSettingView @JvmOverloads constructor( hmiAction("SOP 故障减速停车, ",isChecked) } + //是否展示被动触发的录包弹窗（自动驾驶下出现问题触发的录包） + tbShowBagRecordWindow.isChecked = FunctionBuildConfig.isShowBagRecordWindow + tbShowBagRecordWindow.setOnCheckedChangeListener{_, isChecked -> + FunctionBuildConfig.isShowBagRecordWindow = isChecked + hmiAction("SOP 是否展示被动触发的录包弹窗, ",isChecked) + } //变道绕障的目标障碍物速度阈值 tvSpeed.text = "${FunctionBuildConfig.detouringSpeed} m/s" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml index 83498eb0b9..d962fb88f4 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml @@ -318,9 +318,23 @@ android:scaleY="1.2" android:scaleX="1.2" app:layout_constraintTop_toBottomOf="@id/tbWeakNetSlowDown" - app:layout_constraintRight_toLeftOf="@+id/verticalGuideLine" + app:layout_constraintRight_toLeftOf="@id/verticalGuideLine" app:layout_constraintLeft_toLeftOf="parent" /> + + 工控机->App) */ From f78ba72c6a5619bab6ebaac647a5ab0a3dfd8a4a Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 2 Aug 2023 19:18:02 +0800 Subject: [PATCH 5/7] =?UTF-8?q?[bugfix]=20[bus=20=E8=87=AA=E9=A9=BE?= =?UTF-8?q?=E4=B8=AD=E5=8F=AF=E4=BB=A5=E9=87=8D=E5=A4=8D=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E8=87=AA=E9=A9=BE=20=E4=BD=86=E6=98=AF=E4=B8=8D=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/bus/model/OrderModel.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java index bb99b9c96c..ad92e2fc57 100644 --- a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java +++ b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java @@ -647,6 +647,10 @@ public class OrderModel { */ private void startAutopilot(boolean isRestart, int leaveIndex) { + + // 非自驾状态---->预写日志----> 启动自驾 ---> 自驾启动成功 ----> 上报日志 + // 　自驾状态---->启动自驾 ---> 自驾启动成功 + //根据开关和后台是否发布轨迹启动自驾 if (FunctionBuildConfig.isPassStartAutopilotCommand && TextUtils.isEmpty(busRoutesResult.csvFileUrl) && TextUtils.isEmpty(busRoutesResult.csvFileUrlDPQP)){ @@ -661,12 +665,6 @@ public class OrderModel { CallerLogger.INSTANCE.e(M_BUS + TAG, "isPassStartAutopilotCommand = " + FunctionBuildConfig.isPassStartAutopilotCommand); - if(CallerAutoPilotStatusListenerManager.INSTANCE.getState() - == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){ - ToastUtils.showShort("自驾中、请勿重复启动"); - return; - } - if (!FunctionBuildConfig.isDemoMode && !OCHAdasAbilityManager.getInstance().getAutopilotAbilityStatus()) { ToastUtils.showLong(OCHAdasAbilityManager.getInstance().getAutopilotUnAbilityReason() + @@ -677,7 +675,10 @@ public class OrderModel { firstStartAutopilot++; - triggerStartServiceEvent(isRestart, false); + if(CallerAutoPilotStatusListenerManager.INSTANCE.getState() != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){ + // 预写日志 + triggerStartServiceEvent(isRestart, false); + } AutopilotControlParameters parameters = initAutopilotControlParameters(leaveIndex); if (null == parameters) { From 41018a27edeed94a56c0e84b33ec24988a3468f4 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 2 Aug 2023 19:18:55 +0800 Subject: [PATCH 6/7] =?UTF-8?q?[3.4.0]=20[ui=E8=B0=83=E6=95=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taxi/passenger/ui/video/InfoVideoView.kt | 12 ++++++++++++ .../taxi/passenger/widget/ConsultVideoPlayer.kt | 17 +++++++++-------- .../main/res/layout/taxi_p_base_fragment.xml | 2 +- .../src/main/res/layout/taxi_p_itinerary.xml | 12 ++++++++---- .../src/main/res/layout/taxi_p_video_show.xml | 1 + .../src/main/res/values/colors.xml | 2 +- 6 files changed, 32 insertions(+), 14 deletions(-) diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt index cb6bcc2ea9..69a15e92b9 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt @@ -215,6 +215,18 @@ internal class InfoVideoView @JvmOverloads constructor( return Pair(centerItemPosition, player) } + override fun onWindowFocusChanged(hasWindowFocus: Boolean) { + super.onWindowFocusChanged(hasWindowFocus) + val carouselLayoutManager = rvVideoPlaylist?.layoutManager as CarouselLayoutManager + val (centerItemPosition: Int, player) = getPlayer(carouselLayoutManager) + player?.let { + if(it.isInPlayingState&&!it.isIfCurrentIsFullscreen&&!hasWindowFocus){ + player.onVideoPause() + } + } + + } + override fun onDetachedFromWindow() { super.onDetachedFromWindow() } diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt index 20cf8b4e41..f8d37dbd24 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt @@ -122,6 +122,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { layoutParams2.height = AutoSizeUtils.dp2px(context,108f) layoutParams2.width = AutoSizeUtils.dp2px(context,108f) fullscreenButton.layoutParams = layoutParams2 + fullscreenButton.visibility = View.VISIBLE } } @@ -152,13 +153,13 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { override fun onWindowFocusChanged(hasWindowFocus: Boolean) { super.onWindowFocusChanged(hasWindowFocus) -// if(isIfCurrentIsFullscreen&&smalllPlayer!=null){ -// if(hasWindowFocus){//获取焦点 -// onVideoResume() -// }else{ -// onVideoPause() -// } -// } + if(isIfCurrentIsFullscreen&&smalllPlayer!=null){ + if(hasWindowFocus){//获取焦点 + onVideoResume() + }else{ + onVideoPause() + } + } } override fun touchDoubleUp() { @@ -167,7 +168,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { override fun changeUiToNormal() { super.changeUiToNormal() - setViewShowState(fullscreenButton, INVISIBLE) + //setViewShowState(fullscreenButton, INVISIBLE) this.statusBarView?.visibility = View.VISIBLE } diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml index 5367e1e268..d43c11a0a8 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -16,7 +16,7 @@ app:compassDrawable="@drawable/taxi_p_map_car_light" app:mapStyleExtraPath="style_extra.data" app:mapStylePath="style.data" - app:leftPadding="160" + app:leftPadding="800" app:rightPadding="160" app:topPadding="160" app:bottomPadding="160" diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml index 852c6b1fb4..a5666659f3 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml @@ -8,6 +8,7 @@ @@ -82,7 +84,8 @@ android:layout_width="0dp" android:gravity="center" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_51" + android:layout_marginTop="@dimen/dp_50" + android:layout_marginBottom="@dimen/dp_66" android:layout_marginStart="@dimen/dp_58" android:textSize="@dimen/dp_61" android:fontFamily="@font/din" @@ -90,7 +93,8 @@ android:textColor="@color/taxi_p_081831" app:layout_constraintEnd_toStartOf="@+id/actv_surplus_time" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/actv_speed_value" + app:layout_constraintTop_toTopOf="@+id/v_bottom_bg" + app:layout_constraintBottom_toBottomOf="@+id/v_bottom_bg" android:text="--" /> #004DC4 #293449 #203555 - #5C71AB + #B35C71AB #081831 #112B57 #66476FBE From e308f5d81f19c942c807f5d4e71553198e0fe148 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 2 Aug 2023 19:28:46 +0800 Subject: [PATCH 7/7] =?UTF-8?q?[3.4.0]=20[=E8=A7=86=E9=A2=91=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E5=9B=9E=E6=9D=A5=E4=B8=8D=E8=87=AA=E5=8A=A8=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E6=92=AD=E6=94=BE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt index 69a15e92b9..d8212bac16 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt @@ -107,7 +107,7 @@ internal class InfoVideoView @JvmOverloads constructor( if (!player.isIfCurrentIsFullscreen) { when (player.currentState) { GSYVideoView.CURRENT_STATE_PAUSE -> { - player.onVideoResume(false) + //player.onVideoResume(false) } else -> {} }