yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[2.13.0]fixBadCase兼容版本空指针异常、选择Topic列表窗口显示问题

Browse Source
This commit is contained in:
xuxinchao
2022-12-26 17:55:24 +08:00
parent e72da5b1fc
commit 0d9edc1d00
3 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseConfigView.kt
View File

@@ -174,26 +174,28 @@ internal class BadCaseConfigView @JvmOverloads constructor(
override fun onAutopilotRecordConfig(config: MessagePad.RecordDataConfig) { override fun onAutopilotRecordConfig(config: MessagePad.RecordDataConfig) {
super.onAutopilotRecordConfig(config) super.onAutopilotRecordConfig(config)
ThreadUtils.runOnUiThread { ThreadUtils.runOnUiThread {
if(BadCaseConfig.dockerVersion!!.contains("2.3.0") if(BadCaseConfig.dockerVersion!=null){
|| BadCaseConfig.dockerVersion!!.contains("2.4.0") if(BadCaseConfig.dockerVersion!!.contains("2.3.0")
|| BadCaseConfig.dockerVersion!!.contains("2.5.0") || BadCaseConfig.dockerVersion!!.contains("2.4.0")
|| BadCaseConfig.dockerVersion!!.contains("2.6.0") || BadCaseConfig.dockerVersion!!.contains("2.5.0")
|| BadCaseConfig.dockerVersion!!.contains("2.8.0")){ || BadCaseConfig.dockerVersion!!.contains("2.6.0")
rvTemplate.visibility = View.GONE || BadCaseConfig.dockerVersion!!.contains("2.8.0")){
}else{ rvTemplate.visibility = View.GONE
config.recordTypesList.iterator().forEach { }else{
if (it.id != 99){ config.recordTypesList.iterator().forEach {
val topicList = ArrayList<TopicEntity>() if (it.id != 99){
it.topicsList.iterator().forEach { val topicList = ArrayList<TopicEntity>()
topicList.add(TopicEntity(it,true,false)) 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){
if(recordTypesList.size>1){ rvTemplate.visibility = View.VISIBLE
rvTemplate.visibility = View.VISIBLE recordTemplateAdapter?.setData(recordTypesList)
recordTemplateAdapter?.setData(recordTypesList) recordTemplateAdapter?.notifyDataSetChanged()
recordTemplateAdapter?.notifyDataSetChanged() }
} }
} }
} }

10
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/CaseTopicListDialog.java
View File

@@ -5,9 +5,7 @@ import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.text.Editable; import android.text.Editable;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.util.Log; import android.view.WindowManager;
import android.view.KeyEvent;
import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
@@ -62,6 +60,10 @@ public class CaseTopicListDialog extends Dialog implements IMoGoAutopilotRecordL
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.dialog_case_topic_list); setContentView(R.layout.dialog_case_topic_list);
WindowManager.LayoutParams params = getWindow().getAttributes();
params.height = 959;
params.width = 1270;
getWindow().setAttributes(params);//向WindowManager设置属性
setCanceledOnTouchOutside(false); setCanceledOnTouchOutside(false);
CallerAutopilotRecordListenerManager.INSTANCE.addListener(TAG, this); CallerAutopilotRecordListenerManager.INSTANCE.addListener(TAG, this);
init(); init();
@@ -185,13 +187,11 @@ public class CaseTopicListDialog extends Dialog implements IMoGoAutopilotRecordL
@Override @Override
public void onAutopilotRecordConfig(MessagePad.RecordDataConfig config) { public void onAutopilotRecordConfig(MessagePad.RecordDataConfig config) {
ThreadUtils.runOnUiThread(() -> { ThreadUtils.runOnUiThread(() -> {
Log.i("houyanli","AllTopicsCount="+config.getAllTopicsCount());
if(config.getAllTopicsCount()>0){ if(config.getAllTopicsCount()>0){
for(int index=0;index<config.getAllTopicsCount();index++){ for(int index=0;index<config.getAllTopicsCount();index++){
if(!recordType.getTopicsList().contains(config.getAllTopics(index))){ if(!recordType.getTopicsList().contains(config.getAllTopics(index))){
allTopicList.add(new TopicEntity(config.getAllTopics(index),false,true)); allTopicList.add(new TopicEntity(config.getAllTopics(index),false,true));
} }
Log.i("houyanli","topic="+config.getAllTopics(index));
} }
recordType.getTopicsList().addAll(allTopicList); recordType.getTopicsList().addAll(allTopicList);
topicListAdapter.setData(recordType.getTopicsList()); topicListAdapter.setData(recordType.getTopicsList());

36
core/function-impl/mogo-core-function-devatools/src/main/res/layout/dialog_case_topic_list.xml
View File

@@ -2,8 +2,8 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="1270dp" android:layout_width="1270px"
android:layout_height="959dp" android:layout_height="959px"
> >
<TextView <TextView
@@ -11,17 +11,17 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#FFFFFFFF" android:textColor="#FFFFFFFF"
android:textSize="56dp" android:textSize="56px"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="50dp" android:layout_marginTop="50px"
/> />
<View <View
android:id="@+id/viewVerticalLine" android:id="@+id/viewVerticalLine"
android:layout_width="2dp" android:layout_width="2px"
android:layout_height="160dp" android:layout_height="160px"
android:background="#66B8BFE8" android:background="#66B8BFE8"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
@@ -31,7 +31,7 @@
<View <View
android:id="@+id/viewHorizontalLine" android:id="@+id/viewHorizontalLine"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="2dp" android:layout_height="2px"
android:background="#66B8BFE8" android:background="#66B8BFE8"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
@@ -48,7 +48,7 @@
app:layout_constraintRight_toLeftOf="@id/viewVerticalLine" app:layout_constraintRight_toLeftOf="@id/viewVerticalLine"
android:text="保存" android:text="保存"
android:textColor="#FFFFFFFF" android:textColor="#FFFFFFFF"
android:textSize="52dp" android:textSize="52px"
android:gravity="center" android:gravity="center"
/> />
@@ -62,18 +62,18 @@
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
android:text="取消" android:text="取消"
android:textColor="#FFFFFFFF" android:textColor="#FFFFFFFF"
android:textSize="52dp" android:textSize="52px"
android:gravity="center" android:gravity="center"
/> />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/clSearchLayout" android:id="@+id/clSearchLayout"
android:layout_width="1030dp" android:layout_width="1030px"
android:layout_height="96dp" android:layout_height="96px"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvCaseName" app:layout_constraintTop_toBottomOf="@id/tvCaseName"
android:layout_marginTop="50dp" android:layout_marginTop="50px"
android:focusable="true" android:focusable="true"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
android:background="@drawable/bad_case_search_bg" android:background="@drawable/bad_case_search_bg"
@@ -81,13 +81,13 @@
<ImageView <ImageView
android:id="@+id/ivSearch" android:id="@+id/ivSearch"
android:layout_width="38dp" android:layout_width="38px"
android:layout_height="42dp" android:layout_height="42px"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
android:src="@drawable/icon_bad_case_search" android:src="@drawable/icon_bad_case_search"
android:layout_marginEnd="40dp" android:layout_marginEnd="40px"
/> />
<EditText <EditText
@@ -99,11 +99,11 @@
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/ivSearch" app:layout_constraintRight_toLeftOf="@id/ivSearch"
android:hint="topic搜索" android:hint="topic搜索"
android:textSize="38dp" android:textSize="38px"
android:textColor="#FFFFFFFF" android:textColor="#FFFFFFFF"
android:textColorHint="#B3FFFFFF" android:textColorHint="#B3FFFFFF"
android:background="@null" android:background="@null"
android:layout_marginStart="40dp" android:layout_marginStart="40px"
/> />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@@ -116,7 +116,7 @@
app:layout_constraintRight_toRightOf="@id/clSearchLayout" app:layout_constraintRight_toRightOf="@id/clSearchLayout"
app:layout_constraintTop_toBottomOf="@id/clSearchLayout" app:layout_constraintTop_toBottomOf="@id/clSearchLayout"
app:layout_constraintBottom_toTopOf="@id/viewHorizontalLine" app:layout_constraintBottom_toTopOf="@id/viewHorizontalLine"
android:layout_marginTop="50dp" android:layout_marginTop="50px"
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp"
android:scrollbars="vertical" android:scrollbars="vertical"
android:fadeScrollbars="false" android:fadeScrollbars="false"