From e72da5b1fc45e45396c5500123c208a5d6264798 Mon Sep 17 00:00:00 2001 From: renwj Date: Mon, 26 Dec 2022 17:08:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[2.13.0]=E8=BF=9C=E8=A7=86=E8=A7=92?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/function/call/map/CallerVisualAngleManager.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt index 19904a4bc2..1d04a769d3 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt @@ -276,6 +276,11 @@ object CallerVisualAngleManager { if (displayDuration < prev.displayThreshold) { Log.d("${M_DEVA}${TAG}", "--- 5 --- 场景[$prev]:仍在保护展示时长内，直接return") return@launch + } else { + Log.d("${M_DEVA}${TAG}", "--- 6 --- 场景[$prev]:已过保护展示时长，从展示的队列中移除，显示默认视角") + queue -= displayed + changeVisualAngle(Default()) + return@launch } } if (prev is Turning && current is Turning) { From 0d9edc1d001a8d0d6f0d4e2d4fbfe03e7f64911d Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 26 Dec 2022 17:55:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[2.13.0]fixBadCase=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E3=80=81=E9=80=89=E6=8B=A9Topic=E5=88=97=E8=A1=A8=E7=AA=97?= =?UTF-8?q?=E5=8F=A3=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/biz/BadCaseConfigView.kt | 38 ++++++++++--------- .../badcase/biz/CaseTopicListDialog.java | 10 ++--- .../res/layout/dialog_case_topic_list.xml | 36 +++++++++--------- 3 files changed, 43 insertions(+), 41 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseConfigView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseConfigView.kt index cbdaa3df24..9a81e1d609 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseConfigView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseConfigView.kt @@ -174,26 +174,28 @@ internal class BadCaseConfigView @JvmOverloads constructor( override fun onAutopilotRecordConfig(config: MessagePad.RecordDataConfig) { super.onAutopilotRecordConfig(config) ThreadUtils.runOnUiThread { - if(BadCaseConfig.dockerVersion!!.contains("2.3.0") - || BadCaseConfig.dockerVersion!!.contains("2.4.0") - || BadCaseConfig.dockerVersion!!.contains("2.5.0") - || BadCaseConfig.dockerVersion!!.contains("2.6.0") - || BadCaseConfig.dockerVersion!!.contains("2.8.0")){ - rvTemplate.visibility = View.GONE - }else{ - config.recordTypesList.iterator().forEach { - if (it.id != 99){ - val topicList = ArrayList() - it.topicsList.iterator().forEach { - topicList.add(TopicEntity(it,true,false)) + if(BadCaseConfig.dockerVersion!=null){ + if(BadCaseConfig.dockerVersion!!.contains("2.3.0") + || BadCaseConfig.dockerVersion!!.contains("2.4.0") + || BadCaseConfig.dockerVersion!!.contains("2.5.0") + || BadCaseConfig.dockerVersion!!.contains("2.6.0") + || BadCaseConfig.dockerVersion!!.contains("2.8.0")){ + rvTemplate.visibility = View.GONE + }else{ + config.recordTypesList.iterator().forEach { + if (it.id != 99){ + val topicList = ArrayList() + it.topicsList.iterator().forEach { + topicList.add(TopicEntity(it,true,false)) + } + recordTypesList.add(RecordTypeEntity(it.id,it.desc,topicList)) } - recordTypesList.add(RecordTypeEntity(it.id,it.desc,topicList)) } - } - if(recordTypesList.size>1){ - rvTemplate.visibility = View.VISIBLE - recordTemplateAdapter?.setData(recordTypesList) - recordTemplateAdapter?.notifyDataSetChanged() + if(recordTypesList.size>1){ + rvTemplate.visibility = View.VISIBLE + recordTemplateAdapter?.setData(recordTypesList) + recordTemplateAdapter?.notifyDataSetChanged() + } } } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/CaseTopicListDialog.java b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/CaseTopicListDialog.java index c9f0686c77..08ad929554 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/CaseTopicListDialog.java +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/CaseTopicListDialog.java @@ -5,9 +5,7 @@ import android.content.Context; import android.os.Bundle; import android.text.Editable; import android.text.TextWatcher; -import android.util.Log; -import android.view.KeyEvent; -import android.view.View; +import android.view.WindowManager; import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; @@ -62,6 +60,10 @@ public class CaseTopicListDialog extends Dialog implements IMoGoAutopilotRecordL protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.dialog_case_topic_list); + WindowManager.LayoutParams params = getWindow().getAttributes(); + params.height = 959; + params.width = 1270; + getWindow().setAttributes(params);//向WindowManager设置属性 setCanceledOnTouchOutside(false); CallerAutopilotRecordListenerManager.INSTANCE.addListener(TAG, this); init(); @@ -185,13 +187,11 @@ public class CaseTopicListDialog extends Dialog implements IMoGoAutopilotRecordL @Override public void onAutopilotRecordConfig(MessagePad.RecordDataConfig config) { ThreadUtils.runOnUiThread(() -> { - Log.i("houyanli","AllTopicsCount="+config.getAllTopicsCount()); if(config.getAllTopicsCount()>0){ for(int index=0;index @@ -62,18 +62,18 @@ app:layout_constraintRight_toRightOf="parent" android:text="取消" android:textColor="#FFFFFFFF" - android:textSize="52dp" + android:textSize="52px" android:gravity="center" /> @@ -116,7 +116,7 @@ app:layout_constraintRight_toRightOf="@id/clSearchLayout" app:layout_constraintTop_toBottomOf="@id/clSearchLayout" app:layout_constraintBottom_toTopOf="@id/viewHorizontalLine" - android:layout_marginTop="50dp" + android:layout_marginTop="50px" android:layout_marginBottom="20dp" android:scrollbars="vertical" android:fadeScrollbars="false" From 82ab8d48d71229d620deb4f8594e517051437939 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Mon, 26 Dec 2022 18:55:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[2.13.0]=20=E8=A7=A3=E5=86=B3=E5=AF=BC?= =?UTF-8?q?=E8=88=AA=E6=8C=89=E9=92=AE=E8=A6=86=E7=9B=96=E7=AB=99=E7=82=B9?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml index 1eff5f1dc8..0001414e85 100644 --- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml +++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml @@ -74,6 +74,7 @@ android:lineSpacingExtra="10dp" android:textColor="#FFFFFF" android:textSize="@dimen/dp_46" + android:layout_marginRight="@dimen/dp_60" app:layout_constraintRight_toLeftOf="@+id/module_och_taxi_navi_end_iv" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@+id/module_och_taxi_order_station_title_2"