From 01e113ca099d8b3c3ce44a8997f7b183de80506d Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Thu, 1 Jun 2023 11:55:32 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E5=8D=87=E7=BA=A7=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  3 +
 app/src/main/AndroidManifest.xml              |  4 +
 .../watcher/ui/ChooseParamsActivity.kt        | 42 ++++++++
 .../watcher/ui/QueryDataActivity.kt           |  8 ++
 .../watcher/ui/WarnDataActivity.kt            |  5 +
 .../res/layout/activity_choose_params.xml     | 97 +++++++++++++++++++
 .../main/res/layout/activity_query_data.xml   |  1 +
 app/src/main/res/layout/activity_warndata.xml |  1 +
 app/src/main/res/values/arrays.xml            | 16 +++
 app/src/main/res/values/strings.xml           |  7 --
 build.gradle                                  |  2 +-
 buildCommon/commonLibConfig.gradle            |  2 +-
 .../com/common/commonlib/net/BaseObserve.kt   |  2 +-
 library-push/build.gradle                     |  9 +-
 14 files changed, 186 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/java/com/yinuo/safetywatcher/watcher/ui/ChooseParamsActivity.kt
 create mode 100644 app/src/main/res/layout/activity_choose_params.xml
 create mode 100644 app/src/main/res/values/arrays.xml

diff --git a/app/build.gradle b/app/build.gradle
index 0d4b2b8..c0f2105 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -46,6 +46,7 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.12.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.lifecycle:lifecycle-reactivestreams:2.4.1'
+    //libs
     implementation project(path: ':library-ijkplayer')
     implementation project(path: ':library-serialPort')
     implementation project(path: ':library-common')
