diff --git a/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java b/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java index b616509..a26bc65 100644 --- a/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java +++ b/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java @@ -15,9 +15,6 @@ @Insert void insert(PointBean point); - @Query("SELECT * FROM camera_inspection_point") - List loadAll(); - @Query("SELECT * FROM camera_inspection_point WHERE secondType = 1") List getFirstLinePoints(); diff --git a/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java b/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java index b616509..a26bc65 100644 --- a/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java +++ b/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java @@ -15,9 +15,6 @@ @Insert void insert(PointBean point); - @Query("SELECT * FROM camera_inspection_point") - List loadAll(); - @Query("SELECT * FROM camera_inspection_point WHERE secondType = 1") List getFirstLinePoints(); diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt index 9edc8ef..005e44a 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt @@ -127,7 +127,7 @@ } binding.queryPointButton.setOnClickListener { - val beans = pointBeanDao.loadAll() + val beans = pointBeanDao.firstLinePoints if (beans.isEmpty()) { "请先添加巡航点".show(requireContext()) return@setOnClickListener @@ -141,18 +141,15 @@ } - override fun onConfirmClick(line: Int) { + override fun onConfirmClick() { //至少得2个点才能巡航 if (beans.size < 2) { "请至少添加两个点".show(requireContext()) return } - CameraInspectionService.weakReferenceHandler?.let { - val message = it.obtainMessage() - message.what = LocaleConstant.START_INSPECTION_CODE - message.obj = line - it.sendMessage(message) - } + CameraInspectionService.weakReferenceHandler?.sendEmptyMessage( + LocaleConstant.START_INSPECTION_CODE + ) } }).build().show() } diff --git a/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java b/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java index b616509..a26bc65 100644 --- a/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java +++ b/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java @@ -15,9 +15,6 @@ @Insert void insert(PointBean point); - @Query("SELECT * FROM camera_inspection_point") - List loadAll(); - @Query("SELECT * FROM camera_inspection_point WHERE secondType = 1") List getFirstLinePoints(); diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt index 9edc8ef..005e44a 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt @@ -127,7 +127,7 @@ } binding.queryPointButton.setOnClickListener { - val beans = pointBeanDao.loadAll() + val beans = pointBeanDao.firstLinePoints if (beans.isEmpty()) { "请先添加巡航点".show(requireContext()) return@setOnClickListener @@ -141,18 +141,15 @@ } - override fun onConfirmClick(line: Int) { + override fun onConfirmClick() { //至少得2个点才能巡航 if (beans.size < 2) { "请至少添加两个点".show(requireContext()) return } - CameraInspectionService.weakReferenceHandler?.let { - val message = it.obtainMessage() - message.what = LocaleConstant.START_INSPECTION_CODE - message.obj = line - it.sendMessage(message) - } + CameraInspectionService.weakReferenceHandler?.sendEmptyMessage( + LocaleConstant.START_INSPECTION_CODE + ) } }).build().show() } diff --git a/app/src/main/java/com/casic/br/operationsite/widgets/ShowPointDialog.kt b/app/src/main/java/com/casic/br/operationsite/widgets/ShowPointDialog.kt index 8f25c08..65ac096 100644 --- a/app/src/main/java/com/casic/br/operationsite/widgets/ShowPointDialog.kt +++ b/app/src/main/java/com/casic/br/operationsite/widgets/ShowPointDialog.kt @@ -10,7 +10,6 @@ import com.casic.br.operationsite.databinding.DialogShowPointBinding import com.casic.br.operationsite.extensions.initDialogLayoutParams import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.SingleChoiceAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.divider.RecyclerViewItemDivider import com.pengxh.kt.lite.extensions.binding @@ -19,9 +18,7 @@ private val kTag = "ShowPointDialog" private val pointBeanDao by lazy { BaseApplication.get().dataBase.pointBeanDao() } - private lateinit var pointAdapter: NormalRecyclerAdapter private var pointBeans: MutableList = ArrayList() - private var selectedLine = 1 private val listener = builder.listener class Builder { @@ -47,18 +44,15 @@ override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - initDialogLayoutParams(0.8f, 0.5f) + initDialogLayoutParams(0.8f, 0.6f) setCanceledOnTouchOutside(false) setCancelable(false) - val beans = pointBeanDao.loadAll() + val beans = pointBeanDao.firstLinePoints if (beans.isEmpty()) return - val lines = beans.map { it.secondType.toString() }.toSet().toList() - pointBeans = beans.filter { it.secondType.toString() == lines[0] }.toMutableList() - - pointAdapter = object : NormalRecyclerAdapter( - R.layout.item_inspection_point_rv_l, pointBeans + val pointAdapter = object : NormalRecyclerAdapter( + R.layout.item_inspection_point_rv_l, beans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: PointBean @@ -66,34 +60,8 @@ viewHolder.setText(R.id.textView, "预置点位 ${item.thirdType}") } } - binding.pointRecyclerView.adapter = pointAdapter - binding.pointRecyclerView.addItemDecoration(RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)) - - val lineAdapter = object : SingleChoiceAdapter( - R.layout.item_inspection_line_rv_l, lines.toMutableList() - ) { - override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { - //{"firstType":92,"id":1,"secondType":1,"thirdType":1,"time":"2025-05-30 14:05:36"} - viewHolder.setText(R.id.textView, "巡航线路 $item") - } - } - binding.lineRecyclerView.adapter = lineAdapter - binding.lineRecyclerView.addItemDecoration(RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)) - lineAdapter.setSelectedPosition(0) - lineAdapter.setOnItemCheckedListener(object : - SingleChoiceAdapter.OnItemCheckedListener { - override fun onItemChecked(position: Int, item: String) { - selectedLine = lines[position].toInt() - var points = arrayListOf() - beans.forEach { - if (lines[position] == it.secondType.toString()) { - points.add(it) - } - } - pointBeans = points - pointAdapter.refresh(points) - } - }) + binding.recyclerView.adapter = pointAdapter + binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)) binding.dialogCancelButton.setOnClickListener { listener.onCancelClick() @@ -101,13 +69,13 @@ } binding.dialogConfirmButton.setOnClickListener { - listener.onConfirmClick(selectedLine) + listener.onConfirmClick() dismiss() } } interface OnDialogButtonClickListener { - fun onConfirmClick(line: Int) + fun onConfirmClick() fun onCancelClick() } diff --git a/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java b/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java index b616509..a26bc65 100644 --- a/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java +++ b/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java @@ -15,9 +15,6 @@ @Insert void insert(PointBean point); - @Query("SELECT * FROM camera_inspection_point") - List loadAll(); - @Query("SELECT * FROM camera_inspection_point WHERE secondType = 1") List getFirstLinePoints(); diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt index 9edc8ef..005e44a 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt @@ -127,7 +127,7 @@ } binding.queryPointButton.setOnClickListener { - val beans = pointBeanDao.loadAll() + val beans = pointBeanDao.firstLinePoints if (beans.isEmpty()) { "请先添加巡航点".show(requireContext()) return@setOnClickListener @@ -141,18 +141,15 @@ } - override fun onConfirmClick(line: Int) { + override fun onConfirmClick() { //至少得2个点才能巡航 if (beans.size < 2) { "请至少添加两个点".show(requireContext()) return } - CameraInspectionService.weakReferenceHandler?.let { - val message = it.obtainMessage() - message.what = LocaleConstant.START_INSPECTION_CODE - message.obj = line - it.sendMessage(message) - } + CameraInspectionService.weakReferenceHandler?.sendEmptyMessage( + LocaleConstant.START_INSPECTION_CODE + ) } }).build().show() } diff --git a/app/src/main/java/com/casic/br/operationsite/widgets/ShowPointDialog.kt b/app/src/main/java/com/casic/br/operationsite/widgets/ShowPointDialog.kt index 8f25c08..65ac096 100644 --- a/app/src/main/java/com/casic/br/operationsite/widgets/ShowPointDialog.kt +++ b/app/src/main/java/com/casic/br/operationsite/widgets/ShowPointDialog.kt @@ -10,7 +10,6 @@ import com.casic.br.operationsite.databinding.DialogShowPointBinding import com.casic.br.operationsite.extensions.initDialogLayoutParams import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.SingleChoiceAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.divider.RecyclerViewItemDivider import com.pengxh.kt.lite.extensions.binding @@ -19,9 +18,7 @@ private val kTag = "ShowPointDialog" private val pointBeanDao by lazy { BaseApplication.get().dataBase.pointBeanDao() } - private lateinit var pointAdapter: NormalRecyclerAdapter private var pointBeans: MutableList = ArrayList() - private var selectedLine = 1 private val listener = builder.listener class Builder { @@ -47,18 +44,15 @@ override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - initDialogLayoutParams(0.8f, 0.5f) + initDialogLayoutParams(0.8f, 0.6f) setCanceledOnTouchOutside(false) setCancelable(false) - val beans = pointBeanDao.loadAll() + val beans = pointBeanDao.firstLinePoints if (beans.isEmpty()) return - val lines = beans.map { it.secondType.toString() }.toSet().toList() - pointBeans = beans.filter { it.secondType.toString() == lines[0] }.toMutableList() - - pointAdapter = object : NormalRecyclerAdapter( - R.layout.item_inspection_point_rv_l, pointBeans + val pointAdapter = object : NormalRecyclerAdapter( + R.layout.item_inspection_point_rv_l, beans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: PointBean @@ -66,34 +60,8 @@ viewHolder.setText(R.id.textView, "预置点位 ${item.thirdType}") } } - binding.pointRecyclerView.adapter = pointAdapter - binding.pointRecyclerView.addItemDecoration(RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)) - - val lineAdapter = object : SingleChoiceAdapter( - R.layout.item_inspection_line_rv_l, lines.toMutableList() - ) { - override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { - //{"firstType":92,"id":1,"secondType":1,"thirdType":1,"time":"2025-05-30 14:05:36"} - viewHolder.setText(R.id.textView, "巡航线路 $item") - } - } - binding.lineRecyclerView.adapter = lineAdapter - binding.lineRecyclerView.addItemDecoration(RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)) - lineAdapter.setSelectedPosition(0) - lineAdapter.setOnItemCheckedListener(object : - SingleChoiceAdapter.OnItemCheckedListener { - override fun onItemChecked(position: Int, item: String) { - selectedLine = lines[position].toInt() - var points = arrayListOf() - beans.forEach { - if (lines[position] == it.secondType.toString()) { - points.add(it) - } - } - pointBeans = points - pointAdapter.refresh(points) - } - }) + binding.recyclerView.adapter = pointAdapter + binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)) binding.dialogCancelButton.setOnClickListener { listener.onCancelClick() @@ -101,13 +69,13 @@ } binding.dialogConfirmButton.setOnClickListener { - listener.onConfirmClick(selectedLine) + listener.onConfirmClick() dismiss() } } interface OnDialogButtonClickListener { - fun onConfirmClick(line: Int) + fun onConfirmClick() fun onCancelClick() } diff --git a/app/src/main/res/layout/dialog_show_point.xml b/app/src/main/res/layout/dialog_show_point.xml index 9465165..8c7b50e 100644 --- a/app/src/main/res/layout/dialog_show_point.xml +++ b/app/src/main/res/layout/dialog_show_point.xml @@ -26,33 +26,12 @@ android:layout_height="@dimen/lineViewSize" android:background="@color/hintTextColor" /> - - - - - - - - + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> loadAll(); - @Query("SELECT * FROM camera_inspection_point WHERE secondType = 1") List getFirstLinePoints(); diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt index 9edc8ef..005e44a 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt @@ -127,7 +127,7 @@ } binding.queryPointButton.setOnClickListener { - val beans = pointBeanDao.loadAll() + val beans = pointBeanDao.firstLinePoints if (beans.isEmpty()) { "请先添加巡航点".show(requireContext()) return@setOnClickListener @@ -141,18 +141,15 @@ } - override fun onConfirmClick(line: Int) { + override fun onConfirmClick() { //至少得2个点才能巡航 if (beans.size < 2) { "请至少添加两个点".show(requireContext()) return } - CameraInspectionService.weakReferenceHandler?.let { - val message = it.obtainMessage() - message.what = LocaleConstant.START_INSPECTION_CODE - message.obj = line - it.sendMessage(message) - } + CameraInspectionService.weakReferenceHandler?.sendEmptyMessage( + LocaleConstant.START_INSPECTION_CODE + ) } }).build().show() } diff --git a/app/src/main/java/com/casic/br/operationsite/widgets/ShowPointDialog.kt b/app/src/main/java/com/casic/br/operationsite/widgets/ShowPointDialog.kt index 8f25c08..65ac096 100644 --- a/app/src/main/java/com/casic/br/operationsite/widgets/ShowPointDialog.kt +++ b/app/src/main/java/com/casic/br/operationsite/widgets/ShowPointDialog.kt @@ -10,7 +10,6 @@ import com.casic.br.operationsite.databinding.DialogShowPointBinding import com.casic.br.operationsite.extensions.initDialogLayoutParams import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.SingleChoiceAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.divider.RecyclerViewItemDivider import com.pengxh.kt.lite.extensions.binding @@ -19,9 +18,7 @@ private val kTag = "ShowPointDialog" private val pointBeanDao by lazy { BaseApplication.get().dataBase.pointBeanDao() } - private lateinit var pointAdapter: NormalRecyclerAdapter private var pointBeans: MutableList = ArrayList() - private var selectedLine = 1 private val listener = builder.listener class Builder { @@ -47,18 +44,15 @@ override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - initDialogLayoutParams(0.8f, 0.5f) + initDialogLayoutParams(0.8f, 0.6f) setCanceledOnTouchOutside(false) setCancelable(false) - val beans = pointBeanDao.loadAll() + val beans = pointBeanDao.firstLinePoints if (beans.isEmpty()) return - val lines = beans.map { it.secondType.toString() }.toSet().toList() - pointBeans = beans.filter { it.secondType.toString() == lines[0] }.toMutableList() - - pointAdapter = object : NormalRecyclerAdapter( - R.layout.item_inspection_point_rv_l, pointBeans + val pointAdapter = object : NormalRecyclerAdapter( + R.layout.item_inspection_point_rv_l, beans ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: PointBean @@ -66,34 +60,8 @@ viewHolder.setText(R.id.textView, "预置点位 ${item.thirdType}") } } - binding.pointRecyclerView.adapter = pointAdapter - binding.pointRecyclerView.addItemDecoration(RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)) - - val lineAdapter = object : SingleChoiceAdapter( - R.layout.item_inspection_line_rv_l, lines.toMutableList() - ) { - override fun convertView(viewHolder: ViewHolder, position: Int, item: String) { - //{"firstType":92,"id":1,"secondType":1,"thirdType":1,"time":"2025-05-30 14:05:36"} - viewHolder.setText(R.id.textView, "巡航线路 $item") - } - } - binding.lineRecyclerView.adapter = lineAdapter - binding.lineRecyclerView.addItemDecoration(RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)) - lineAdapter.setSelectedPosition(0) - lineAdapter.setOnItemCheckedListener(object : - SingleChoiceAdapter.OnItemCheckedListener { - override fun onItemChecked(position: Int, item: String) { - selectedLine = lines[position].toInt() - var points = arrayListOf() - beans.forEach { - if (lines[position] == it.secondType.toString()) { - points.add(it) - } - } - pointBeans = points - pointAdapter.refresh(points) - } - }) + binding.recyclerView.adapter = pointAdapter + binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)) binding.dialogCancelButton.setOnClickListener { listener.onCancelClick() @@ -101,13 +69,13 @@ } binding.dialogConfirmButton.setOnClickListener { - listener.onConfirmClick(selectedLine) + listener.onConfirmClick() dismiss() } } interface OnDialogButtonClickListener { - fun onConfirmClick(line: Int) + fun onConfirmClick() fun onCancelClick() } diff --git a/app/src/main/res/layout/dialog_show_point.xml b/app/src/main/res/layout/dialog_show_point.xml index 9465165..8c7b50e 100644 --- a/app/src/main/res/layout/dialog_show_point.xml +++ b/app/src/main/res/layout/dialog_show_point.xml @@ -26,33 +26,12 @@ android:layout_height="@dimen/lineViewSize" android:background="@color/hintTextColor" /> - - - - - - - - + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - - -