From 725d5d7edb51c0cd1ab7eb94d2c3efaa6e480497 Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Fri, 1 Mar 2024 10:55:31 +0800
Subject: [PATCH] =?UTF-8?q?desc:SOS=E6=8C=89=E9=94=AE=E8=A7=A6=E5=8F=91?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=B1=82?=
 =?UTF-8?q?=E6=95=91=E4=BF=A1=E5=8F=B7=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../watcher/base/BaseActivity.kt              |  5 +++
 .../safetywatcher/watcher/ui/HomeActivity.kt  | 17 ++++++++
 app/src/main/res/layout/activity_home.xml     | 42 ++++++++++++++-----
 app/src/main/res/values/dimens.xml            |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 55 insertions(+), 11 deletions(-)

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 @@
         </LinearLayout>
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/tv_warn"
-        android:layout_width="@dimen/_536dp"
+    <LinearLayout
+        android:id="@+id/warn_area"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="220px"
-        android:background="@drawable/sensor_init_btn_bg"
-        android:gravity="center"
-        android:minHeight="@dimen/_100dp"
-        android:padding="@dimen/_12dp"
-        android:textColor="@color/white"
-        android:textSize="@dimen/_30dp"
-        android:visibility="gone" />
+        android:paddingTop="@dimen/_220dp"
+        android:orientation="vertical">
+        <TextView
+            android:id="@+id/tv_warn"
+            android:layout_width="@dimen/_536dp"
+            android:layout_height="wrap_content"
+            android:background="@drawable/sensor_init_btn_bg"
+            android:gravity="center"
+            android:minHeight="@dimen/_100dp"
+            android:padding="@dimen/_12dp"
+            android:textColor="@color/white"
+            android:textSize="@dimen/_30dp"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/tv_sos"
+            android:layout_width="@dimen/_536dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/_20dp"
+            android:background="@drawable/sensor_init_btn_bg"
+            android:gravity="center"
+            android:text="@string/text_sos"
+            android:minHeight="@dimen/_100dp"
+            android:padding="@dimen/_12dp"
+            android:textColor="@color/white"
+            android:textSize="@dimen/_132dp"
+            android:visibility="gone" />
+    </LinearLayout>
 </RelativeLayout>
\ 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 @@
     <dimen name="_120dp">120px</dimen>
     <dimen name="_624dp">624px</dimen>
     <dimen name="_712dp">712px</dimen>
+    <dimen name="_220dp">220px</dimen>
 </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 fae5dff..75031fe 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -98,4 +98,5 @@
 
     <string name="link_setting">联动开关设置</string>
     <string name="link_delay_setting">联动开关延时，单位：秒</string>
+    <string name="text_sos">SOS</string>
 </resources>