From 62037386127746c1586810d228dc0eeb7b99ff15 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 17 Apr 2023 12:19:10 +0800 Subject: [PATCH 1/5] [m2] [3.1.0] [pnc] --- .../src/m2/res/layout/p_m2_fragment.xml | 4 +++- .../core/function/hmi/ui/vehicle/PncActionsView.kt | 12 ++++++------ .../src/main/res/values/attr.xml | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml index 10af0a7b63..2203334f1e 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml +++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml @@ -75,12 +75,14 @@ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt index 58bfe45c84..eb4a4ce4a7 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt @@ -44,8 +44,8 @@ class PncActionsView @JvmOverloads constructor( private var mAutoPilotStatusInfo: AutopilotStatusInfo? = null private val bgResources: Int - private val topMargin: Int - private val txtSize: Int + private val topMargin: Float + private val txtSize: Float init { LayoutInflater.from(context).inflate(R.layout.view_pnc_actions, this, true) @@ -54,13 +54,13 @@ class PncActionsView @JvmOverloads constructor( R.styleable.PncActionsView_background_resource, R.drawable.pnc_actions_bg ) - topMargin = a.getResourceId( + topMargin = a.getDimension( R.styleable.PncActionsView_pnc_top_margin, - resources.getDimension(R.dimen.dp_30).toInt() + resources.getDimension(R.dimen.dp_30) ) - txtSize = a.getResourceId( + txtSize = a.getDimension( R.styleable.PncActionsView_pnc_size, - resources.getDimension(R.dimen.dp_34).toInt() + resources.getDimension(R.dimen.dp_34) ) a.recycle() } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml index 4e1a2e3835..4bcc4c4dfd 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml @@ -76,8 +76,8 @@ - - + + \ No newline at end of file From c30851958e1ac1548955111ab76004db0ec4fefa Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 17 Apr 2023 15:10:53 +0800 Subject: [PATCH 2/5] [bugfix] [3.1.0] [pnc] --- .../mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt index eb4a4ce4a7..21fd821cf9 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt @@ -67,7 +67,7 @@ class PncActionsView @JvmOverloads constructor( override fun onAttachedToWindow() { super.onAttachedToWindow() - (tvHmiPncActions.layoutParams as MarginLayoutParams).topMargin = topMargin + (tvHmiPncActions.layoutParams as MarginLayoutParams).topMargin = topMargin.toInt() tvHmiPncActions.setTextSize(COMPLEX_UNIT_PX, txtSize.toFloat()) CallerAutoPilotStatusListenerManager.addListener(TAG, this) From b7a83dbfbbb32eb252837b4f591ce573af6f09bb Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 17 Apr 2023 16:33:07 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[bugfix]=20[=E5=88=A0=E6=8E=89=E7=A9=BA?= =?UTF-8?q?=E6=A0=BC]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt index 714a24c215..eb258c976d 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt +++ b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt @@ -232,7 +232,7 @@ class PM2DrivingInfoFragment : val time = ceil(timeInSecond / 60f).toInt() "$remainDis$disUnit".also { tv_distance.text = it } - "$time 分钟".also { tv_left_time.text = it } + "${time}分钟".also { tv_left_time.text = it } } fun noLineShow(){ From 1d0030f9ddaa397e81e9fa784bfe57539d20aa8b Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 17 Apr 2023 17:22:32 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[bugfix]=20[=E8=A7=86=E9=A2=91=E6=BA=90?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=81=E6=B7=BB=E5=8A=A0=E5=8F=8C=E8=A7=86?= =?UTF-8?q?=E9=A2=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/config/tempConfig.json | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/app/config/tempConfig.json b/app/config/tempConfig.json index fd83e6be11..5fb927ab6d 100644 --- a/app/config/tempConfig.json +++ b/app/config/tempConfig.json @@ -67,10 +67,16 @@ "shuttlepassengerm2": { "ads": [ { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210902933/erhaim2.mp4", + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", "type": 1, "cacheImgPath": "", "title": "1" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", + "type": 1, + "cacheImgPath": "", + "title": "2" } ] } @@ -143,10 +149,16 @@ "shuttlepassengerm2": { "ads": [ { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210902933/erhaim2.mp4", + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", "type": 1, "cacheImgPath": "", "title": "1" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", + "type": 1, + "cacheImgPath": "", + "title": "2" } ] } @@ -171,10 +183,16 @@ "shuttlepassengerm2": { "ads": [ { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210902933/erhaim2.mp4", + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", "type": 1, "cacheImgPath": "", "title": "1" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", + "type": 1, + "cacheImgPath": "", + "title": "2" } ] } From c3badacbbcb3bc3428f465cc328ff15b41fe1a9f Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 17 Apr 2023 18:30:24 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[dev=5Frobobus-d=5F230413=5F3.1.0]fix?= =?UTF-8?q?=E4=B8=8D=E5=A4=84=E4=BA=8E=E5=B9=B3=E8=A1=8C=E9=A9=BE=E9=A9=B6?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=8B=E5=BC=B1=E7=BD=91=E4=B9=9F=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E5=B9=B3=E8=A1=8C=E9=A9=BE=E9=A9=B6=E6=8E=A5=E7=AE=A1?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt index 179f964123..42930131e4 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt @@ -57,7 +57,7 @@ class TakeOverView @JvmOverloads constructor( autopilotStatus = autoPilotStatusInfo.state if(autoPilotStatusInfo.state == 7){ isParallel = true - }else if(autoPilotStatusInfo.state == 2){ + }else if(autoPilotStatusInfo.state == 0 || autoPilotStatusInfo.state == 1){ isParallel = false } Log.i(TAG,"自动驾驶状态${autopilotStatus}") @@ -113,7 +113,7 @@ class TakeOverView @JvmOverloads constructor( MogoReport.Code.Error.EMAP.EPARALLEL_AICLOUD_CONNECTION_ERROR -> { //如果是平行驾驶状态下，提示弱网接管 Log.i(TAG,"弱网时自动驾驶状态：${autopilotStatus}") - if(autopilotStatus == 7 || isParallel){ + if(isParallel){ CallerHmiManager.warningV2X( EventTypeEnumNew.NETWORK_WEAK_EVENT.poiType, EventTypeEnumNew.NETWORK_WEAK_EVENT.content,