desc:列表页面参数区域

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

@@ -7,6 +7,7 @@ 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.utils.DateUtils
 import com.yinuo.safetywatcher.watcher.view.CommonTopBar
 
 class QueryDataActivity : BaseActivity() {
@@ -39,6 +40,8 @@ class QueryDataActivity : BaseActivity() {
     }
 
     override fun initView() {
+        initDefaultParams()
+
         mBinding.rvData.layoutManager = LinearLayoutManager(this@QueryDataActivity)
 
         val adapter = HistoryDataAdapter()
@@ -48,4 +51,11 @@ class QueryDataActivity : BaseActivity() {
         adapter.setData(datas)
         mBinding.rvData.adapter = adapter
     }
+
+    private fun initDefaultParams() {
+        val startTime = DateUtils.formatHistoryTime(System.currentTimeMillis())
+        val endTime = DateUtils.formatHistoryTime(System.currentTimeMillis())
+        val step = 30;
+        mBinding.tvParams.text = "时间: $startTime——$endTime      数据间隔:$step"
+    }
 }

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

@@ -4,11 +4,10 @@ import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.yinuo.safetywatcher.R
 import com.yinuo.safetywatcher.databinding.ActivityWarndataBinding
-import com.yinuo.safetywatcher.watcher.adapter.HistoryDataAdapter
 import com.yinuo.safetywatcher.watcher.adapter.WarnDataAdapter
 import com.yinuo.safetywatcher.watcher.base.BaseActivity
-import com.yinuo.safetywatcher.watcher.bean.HistoryData
 import com.yinuo.safetywatcher.watcher.bean.WarnData
+import com.yinuo.safetywatcher.watcher.utils.DateUtils
 import com.yinuo.safetywatcher.watcher.view.CommonTopBar
 
 class WarnDataActivity : BaseActivity() {
@@ -41,8 +40,11 @@ class WarnDataActivity : BaseActivity() {
     }
 
     override fun initView() {
-        mBinding.rvData.layoutManager = LinearLayoutManager(this@WarnDataActivity)
+        // 初始化默认查询参数
+        initDefaultParams()
 
+        // 测试数据
+        mBinding.rvData.layoutManager = LinearLayoutManager(this@WarnDataActivity)
         val adapter = WarnDataAdapter()
         val datas = mutableListOf<WarnData>()
         datas.add(WarnData(0, "二氧化碳浓度过高"))
@@ -50,4 +52,12 @@ class WarnDataActivity : BaseActivity() {
         adapter.setData(datas)
         mBinding.rvData.adapter = adapter
     }
+
+    private fun initDefaultParams() {
+        val startTime = DateUtils.formatHistoryTime(System.currentTimeMillis())
+        val endTime = DateUtils.formatHistoryTime(System.currentTimeMillis())
+        val step = 30;
+        val type = "温度超标"
+        mBinding.tvParams.text = "时间: $startTime——$endTime      数据间隔:$step      告警类型:$type"
+    }
 }

app/src/main/res/layout/activity_query_data.xml

@@ -1,10 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/_108dp"
+        android:gravity="center_vertical">
+
+        <TextView
+            android:id="@+id/tv_params"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/_172dp"
+            android:textColor="@color/white"
+            android:textSize="@dimen/_32dp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/_20dp"
+            android:background="@drawable/save_btn_bg"
+            android:paddingHorizontal="@dimen/_18dp"
+            android:paddingVertical="@dimen/_12dp"
+            android:text="@string/modify_params"
+            android:textColor="@color/white"
+            android:textSize="@dimen/_32dp" />
+    </LinearLayout>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_data"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content" />
 </LinearLayout>

app/src/main/res/layout/activity_warndata.xml

@@ -1,8 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/_108dp"
+        android:gravity="center_vertical">
+
+        <TextView
+            android:id="@+id/tv_params"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/_172dp"
+            android:textSize="@dimen/_32dp"
+            android:textColor="@color/white"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/modify_params"
+            android:layout_marginStart="@dimen/_20dp"
+            android:paddingVertical="@dimen/_12dp"
+            android:paddingHorizontal="@dimen/_18dp"
+            android:textSize="@dimen/_32dp"
+            android:textColor="@color/white"
+            android:background="@drawable/save_btn_bg"/>
+    </LinearLayout>
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_data"
         android:layout_width="match_parent"

app/src/main/res/values/strings.xml

@@ -38,6 +38,7 @@
     <string name="cancel">取消</string>
     <string name="confirm">确认</string>
     <string name="current_time">当前时间</string>
+    <string name="modify_params">修改筛选条件</string>
 
     <string-array name="excel_column">
         <item>时间</item>