desc:告警查询不支持步长

app/src/main/java/com/yinuo/safetywatcher/watcher/bean/GetRtspUrlResponse.kt

@@ -2,4 +2,4 @@ package com.yinuo.safetywatcher.watcher.bean
 
 import com.common.commonlib.net.bean.BaseResponse
 
-data class GetRtspUrlResponse(val data: String = "") : BaseResponse()
+data class GetRtspUrlResponse(val data: String? = "") : BaseResponse()

app/src/main/java/com/yinuo/safetywatcher/watcher/constant/TimeStep.kt

@@ -3,6 +3,7 @@ package com.yinuo.safetywatcher.watcher.constant
 import androidx.annotation.IntDef
 
 @IntDef(
+    TimeStep.ILLEGAL_VALUE,
     TimeStep.SECOND_30,
     TimeStep.MINUTE_1,
     TimeStep.MINUTE_3,
@@ -11,6 +12,7 @@ import androidx.annotation.IntDef
 
 annotation class TimeStep() {
     companion object {
+        const val ILLEGAL_VALUE = -1
         const val SECOND_30 = 30
         const val MINUTE_1 = 60
         const val MINUTE_3 = 180

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/ChooseParamsActivity.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.text.TextUtils
 import android.view.View
+import androidx.core.view.isVisible
 import com.yinuo.safetywatcher.R
 import com.yinuo.safetywatcher.databinding.ActivityChooseParamsBinding
 import com.yinuo.safetywatcher.watcher.base.NoOptionsActivity
@@ -27,7 +28,7 @@ class ChooseParamsActivity : NoOptionsActivity() {
             context: Context,
             startTime: Long = 0L,
             endTime: Long = 0L,
-            @TimeStep timeStep: Int = 0,
+            @TimeStep timeStep: Int = TimeStep.ILLEGAL_VALUE,
             warnType: String? = null
         ): Intent {
             val intent = Intent(context, ChooseParamsActivity::class.java)
@@ -56,7 +57,7 @@ class ChooseParamsActivity : NoOptionsActivity() {
         intent?.apply {
             startTime = getLongExtra(START_TIME, -1L)
             endTime = getLongExtra(END_TIME, -1L)
-            var timeStep = getIntExtra(TIME_STEP, -1)
+            var timeStep = getIntExtra(TIME_STEP, TimeStep.ILLEGAL_VALUE)
             var warnType = getStringExtra(WARN_TYPE)
 
             val currentTime = System.currentTimeMillis()
@@ -66,9 +67,6 @@ class ChooseParamsActivity : NoOptionsActivity() {
             if (endTime < 0) {
                 endTime = currentTime
             }
-            if (timeStep < 0) {
-                timeStep = TimeStep.SECOND_30
-            }
 
             // updateUI
             mBinding.apply {
@@ -82,6 +80,9 @@ class ChooseParamsActivity : NoOptionsActivity() {
                     TimeStep.MINUTE_1 -> rbM1.isChecked = true
                     TimeStep.MINUTE_3 -> rbM3.isChecked = true
                     TimeStep.MINUTE_5 -> rbM5.isChecked = true
+                    else -> {
+                        timeStepContainer.visibility = View.GONE
+                    }
                 }
                 // warnType
                 warnTypeContainer.visibility =
@@ -119,13 +120,15 @@ class ChooseParamsActivity : NoOptionsActivity() {
             mBinding.rbM3.id -> TimeStep.MINUTE_3
             mBinding.rbM5.id -> TimeStep.MINUTE_5
             else -> {
-                TimeStep.SECOND_30
+                TimeStep.ILLEGAL_VALUE
             }
         }
         val intent = Intent()
         intent.putExtra(START_TIME, startTime)
         intent.putExtra(END_TIME, endTime)
-        intent.putExtra(TIME_STEP, timeStep)
+        if (timeStep > 0 && mBinding.timeStepContainer.isVisible) {
+            intent.putExtra(TIME_STEP, timeStep)
+        }
         //            intent.putExtra()
         setResult(RESULT_OK, intent)
         finish()

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/WarnDataActivity.kt

@@ -9,7 +9,6 @@ import com.yinuo.safetywatcher.watcher.adapter.WarnDataAdapter
 import com.yinuo.safetywatcher.watcher.base.BaseActivity
 import com.yinuo.safetywatcher.watcher.bean.WarnData
 import com.yinuo.safetywatcher.watcher.constant.DEFAULT_QUERY_TIME_INTERVAL
-import com.yinuo.safetywatcher.watcher.constant.TimeStep
 import com.yinuo.safetywatcher.watcher.utils.DateUtils
 import com.yinuo.safetywatcher.watcher.view.CommonTopBar
 
@@ -44,7 +43,6 @@ class WarnDataActivity : BaseActivity() {
 
     private var startTime = -1L
     private var endTime = -1L
-    private var timeStep = TimeStep.SECOND_30
     private var warnType = ""
     private val mAdapter = WarnDataAdapter()
 
@@ -55,7 +53,6 @@ class WarnDataActivity : BaseActivity() {
                 intent?.apply {
                     startTime = getLongExtra(ChooseParamsActivity.START_TIME, startTime)
                     endTime = getLongExtra(ChooseParamsActivity.END_TIME, endTime)
-                    timeStep = getIntExtra(ChooseParamsActivity.TIME_STEP, timeStep)
                     warnType = getStringExtra(ChooseParamsActivity.WARN_TYPE) ?: warnType
                     initDefaultParamsUi()
                     queryData()
@@ -73,7 +70,6 @@ class WarnDataActivity : BaseActivity() {
                     this@WarnDataActivity,
                     startTime,
                     endTime,
-                    timeStep
                 )
             )
         }
@@ -93,16 +89,9 @@ class WarnDataActivity : BaseActivity() {
         }
         val startTimeStr = DateUtils.formatHistoryTime(startTime)
         val endTimeStr = DateUtils.formatHistoryTime(endTime)
-        val timeStepStr = when (timeStep) {
-            TimeStep.SECOND_30 -> getString(R.string.second_30)
-            TimeStep.MINUTE_1 -> getString(R.string.minute_1)
-            TimeStep.MINUTE_3 -> getString(R.string.minute_3)
-            TimeStep.MINUTE_5 -> getString(R.string.minute_5)
-            else -> getString(R.string.second_30)
-        }
         warnType = "温度超标"
         mBinding.tvParams.text =
-            "时间: $startTimeStr——$endTimeStr      数据间隔:$timeStepStr      告警类型:$warnType"
+            "时间: $startTimeStr——$endTimeStr      告警类型:$warnType"
     }
 
     private fun queryData() {

app/src/main/java/com/yinuo/safetywatcher/watcher/utils/LztekUtil.kt

@@ -10,7 +10,7 @@ object LztekUtil {
 
     private var sn: String? = null
 
-    private var rtspUrl: String = ""
+    private var rtspUrl: String? = ""
 
     fun setObject(value: Lztek) {
         mLztek = value
@@ -42,11 +42,11 @@ object LztekUtil {
         return sn!!
     }
 
-    fun getRtspUrl(): String {
+    fun getRtspUrl(): String? {
         return rtspUrl
     }
 
-    fun setRtspUrl(str: String) {
+    fun setRtspUrl(str: String?) {
         this.rtspUrl = str
     }
 }