@@ -53,6 +54,8 @@ dependencies {
     implementation rootProject.ext.dependencies.jxl
     // 时间日期选择控件
     implementation 'com.github.loper7:DateTimePicker:0.6.3'
+    implementation('androidx.activity:activity:1.7.2')
+    implementation('androidx.activity:activity-ktx:1.7.2')
 
     implementation 'com.google.android.material:material:1.5.0'
     annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.0.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c55da72..4d8f392 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -90,6 +90,10 @@
             android:name=".watcher.ui.HistoryVideoActivity"
             android:exported="false"
             android:screenOrientation="landscape" />
+        <activity
+            android:name=".watcher.ui.ChooseParamsActivity"
+            android:exported="false"
+            android:screenOrientation="landscape" />
         <activity
             android:name=".MainActivity"
             android:exported="false"
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/ChooseParamsActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/ChooseParamsActivity.kt
new file mode 100644
index 0000000..318d060
--- /dev/null
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/ChooseParamsActivity.kt
@@ -0,0 +1,42 @@
+package com.yinuo.safetywatcher.watcher.ui
+
+import android.content.Context
+import android.content.Intent
+import android.view.View
+import com.yinuo.safetywatcher.R
+import com.yinuo.safetywatcher.databinding.ActivityChooseParamsBinding
+import com.yinuo.safetywatcher.watcher.base.NoOptionsActivity
+
+class ChooseParamsActivity : NoOptionsActivity() {
+    private val mBinding by lazy {
+        ActivityChooseParamsBinding.inflate(layoutInflater)
+    }
+
+    companion object {
+        private const val START_TIME = "startTime"
+        private const val END_TIME = "endTime"
+        private const val TIME_STEP = "step"
+        private const val WARN_TYPE = "warnType"
+
+        fun open(context: Context, startTime: Long, endTime: Long, timeStep: Int, warnType: String? = null) {
+            val intent = Intent()
+            intent.putExtra(START_TIME, startTime)
+            intent.putExtra(END_TIME, endTime)
+            intent.putExtra(TIME_STEP, timeStep)
+            warnType?.let {
+                intent.putExtra(WARN_TYPE, warnType)
+            }
+        }
+    }
+
+    override fun getTopBarTitle(): String? {
+        return getString(R.string.modify_params)
+    }
+
+    override fun generateContentView(): View {
+        return mBinding.root
+    }
+
+    override fun initView() {
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/QueryDataActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/QueryDataActivity.kt
index a6c9188..9af8d60 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/QueryDataActivity.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/QueryDataActivity.kt
@@ -1,6 +1,8 @@
 package com.yinuo.safetywatcher.watcher.ui
 
+import android.content.Intent
 import android.view.View
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.yinuo.safetywatcher.R
 import com.yinuo.safetywatcher.databinding.ActivityQueryDataBinding
@@ -39,8 +41,14 @@ class QueryDataActivity : BaseActivity() {
         return mBinding.root
     }
 
+//    registerForActivityResult
+
     override fun initView() {
         initDefaultParams()
+        ActivityResultContracts.StartActivityForResult
+        mBinding.tvModifyParams.setOnClickListener {
+            startActivity(Intent(this@QueryDataActivity, ChooseParamsActivity::class.java))
+        }
 
         mBinding.rvData.layoutManager = LinearLayoutManager(this@QueryDataActivity)
 
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/WarnDataActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/WarnDataActivity.kt
index ae07861..535743d 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/WarnDataActivity.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/WarnDataActivity.kt
@@ -1,5 +1,6 @@
 package com.yinuo.safetywatcher.watcher.ui
 
+import android.content.Intent
 import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.yinuo.safetywatcher.R
@@ -43,6 +44,10 @@ class WarnDataActivity : BaseActivity() {
         // 初始化默认查询参数
         initDefaultParams()
 
+        mBinding.tvModifyParams.setOnClickListener {
+            startActivity(Intent(this@WarnDataActivity, ChooseParamsActivity::class.java))
+        }
+
         // 测试数据
         mBinding.rvData.layoutManager = LinearLayoutManager(this@WarnDataActivity)
         val adapter = WarnDataAdapter()
diff --git a/app/src/main/res/layout/activity_choose_params.xml b/app/src/main/res/layout/activity_choose_params.xml
new file mode 100644
index 0000000..08fa082
--- /dev/null
+++ b/app/src/main/res/layout/activity_choose_params.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="@dimen/_960dp"
+        android:layout_height="@dimen/_580dp"
+        android:layout_marginTop="@dimen/_201dp"
+        android:background="@drawable/warn_setting_btn_bg">
+
+        <View
+            android:id="@+id/divider"
+            android:layout_width="@dimen/_6dp"
+            android:layout_height="@dimen/_28dp"
+            android:layout_marginStart="@dimen/_40dp"
+            android:background="@drawable/white_rectangle"
+            app:layout_constraintBottom_toTopOf="@id/tv_cancel"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_currentTime"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/_6dp"
+            android:text="@string/current_time"
+            android:textColor="@color/white"
+            android:textSize="@dimen/_30dp"
+            app:layout_constraintBottom_toTopOf="@id/tv_cancel"
+            app:layout_constraintStart_toEndOf="@id/divider"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/_6dp"
+            android:text="2023.5.31"
+            android:textColor="@color/white"
+            android:textSize="@dimen/_30dp"
+            app:layout_constraintStart_toStartOf="@id/tv_currentTime"
+            app:layout_constraintTop_toBottomOf="@id/tv_currentTime" />
+
+
+        <com.loper7.date_time_picker.DateTimePicker
+            android:id="@+id/picker"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:paddingHorizontal="@dimen/_40dp"
+            android:paddingVertical="@dimen/_66dp"
+            android:background="@drawable/datepicker_bg"
+            android:layout_marginEnd="@dimen/_40dp"
+            app:dt_dividerColor="#00000000"
+            app:dt_layout="@layout/layout_date_picker_globalization1"
+            app:dt_normalTextSize="@dimen/_28dp"
+            app:dt_selectTextSize="@dimen/_30dp"
+            app:dt_selectedTextBold="true"
+            app:dt_showLabel="true"
+            app:dt_textBold="true"
+            app:dt_textColor="@color/color_offline"
+            app:dt_themeColor="@color/white"
+            app:layout_constraintBottom_toTopOf="@id/tv_confirm"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_cancel"
+            android:layout_width="@dimen/_480dp"
+            android:layout_height="@dimen/_81dp"
+            android:background="@drawable/cancel_btn_bg"
+            android:gravity="center"
+            android:text="@string/cancel"
+            android:textColor="@color/white_30"
+            android:textSize="@dimen/_36dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_confirm"
+            android:layout_width="@dimen/_480dp"
+            android:layout_height="@dimen/_81dp"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentBottom="true"
+            android:background="@drawable/confirm_btn_bg"
+            android:gravity="center"
+            android:text="@string/confirm"
+            android:textColor="@color/white"
+            android:textSize="@dimen/_36dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_query_data.xml b/app/src/main/res/layout/activity_query_data.xml
index 4b60c9e..ea56b49 100644
--- a/app/src/main/res/layout/activity_query_data.xml
+++ b/app/src/main/res/layout/activity_query_data.xml
@@ -18,6 +18,7 @@
             android:textSize="@dimen/_32dp" />
 
         <TextView
+            android:id="@+id/tv_modify_params"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/_20dp"
diff --git a/app/src/main/res/layout/activity_warndata.xml b/app/src/main/res/layout/activity_warndata.xml
index 9b17dfe..bc4fa5b 100644
--- a/app/src/main/res/layout/activity_warndata.xml
+++ b/app/src/main/res/layout/activity_warndata.xml
@@ -18,6 +18,7 @@
             android:textColor="@color/white"/>
 
         <TextView
+            android:id="@+id/tv_modify_params"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/modify_params"
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
new file mode 100644
index 0000000..b1a2b19
--- /dev/null
+++ b/app/src/main/res/values/arrays.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="excel_column">
+        <item>时间</item>
+        <item>属性</item>
+        <item>值</item>
+        <item>单位</item>
+    </string-array>
+
+    <string-array name="sensor_types">
+        <item>催化燃烧</item>
+        <item>电化学传感器</item>
+        <item>红外测量</item>
+        <item>PID光离子</item>
+    </string-array>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 05f9808..39a59c0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -39,11 +39,4 @@
     <string name="confirm">确认</string>
     <string name="current_time">当前时间</string>
     <string name="modify_params">修改筛选条件</string>
-
-    <string-array name="excel_column">
-        <item>时间</item>
-        <item>属性</item>
-        <item>值</item>
-        <item>单位</item>
-    </string-array>
 </resources>
diff --git a/build.gradle b/build.gradle
index 7994902..b5d2f24 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.1.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/buildCommon/commonLibConfig.gradle b/buildCommon/commonLibConfig.gradle
index 2892488..5ef6240 100644
--- a/buildCommon/commonLibConfig.gradle
+++ b/buildCommon/commonLibConfig.gradle
@@ -11,7 +11,7 @@ project.ext {
     ]
 
     versions = [
-            compileSdkVersion      : 31,
+            compileSdkVersion      : 33,
             buildToolsVersion      : "33.0.3",
             minSdkVersion          : 24,
             targetSdkVersion       : 28,
diff --git a/library-common/src/main/java/com/common/commonlib/net/BaseObserve.kt b/library-common/src/main/java/com/common/commonlib/net/BaseObserve.kt
index ea87db8..629b1d4 100644
--- a/library-common/src/main/java/com/common/commonlib/net/BaseObserve.kt
+++ b/library-common/src/main/java/com/common/commonlib/net/BaseObserve.kt
@@ -49,7 +49,7 @@ open class BaseObserve<T> : ITypedCommon {
      * @param observable 可订阅
      * @param callBack 请求回调
      */
-    fun <R> observe(observable: Observable<R>?, callBack: RequestCallBack<R>?) {
+    fun <R : Any> observe(observable: Observable<R>?, callBack: RequestCallBack<R>?) {
         if (observable == null) {
             Logger.e("BaseObserve", "observe observable is null")
             return
diff --git a/library-push/build.gradle b/library-push/build.gradle
index ed48801..7639844 100644
--- a/library-push/build.gradle
+++ b/library-push/build.gradle
@@ -15,9 +15,12 @@ repositories {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation 'junit:junit:4.13.2'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-reactivestreams:2.4.1'
-    annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.0.0'
+
+    implementation('androidx.core:core:1.10.1')
+    implementation('androidx.annotation:annotation:1.6.0')
+    implementation('androidx.lifecycle:lifecycle-reactivestreams:2.6.1')
+    implementation('androidx.lifecycle:lifecycle-common:2.6.1')
+    implementation('androidx.lifecycle:lifecycle-livedata:2.6.1')
 
     implementation(name: 'libuvccamera-release', ext: 'aar') {
         exclude module: 'support-v4'