From 45eddf619ce92d50f425dac86b79c966e99074de Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Thu, 27 Oct 2022 16:51:04 +0800 Subject: [PATCH] =?UTF-8?q?BadCase=E8=87=AA=E5=AE=9A=E4=B9=89=E5=BD=95?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/biz/CaseListDialog.java | 18 ++++++--- .../badcase/biz/CaseTopicListDialog.java | 37 ++++++++++--------- .../src/main/res/layout/item_case_list.xml | 8 ++-- .../main/res/layout/item_record_template.xml | 8 ++-- .../main/res/layout/layout_badcase_config.xml | 15 ++------ 5 files changed, 42 insertions(+), 44 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/CaseListDialog.java b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/CaseListDialog.java index 07f6e8b59f..9756927f7f 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/CaseListDialog.java +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/CaseListDialog.java @@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.mogo.eagle.core.data.badcase.RecordCaseEntity; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener; +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager; import com.mogo.eagle.core.utilcode.util.ThreadUtils; import com.zhjt.mogo_core_function_devatools.R; @@ -75,6 +76,8 @@ public class CaseListDialog extends Dialog implements IMoGoAutopilotRecordListen public void onAttachedToWindow() { super.onAttachedToWindow(); CallerAutopilotRecordListenerManager.INSTANCE.addListener(TAG, this); + //获取数据采集录制模式配置列表 + CallerAutoPilotManager.INSTANCE.getBadCaseConfig(0, 0,new ArrayList<>()); } @Override @@ -94,13 +97,16 @@ public class CaseListDialog extends Dialog implements IMoGoAutopilotRecordListen ThreadUtils.runOnUiThread(() -> { if(config.getRecordTypesCount()>0){ for(int index=0;index topicList = new ArrayList<>(); - for(int position=0;position topicList = new ArrayList<>(); +// TODO java.lang.IndexOutOfBoundsException: Index: 38, Size: 38 +// for(int position=0;index0){ 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 bc34e091e5..7c54e6011c 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 @@ -156,26 +156,23 @@ public class CaseTopicListDialog extends Dialog implements IMoGoAutopilotRecordL topicListAdapter.notifyDataSetChanged(); } }); - tvSave.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if(recordType!=null){ - Boolean success=CallerAutoPilotManager.INSTANCE.getBadCaseConfig(2,recordType.getId(),addTopicList); - if(Boolean.TRUE.equals(success)){ - ToastUtils.showShort("Topic设置成功"); - if(recordType.getId() == 0){ - //自定义Topic - BadCaseConfig.customTopicList.addAll(addTopicList); - } - addTopicList.clear(); - dismiss(); - }else{ - ToastUtils.showShort("Topic设置失败"); + tvSave.setOnClickListener(v -> { + if(recordType!=null){ + Boolean success=CallerAutoPilotManager.INSTANCE.getBadCaseConfig(2,recordType.getId(),addTopicList); + if(Boolean.TRUE.equals(success)){ + ToastUtils.showShort("Topic设置成功"); + if(recordType.getId() == 0){ + //自定义Topic + BadCaseConfig.customTopicList.addAll(addTopicList); } + addTopicList.clear(); + dismiss(); + }else{ + ToastUtils.showShort("Topic设置失败"); } - - } + + }); tvCancel.setOnClickListener(v -> { @@ -189,9 +186,13 @@ public class CaseTopicListDialog extends Dialog implements IMoGoAutopilotRecordL ThreadUtils.runOnUiThread(() -> { if(config.getAllTopicsCount()>0){ for(int index=0;index diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_record_template.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_record_template.xml index 4b5c5fb31e..0041cf0c4a 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_record_template.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_record_template.xml @@ -10,9 +10,9 @@ android:layout_marginTop="20dp" android:clickable="true" android:focusable="true" - android:paddingStart="30dp" - android:paddingEnd="30dp" - android:layout_marginStart="20dp" - android:layout_marginEnd="20dp" + android:paddingStart="10dp" + android:paddingEnd="10dp" + android:layout_marginStart="15dp" + android:layout_marginEnd="15dp" > \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_badcase_config.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_badcase_config.xml index 3c9e609e2d..9e085c3874 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_badcase_config.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_badcase_config.xml @@ -315,20 +315,11 @@ app:layout_constraintLeft_toLeftOf="@id/tvRecordTemplate" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/tvRecordTemplate" + app:layout_constraintBottom_toBottomOf="parent" android:background="@drawable/template_list_bg" android:layout_marginTop="@dimen/dp_50" - android:paddingBottom="20dp" - /> - -