desc:定义一些公共常量

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

@@ -0,0 +1,10 @@
+package com.yinuo.safetywatcher.watcher.constant
+
+const val ONE_HOUR_MS = 60 * 60 * 1000
+const val ONE_DAY_MS = 24 * ONE_HOUR_MS
+
+// 最大查询时间隔间
+const val MAX_QUERY_TIME_INTERVAL = ONE_DAY_MS
+
+// 默认查询时间间隔
+const val DEFAULT_QUERY_TIME_INTERVAL = ONE_HOUR_MS

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

@@ -7,8 +7,9 @@ import android.view.View
 import com.yinuo.safetywatcher.R
 import com.yinuo.safetywatcher.databinding.ActivityChooseParamsBinding
 import com.yinuo.safetywatcher.watcher.base.NoOptionsActivity
+import com.yinuo.safetywatcher.watcher.constant.DEFAULT_QUERY_TIME_INTERVAL
+import com.yinuo.safetywatcher.watcher.constant.MAX_QUERY_TIME_INTERVAL
 import com.yinuo.safetywatcher.watcher.constant.TimeStep
-import com.yinuo.safetywatcher.watcher.utils.DateUtils
 import com.yinuo.safetywatcher.watcher.utils.showToast
 
 class ChooseParamsActivity : NoOptionsActivity() {
@@ -60,7 +61,7 @@ class ChooseParamsActivity : NoOptionsActivity() {
 
             val currentTime = System.currentTimeMillis()
             if (startTime < 0) {
-                startTime = currentTime - DateUtils.ONE_DAY_MS
+                startTime = currentTime - DEFAULT_QUERY_TIME_INTERVAL
             }
             if (endTime < 0) {
                 endTime = currentTime
@@ -92,7 +93,7 @@ class ChooseParamsActivity : NoOptionsActivity() {
                 }
                 startPicker.setOnDateTimeChangedListener {
                     startTime = it
-                    endPicker.setMaxMillisecond(startTime + DateUtils.ONE_DAY_MS)
+                    endPicker.setMaxMillisecond(startTime + MAX_QUERY_TIME_INTERVAL)
                 }
                 endPicker.setOnDateTimeChangedListener {
                     endTime = it
@@ -107,7 +108,7 @@ class ChooseParamsActivity : NoOptionsActivity() {
             showToast(getString(R.string.error_interval_tip))
             return
         }
-        if (endTime - startTime > DateUtils.MAX_QUERY_TIME_INTERVAL) {
+        if (endTime - startTime > MAX_QUERY_TIME_INTERVAL) {
             showToast(getString(R.string.over_max_interval_tip))
             return
         }

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

@@ -9,16 +9,14 @@ import com.yinuo.safetywatcher.R
 import com.yinuo.safetywatcher.databinding.ActivityQueryDataBinding
 import com.yinuo.safetywatcher.watcher.adapter.HistoryDataAdapter
 import com.yinuo.safetywatcher.watcher.base.BaseActivity
-import com.yinuo.safetywatcher.watcher.bean.HistoryData
+import com.yinuo.safetywatcher.watcher.constant.DEFAULT_QUERY_TIME_INTERVAL
 import com.yinuo.safetywatcher.watcher.constant.TimeStep
 import com.yinuo.safetywatcher.watcher.db.DBUtils
 import com.yinuo.safetywatcher.watcher.db.entity.Gas
-import com.yinuo.safetywatcher.watcher.db.entity.GasType
 import com.yinuo.safetywatcher.watcher.utils.DateUtils
 import com.yinuo.safetywatcher.watcher.view.CommonTopBar
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import java.util.Collections
 
 class QueryDataActivity : BaseActivity() {
 
@@ -91,7 +89,7 @@ class QueryDataActivity : BaseActivity() {
     @SuppressLint("SetTextI18n")
     private fun initDefaultParamsUi() {
         if (startTime < 0) {
-            startTime = System.currentTimeMillis() - DateUtils.ONE_DAY_MS
+            startTime = System.currentTimeMillis() - DEFAULT_QUERY_TIME_INTERVAL
         }
         if (endTime < 0) {
             endTime = System.currentTimeMillis()

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

@@ -8,6 +8,7 @@ import com.yinuo.safetywatcher.databinding.ActivityWarndataBinding
 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
@@ -85,7 +86,7 @@ class WarnDataActivity : BaseActivity() {
 
     private fun initDefaultParamsUi() {
         if (startTime < 0) {
-            startTime = System.currentTimeMillis() - DateUtils.ONE_DAY_MS
+            startTime = System.currentTimeMillis() - DEFAULT_QUERY_TIME_INTERVAL
         }
         if (endTime < 0) {
             endTime = System.currentTimeMillis()

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

@@ -4,9 +4,6 @@ import java.text.SimpleDateFormat
 import java.util.Locale
 
 object DateUtils {
-    const val ONE_DAY_MS = 24 * 60 * 60 * 1000
-    const val MAX_QUERY_TIME_INTERVAL = ONE_DAY_MS
-
     private val dataFormat = SimpleDateFormat("yyyy/MM/dd HH:mm:ss", Locale.ROOT)
     fun formatHistoryTime(time: Long): String? {
         return dataFormat.format(time)