diff --git a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt index 136d0f5..b3a78e2 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt @@ -40,7 +40,7 @@ private lateinit var taskAdapter: TaskAdapter private var dataBeans: MutableList = ArrayList() private var selectedItems: MutableList = ArrayList() - private var pageIndex = 1 + private var page = 1 private var isRefresh = false private var isLoadMore = false private var startTime = "" @@ -127,12 +127,16 @@ action: QMUISwipeAction? ) { super.onClickAction(swipeAction, selected, action) + val adapterPosition = selected!!.bindingAdapterPosition if (action?.text == "删除") { - deleteItem(selected!!.bindingAdapterPosition) + deleteItem(adapterPosition) } else { AlertInputDialog.Builder() .setContext(requireContext()) .setTitle("编辑") + .setSubLayoutVisibility(true) + .setSubTitle("原任务名称") + .setOldValue(dataBeans[adapterPosition].taskName) .setHintMessage("请输入新的巡检任务名称") .setNegativeButton("取消") .setPositiveButton("确定") @@ -167,7 +171,6 @@ }).build().show() } - override fun initEvent() { bv.calendarView.setOnClickListener { DateRangeActionSheet.Builder().setContext(requireContext()) @@ -177,6 +180,7 @@ startTime = startDate endTime = endDate //条件查询 + page = 1 getTasksByPage() //显示 @@ -195,7 +199,10 @@ } override fun afterTextChanged(s: Editable?) { - getTasksByPage() +// if (taskNameViewFocused) { +// page = 1 +// getTasksByPage() +// } } }) @@ -209,7 +216,10 @@ } override fun afterTextChanged(s: Editable?) { - getTasksByPage() +// if (taskCodeViewFocused) { +// page = 1 +// getTasksByPage() +// } } }) @@ -218,6 +228,7 @@ bv.taskNameView.setText("") bv.taskCodeView.setText("") + page = 1 startTime = "" endTime = "" @@ -229,6 +240,7 @@ AlertInputDialog.Builder() .setContext(requireContext()) .setTitle("新建巡检任务") + .setSubLayoutVisibility(false) .setHintMessage("请输入巡检任务名称") .setNegativeButton("取消") .setPositiveButton("确定") @@ -250,6 +262,9 @@ AlertInputDialog.Builder() .setContext(requireContext()) .setTitle("设置阈值") + .setSubLayoutVisibility(true) + .setSubTitle("原报警阈值") + .setOldValue(SaveKeyValues.getValue(LocaleConstant.ALARM_RULE, 1000).toString()) .setHintMessage("请输入报警阈值") .setNegativeButton("取消") .setPositiveButton("确定") @@ -268,13 +283,13 @@ bv.taskLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 + page = 1 getTasksByPage() } bv.taskLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ + page++ getTasksByPage() } } @@ -285,7 +300,7 @@ endTime, bv.taskNameView.text.toString(), bv.taskCodeView.text.toString(), - pageIndex + page ) } diff --git a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt index 136d0f5..b3a78e2 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt @@ -40,7 +40,7 @@ private lateinit var taskAdapter: TaskAdapter private var dataBeans: MutableList = ArrayList() private var selectedItems: MutableList = ArrayList() - private var pageIndex = 1 + private var page = 1 private var isRefresh = false private var isLoadMore = false private var startTime = "" @@ -127,12 +127,16 @@ action: QMUISwipeAction? ) { super.onClickAction(swipeAction, selected, action) + val adapterPosition = selected!!.bindingAdapterPosition if (action?.text == "删除") { - deleteItem(selected!!.bindingAdapterPosition) + deleteItem(adapterPosition) } else { AlertInputDialog.Builder() .setContext(requireContext()) .setTitle("编辑") + .setSubLayoutVisibility(true) + .setSubTitle("原任务名称") + .setOldValue(dataBeans[adapterPosition].taskName) .setHintMessage("请输入新的巡检任务名称") .setNegativeButton("取消") .setPositiveButton("确定") @@ -167,7 +171,6 @@ }).build().show() } - override fun initEvent() { bv.calendarView.setOnClickListener { DateRangeActionSheet.Builder().setContext(requireContext()) @@ -177,6 +180,7 @@ startTime = startDate endTime = endDate //条件查询 + page = 1 getTasksByPage() //显示 @@ -195,7 +199,10 @@ } override fun afterTextChanged(s: Editable?) { - getTasksByPage() +// if (taskNameViewFocused) { +// page = 1 +// getTasksByPage() +// } } }) @@ -209,7 +216,10 @@ } override fun afterTextChanged(s: Editable?) { - getTasksByPage() +// if (taskCodeViewFocused) { +// page = 1 +// getTasksByPage() +// } } }) @@ -218,6 +228,7 @@ bv.taskNameView.setText("") bv.taskCodeView.setText("") + page = 1 startTime = "" endTime = "" @@ -229,6 +240,7 @@ AlertInputDialog.Builder() .setContext(requireContext()) .setTitle("新建巡检任务") + .setSubLayoutVisibility(false) .setHintMessage("请输入巡检任务名称") .setNegativeButton("取消") .setPositiveButton("确定") @@ -250,6 +262,9 @@ AlertInputDialog.Builder() .setContext(requireContext()) .setTitle("设置阈值") + .setSubLayoutVisibility(true) + .setSubTitle("原报警阈值") + .setOldValue(SaveKeyValues.getValue(LocaleConstant.ALARM_RULE, 1000).toString()) .setHintMessage("请输入报警阈值") .setNegativeButton("取消") .setPositiveButton("确定") @@ -268,13 +283,13 @@ bv.taskLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 + page = 1 getTasksByPage() } bv.taskLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ + page++ getTasksByPage() } } @@ -285,7 +300,7 @@ endTime, bv.taskNameView.text.toString(), bv.taskCodeView.text.toString(), - pageIndex + page ) } diff --git a/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt b/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt index aad5658..d4f312e 100644 --- a/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt +++ b/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt @@ -321,16 +321,7 @@ captureButton.setOnClickListener { if (isPreviewSuccess) { - val strJpeg = NET_DVR_JPEGPARA() - strJpeg.wPicQuality = 1 - strJpeg.wPicSize = 2 - - val imagePath = "/${createImageFileDir()}/${timeFormat.format(Date())}.jpg" - Log.d(kTag, "imageFileDir: $imagePath") - hkSDK.NET_DVR_CaptureJPEGPicture(returnUserID, selectChannel, strJpeg, imagePath) - if (MessageCodeHub.getErrorCode() == 0) { - "画面抓取成功".show(this) - } + captureImage(false) } } @@ -722,6 +713,26 @@ } } + /** + * 画面抓取 + * */ + private fun captureImage(isAutoCapture: Boolean) { + val strJpeg = NET_DVR_JPEGPARA() + strJpeg.wPicQuality = 1 + strJpeg.wPicSize = 2 + + val imagePath = "/${createImageFileDir()}/${timeFormat.format(Date())}.jpg" + hkSDK.NET_DVR_CaptureJPEGPicture(returnUserID, selectChannel, strJpeg, imagePath) + + if (MessageCodeHub.getErrorCode() == 0) { + if (!isAutoCapture) { + "画面抓取成功".show(this) + } else { + //TODO 上传 + } + } + } + private fun stopPreview() { //关闭激光传感器 SDKGuider.sdkGuider.devPassThroughGuider.NET_DVR_SendToSerialPort_jni( @@ -795,7 +806,8 @@ //TODO 报警图片、视频 if (dataModel!!.methane >= gasAlarmRule) { isAlarm = "1" - //抓取报警时候的图片并上传 + + captureImage(true) //抓取报警时候的视频并上传 } diff --git a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt index 136d0f5..b3a78e2 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt @@ -40,7 +40,7 @@ private lateinit var taskAdapter: TaskAdapter private var dataBeans: MutableList = ArrayList() private var selectedItems: MutableList = ArrayList() - private var pageIndex = 1 + private var page = 1 private var isRefresh = false private var isLoadMore = false private var startTime = "" @@ -127,12 +127,16 @@ action: QMUISwipeAction? ) { super.onClickAction(swipeAction, selected, action) + val adapterPosition = selected!!.bindingAdapterPosition if (action?.text == "删除") { - deleteItem(selected!!.bindingAdapterPosition) + deleteItem(adapterPosition) } else { AlertInputDialog.Builder() .setContext(requireContext()) .setTitle("编辑") + .setSubLayoutVisibility(true) + .setSubTitle("原任务名称") + .setOldValue(dataBeans[adapterPosition].taskName) .setHintMessage("请输入新的巡检任务名称") .setNegativeButton("取消") .setPositiveButton("确定") @@ -167,7 +171,6 @@ }).build().show() } - override fun initEvent() { bv.calendarView.setOnClickListener { DateRangeActionSheet.Builder().setContext(requireContext()) @@ -177,6 +180,7 @@ startTime = startDate endTime = endDate //条件查询 + page = 1 getTasksByPage() //显示 @@ -195,7 +199,10 @@ } override fun afterTextChanged(s: Editable?) { - getTasksByPage() +// if (taskNameViewFocused) { +// page = 1 +// getTasksByPage() +// } } }) @@ -209,7 +216,10 @@ } override fun afterTextChanged(s: Editable?) { - getTasksByPage() +// if (taskCodeViewFocused) { +// page = 1 +// getTasksByPage() +// } } }) @@ -218,6 +228,7 @@ bv.taskNameView.setText("") bv.taskCodeView.setText("") + page = 1 startTime = "" endTime = "" @@ -229,6 +240,7 @@ AlertInputDialog.Builder() .setContext(requireContext()) .setTitle("新建巡检任务") + .setSubLayoutVisibility(false) .setHintMessage("请输入巡检任务名称") .setNegativeButton("取消") .setPositiveButton("确定") @@ -250,6 +262,9 @@ AlertInputDialog.Builder() .setContext(requireContext()) .setTitle("设置阈值") + .setSubLayoutVisibility(true) + .setSubTitle("原报警阈值") + .setOldValue(SaveKeyValues.getValue(LocaleConstant.ALARM_RULE, 1000).toString()) .setHintMessage("请输入报警阈值") .setNegativeButton("取消") .setPositiveButton("确定") @@ -268,13 +283,13 @@ bv.taskLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 + page = 1 getTasksByPage() } bv.taskLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ + page++ getTasksByPage() } } @@ -285,7 +300,7 @@ endTime, bv.taskNameView.text.toString(), bv.taskCodeView.text.toString(), - pageIndex + page ) } diff --git a/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt b/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt index aad5658..d4f312e 100644 --- a/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt +++ b/app/src/main/java/com/casic/br/ktd/view/InspectionActivity.kt @@ -321,16 +321,7 @@ captureButton.setOnClickListener { if (isPreviewSuccess) { - val strJpeg = NET_DVR_JPEGPARA() - strJpeg.wPicQuality = 1 - strJpeg.wPicSize = 2 - - val imagePath = "/${createImageFileDir()}/${timeFormat.format(Date())}.jpg" - Log.d(kTag, "imageFileDir: $imagePath") - hkSDK.NET_DVR_CaptureJPEGPicture(returnUserID, selectChannel, strJpeg, imagePath) - if (MessageCodeHub.getErrorCode() == 0) { - "画面抓取成功".show(this) - } + captureImage(false) } } @@ -722,6 +713,26 @@ } } + /** + * 画面抓取 + * */ + private fun captureImage(isAutoCapture: Boolean) { + val strJpeg = NET_DVR_JPEGPARA() + strJpeg.wPicQuality = 1 + strJpeg.wPicSize = 2 + + val imagePath = "/${createImageFileDir()}/${timeFormat.format(Date())}.jpg" + hkSDK.NET_DVR_CaptureJPEGPicture(returnUserID, selectChannel, strJpeg, imagePath) + + if (MessageCodeHub.getErrorCode() == 0) { + if (!isAutoCapture) { + "画面抓取成功".show(this) + } else { + //TODO 上传 + } + } + } + private fun stopPreview() { //关闭激光传感器 SDKGuider.sdkGuider.devPassThroughGuider.NET_DVR_SendToSerialPort_jni( @@ -795,7 +806,8 @@ //TODO 报警图片、视频 if (dataModel!!.methane >= gasAlarmRule) { isAlarm = "1" - //抓取报警时候的图片并上传 + + captureImage(true) //抓取报警时候的视频并上传 } diff --git a/app/src/main/java/com/casic/br/ktd/widgets/AlertInputDialog.kt b/app/src/main/java/com/casic/br/ktd/widgets/AlertInputDialog.kt index 309325c..a558dfb 100644 --- a/app/src/main/java/com/casic/br/ktd/widgets/AlertInputDialog.kt +++ b/app/src/main/java/com/casic/br/ktd/widgets/AlertInputDialog.kt @@ -5,6 +5,7 @@ import android.os.Bundle import android.view.View import android.widget.Button +import android.widget.LinearLayout import android.widget.TextView import com.casic.br.ktd.R import com.pengxh.kt.lite.extensions.initDialogLayoutParams @@ -16,6 +17,9 @@ ) { private val ctx = builder.context private val title = builder.title + private val showSubLayout = builder.visible + private val subTitle = builder.subTitle + private val oldValue = builder.oldValue private val hint = builder.hint private val positiveBtn = builder.positiveBtn private val negativeBtn = builder.negativeBtn @@ -24,6 +28,9 @@ class Builder { lateinit var context: Context lateinit var title: String + var visible = true + var subTitle = "" + var oldValue = "" lateinit var hint: String lateinit var positiveBtn: String lateinit var negativeBtn: String @@ -39,6 +46,21 @@ return this } + fun setSubLayoutVisibility(visible: Boolean): Builder { + this.visible = visible + return this + } + + fun setSubTitle(subTitle: String): Builder { + this.subTitle = subTitle + return this + } + + fun setOldValue(oldValue: String): Builder { + this.oldValue = oldValue + return this + } + fun setHintMessage(hint: String): Builder { this.hint = hint return this @@ -74,18 +96,27 @@ private fun initView() { val dialogTitleView: TextView = findViewById(R.id.dialogTitleView) + val topLine: View = findViewById(R.id.topLine) + val subLayout: LinearLayout = findViewById(R.id.subLayout) + val subTitleView: TextView = findViewById(R.id.subTitleView) + val oldValueView: TextView = findViewById(R.id.oldValueView) val dialogInputView: DeleteEditText = findViewById(R.id.dialogInputView) val dialogCancelButton = findViewById