From 0b19f03f1f1e943e6651752efd9eae19c4f14181 Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Tue, 4 Jul 2023 16:51:02 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E8=B0=83=E6=95=B4=E5=86=99=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../watcher/ui/ChooseParamsActivity.kt | 16 ++++++++--------
.../watcher/ui/SensorSettingActivity.kt | 17 ++++++++---------
.../watcher/ui/TimeSettingActivity.kt | 16 ++++++++--------
3 files changed, 24 insertions(+), 25 deletions(-)
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
index a6662df..1ad1d1d 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/ChooseParamsActivity.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/ChooseParamsActivity.kt
@@ -111,26 +111,26 @@ class ChooseParamsActivity : NoOptionsActivity() {
private fun set4focus() {
val startYearPicker = mBinding.startPicker.getPicker(YEAR)
- startYearPicker?.setOnKeyListener(OnKeyListener { _, keyCode, event ->
+ startYearPicker?.setOnKeyListener { _, keyCode, event ->
if (keyCode == KeyEvent.KEYCODE_DPAD_LEFT) {
if (event.action == KeyEvent.ACTION_DOWN) {
tryFocusBackArea()
- return@OnKeyListener true
+ return@setOnKeyListener true
}
}
- return@OnKeyListener false
- })
+ return@setOnKeyListener false
+ }
val endMinPicker = mBinding.endPicker.getPicker(MIN)
- endMinPicker?.setOnKeyListener(OnKeyListener { _, keyCode, event ->
+ endMinPicker?.setOnKeyListener { _, keyCode, event ->
if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT) {
if (event.action == KeyEvent.ACTION_DOWN) {
mBinding.rbS30.requestFocus()
- return@OnKeyListener true
+ return@setOnKeyListener true
}
}
- return@OnKeyListener false
- })
+ return@setOnKeyListener false
+ }
}
private fun returnDataback() {
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorSettingActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorSettingActivity.kt
index bfc4c37..197b5bb 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorSettingActivity.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorSettingActivity.kt
@@ -32,29 +32,28 @@ class SensorSettingActivity : NoOptionsActivity() {
)
}
- mBinding.etName.setOnKeyListener(View.OnKeyListener { _, keyCode, event ->
+ mBinding.etName.setOnKeyListener { _, keyCode, event ->
if (keyCode == KeyEvent.KEYCODE_DPAD_UP) {
if (event.action == KeyEvent.ACTION_DOWN) {
tryFocusBackArea()
- return@OnKeyListener true
+ return@setOnKeyListener true
}
} else if (keyCode == KeyEvent.KEYCODE_DPAD_DOWN) {
if (event.action == KeyEvent.ACTION_DOWN) {
mBinding.tvWarnSetting.requestFocus()
- return@OnKeyListener true
+ return@setOnKeyListener true
}
- } else if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER || keyCode == KeyEvent.KEYCODE_ENTER){
+ } else if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER || keyCode == KeyEvent.KEYCODE_ENTER) {
if (event.action == KeyEvent.ACTION_DOWN) {
mBinding.etName.showIme()
- return@OnKeyListener true
+ return@setOnKeyListener true
}
}
- return@OnKeyListener false
+ return@setOnKeyListener false
}
- )
- mBinding.etName.setOnFocusChangeListener { v, hasFocus ->
- if (!hasFocus){
+ mBinding.etName.setOnFocusChangeListener { _, hasFocus ->
+ if (!hasFocus) {
mBinding.etName.hideIme()
}
}
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/TimeSettingActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/TimeSettingActivity.kt
index 148d638..4d7ebb8 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/TimeSettingActivity.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/TimeSettingActivity.kt
@@ -53,26 +53,26 @@ class TimeSettingActivity : NoOptionsActivity() {
private fun set4focus() {
val yearPicker = mBingding.picker.getPicker(DateTimeConfig.YEAR)
- yearPicker?.setOnKeyListener(View.OnKeyListener { _, keyCode, event ->
+ yearPicker?.setOnKeyListener { _, keyCode, event ->
if (keyCode == KeyEvent.KEYCODE_DPAD_LEFT) {
if (event.action == KeyEvent.ACTION_DOWN) {
tryFocusBackArea()
- return@OnKeyListener true
+ return@setOnKeyListener true
}
}
- return@OnKeyListener false
- })
+ return@setOnKeyListener false
+ }
val endMinPicker = mBingding.picker.getPicker(DateTimeConfig.MIN)
- endMinPicker?.setOnKeyListener(View.OnKeyListener { _, keyCode, event ->
+ endMinPicker?.setOnKeyListener { _, keyCode, event ->
if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT) {
if (event.action == KeyEvent.ACTION_DOWN) {
mBingding.tvCancel.requestFocus()
- return@OnKeyListener true
+ return@setOnKeyListener true
}
}
- return@OnKeyListener false
- })
+ return@setOnKeyListener false
+ }
}
fun setShowTime(time: Long) {