From 7dd4bfd9a8930bc9e50791dbc1464be7d4c2a772 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 1 Nov 2022 15:39:12 +0800 Subject: [PATCH 1/3] fit android 10 about status bar --- .../src/main/java/com/mogo/commons/mvp/MvpActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java index 08b79179d1..250d4aefeb 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java @@ -88,8 +88,8 @@ public abstract class MvpActivity> exten } @Override - public void onWindowFocusChanged(boolean hasFocus) { - super.onWindowFocusChanged(hasFocus); + protected void onRestart() { + super.onRestart(); BarUtils.hideStatusBarAndSticky(this.getWindow()); } From b3cc052612e7fa5838356b38ae39cc3d12f239b6 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Tue, 1 Nov 2022 17:03:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?BadCase=E8=87=AA=E5=AE=9A=E4=B9=89=E5=BD=95?= =?UTF-8?q?=E5=8C=85Topic=E9=80=89=E6=8B=A9=EF=BC=8C=E9=80=89=E4=B8=AD?= =?UTF-8?q?=E5=90=8E=E8=87=AA=E5=8A=A8=E7=BD=AE=E9=A1=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/biz/adapter/TopicListAdapter.kt | 34 ++++++++++++++++--- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/TopicListAdapter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/TopicListAdapter.kt index 7d1c810990..dc7ffabf0b 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/TopicListAdapter.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/TopicListAdapter.kt @@ -15,10 +15,10 @@ import com.zhjt.mogo_core_function_devatools.R */ class TopicListAdapter: RecyclerView.Adapter() { - private var data:List? = null + private var data:MutableList? = null private var topicClickListener: TopicClickListener? = null - fun setData( data: List?){ + fun setData( data: MutableList?){ this.data = data } @@ -39,13 +39,37 @@ class TopicListAdapter: RecyclerView.Adapter() holder.topic_check_box.isChecked = topicList[position].topicStatus holder.topic_check_box.tag = topicList holder.topic_check_box.isClickable = topicList[position].topicCanClick - holder.topic_check_box.setOnCheckedChangeListener { _, b -> - topicList[position].topicStatus = b - topicClickListener?.onClick(topicList[position].topicName,b) + holder.topic_check_box.setOnCheckedChangeListener { _, isChecked -> + topicList[position].topicStatus = isChecked + topicClickListener?.onClick(topicList[position].topicName,isChecked) + if(isChecked){ + //滚动到置顶 + moveItem(topicList[position],position,0) + }else{ + var lastNotCan = 0 //最后一个不能选择的 + for( i in 0 until itemCount){ + var topicEntity = data?.get(i) + if (topicEntity != null) { + if(!topicEntity.topicCanClick){ + lastNotCan = i + } + } + } + moveItem(topicList[position],position,lastNotCan) + } } } } + private fun moveItem(topicEntity: TopicEntity,removePos: Int,insertedPos: Int){ + data?.remove(topicEntity) + notifyItemRemoved(removePos) + notifyItemRangeChanged(removePos, itemCount - removePos) + data?.add(insertedPos, topicEntity) + notifyItemInserted(insertedPos) + notifyItemRangeChanged(insertedPos, itemCount) + } + override fun getItemCount() = data?.size ?: 0 class TopicListHolder(itemView: View) : RecyclerView.ViewHolder(itemView){ From bddb6a46ba6e8be8972ee7c5c83b3770dedc680d Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Tue, 1 Nov 2022 17:58:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=BF=90=E8=90=A5=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E5=B1=95=E7=A4=BA=E5=B7=A5?= =?UTF-8?q?=E6=8E=A7=E6=9C=BA=E5=BC=82=E5=B8=B8=E4=B8=8A=E6=8A=A5=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E6=8E=A7=E5=88=B6=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/hmi/ui/setting/SOPSettingView.kt | 9 +++++++++ .../src/main/res/layout/view_sop_setting.xml | 15 ++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt index f77c252142..f00e5f8ee2 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt @@ -17,7 +17,9 @@ import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.module.service.routeoverlay.RouteStrategy +import kotlinx.android.synthetic.main.view_debug_setting.view.* import kotlinx.android.synthetic.main.view_sop_setting.view.* +import kotlinx.android.synthetic.main.view_sop_setting.view.tbRouteDynamicEffect /** * SOP设置窗口 @@ -134,6 +136,13 @@ class SOPSettingView @JvmOverloads constructor( } } + + //是否开启异常上报 + tbIPCReport.isChecked = FunctionBuildConfig.isReportWarning + tbIPCReport.setOnCheckedChangeListener { _, isChecked -> + FunctionBuildConfig.isReportWarning = isChecked + } + //变道绕障的目标障碍物速度阈值 tvSpeed.text = "${FunctionBuildConfig.detouringSpeed} m/s" ivSpeedReduce.setOnClickListener { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml index 5644c7fbec..f574e97e7d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml @@ -121,12 +121,25 @@ app:layout_constraintTop_toBottomOf="@id/tbRainMode" /> + +