From 0d9edc1d001a8d0d6f0d4e2d4fbfe03e7f64911d Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Mon, 26 Dec 2022 17:55:24 +0800
Subject: [PATCH] =?UTF-8?q?[2.13.0]fixBadCase=E5=85=BC=E5=AE=B9=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8=E3=80=81?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9Topic=E5=88=97=E8=A1=A8=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=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<TopicEntity>()
-                        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<TopicEntity>()
+                            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<config.getAllTopicsCount();index++){
                    if(!recordType.getTopicsList().contains(config.getAllTopics(index))){
                        allTopicList.add(new TopicEntity(config.getAllTopics(index),false,true));
                    }
-                   Log.i("houyanli","topic="+config.getAllTopics(index));
                }
                 recordType.getTopicsList().addAll(allTopicList);
                 topicListAdapter.setData(recordType.getTopicsList());
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/dialog_case_topic_list.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/dialog_case_topic_list.xml
index ae7db16d2c..d1ef0d14ce 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/dialog_case_topic_list.xml
+++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/dialog_case_topic_list.xml
@@ -2,8 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="1270dp"
-    android:layout_height="959dp"
+    android:layout_width="1270px"
+    android:layout_height="959px"
     >
 
     <TextView
@@ -11,17 +11,17 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="#FFFFFFFF"
-        android:textSize="56dp"
+        android:textSize="56px"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="50dp"
+        android:layout_marginTop="50px"
         />
 
     <View
         android:id="@+id/viewVerticalLine"
-        android:layout_width="2dp"
-        android:layout_height="160dp"
+        android:layout_width="2px"
+        android:layout_height="160px"
         android:background="#66B8BFE8"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -31,7 +31,7 @@
     <View
         android:id="@+id/viewHorizontalLine"
         android:layout_width="match_parent"
-        android:layout_height="2dp"
+        android:layout_height="2px"
         android:background="#66B8BFE8"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -48,7 +48,7 @@
         app:layout_constraintRight_toLeftOf="@id/viewVerticalLine"
         android:text="保存"
         android:textColor="#FFFFFFFF"
-        android:textSize="52dp"
+        android:textSize="52px"
         android:gravity="center"
         />
 
@@ -62,18 +62,18 @@
         app:layout_constraintRight_toRightOf="parent"
         android:text="取消"
         android:textColor="#FFFFFFFF"
-        android:textSize="52dp"
+        android:textSize="52px"
         android:gravity="center"
         />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/clSearchLayout"
-        android:layout_width="1030dp"
-        android:layout_height="96dp"
+        android:layout_width="1030px"
+        android:layout_height="96px"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvCaseName"
-        android:layout_marginTop="50dp"
+        android:layout_marginTop="50px"
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:background="@drawable/bad_case_search_bg"
@@ -81,13 +81,13 @@
 
         <ImageView
             android:id="@+id/ivSearch"
-            android:layout_width="38dp"
-            android:layout_height="42dp"
+            android:layout_width="38px"
+            android:layout_height="42px"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             android:src="@drawable/icon_bad_case_search"
-            android:layout_marginEnd="40dp"
+            android:layout_marginEnd="40px"
             />
 
         <EditText
@@ -99,11 +99,11 @@
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toLeftOf="@id/ivSearch"
             android:hint="topic搜索"
-            android:textSize="38dp"
+            android:textSize="38px"
             android:textColor="#FFFFFFFF"
             android:textColorHint="#B3FFFFFF"
             android:background="@null"
-            android:layout_marginStart="40dp"
+            android:layout_marginStart="40px"
             />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
@@ -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"