diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt
index b279ff7..202851b 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt
@@ -252,6 +252,7 @@ abstract class BaseActivity : AppCompatActivity() {
}
} else if (keyCode == KeyEvent.KEYCODE_F1) {
LogUtils.w("BaseActivity F1 up")
+ onSosHelp(false)
SoundUtils.stopSoundIo()
return true
}
@@ -283,11 +284,15 @@ abstract class BaseActivity : AppCompatActivity() {
}
} else if (keyCode == KeyEvent.KEYCODE_F1) {
LogUtils.w("BaseActivity F1 pressed")
+ onSosHelp()
SoundUtils.playSoundIo()
}
return super.dispatchKeyEvent(event)
}
+ open fun onSosHelp(sos: Boolean = true) {
+ }
+
fun showVoiceArea() {
val visibility = baseBinding.areaSound.visibility
if (View.GONE == visibility) {
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt
index 1f1cf1e..597f524 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt
@@ -305,6 +305,23 @@ class HomeActivity : NoOptionsActivity() {
Process.killProcess(Process.myPid())
}
+ private var sosShow = false
+ override fun onSosHelp(sos: Boolean) {
+ super.onSosHelp(sos)
+ if (sosShow == sos) {
+ return
+ }
+ if (sos && !sosShow) {
+ sosShow = true
+ mBinding.tvSos.visibility = View.VISIBLE
+ } else {
+ if (sosShow) {
+ sosShow = false
+ mBinding.tvSos.visibility = View.GONE
+ }
+ }
+ }
+
override fun onBackPressed() {
// super.onBackPressed()
}
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 2fbbdc4..2f6e94c 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -204,17 +204,37 @@
-
+ android:paddingTop="@dimen/_220dp"
+ android:orientation="vertical">
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index d9c8241..94bee39 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -63,4 +63,5 @@
120px
624px
712px
+ 220px
\ 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 fae5dff..75031fe 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -98,4 +98,5 @@
联动开关设置
联动开关延时,单位:秒
+ SOS