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 2a534cb..acd2491 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
@@ -24,6 +24,7 @@ import com.yinuo.safetywatcher.watcher.constant.NAMESPACE_ANDROID
 import com.yinuo.safetywatcher.watcher.ui.view.CommonDialog
 import com.yinuo.safetywatcher.watcher.ui.view.CommonTopBar
 import com.yinuo.safetywatcher.watcher.utils.PlatformUtils
+import com.yinuo.safetywatcher.watcher.utils.RecordHelper
 import com.yinuo.safetywatcher.watcher.utils.SoundUtils
 import com.yinuo.safetywatcher.watcher.utils.VolumeUtil
 import com.yinuo.safetywatcher.watcher.utils.trySetCommonBg
@@ -51,6 +52,22 @@ abstract class BaseActivity : AppCompatActivity() {
         setChildContent()
         initView()
         setTopBar()
+        setForShutDown()
+    }
+
+    private fun setForShutDown() {
+        baseBinding.tvCancel.setOnClickListener {
+            baseBinding.layoutShutdown.visibility = View.GONE
+        }
+        baseBinding.tvConfirm.setOnClickListener {
+            onShutDown()
+            PlatformUtils.shutDown()
+        }
+    }
+
+    open fun onShutDown() {
+        // 暂停录制编码
+        RecordHelper.stopRecording()
     }
 
     private fun initSound() {
@@ -116,7 +133,7 @@ abstract class BaseActivity : AppCompatActivity() {
 
     abstract fun getOptions(): List<CommonTopBar.Option>?
 
-    open fun getTopBarTitle(): String?{
+    open fun getTopBarTitle(): String? {
         return getString(R.string.back)
     }
 
@@ -169,7 +186,7 @@ abstract class BaseActivity : AppCompatActivity() {
 
     override fun onResume() {
         super.onResume()
-        if (!isHome){
+        if (!isHome) {
             tryFocusBackArea()
         }
     }
@@ -204,7 +221,9 @@ abstract class BaseActivity : AppCompatActivity() {
             }
         } else if (keyCode == KeyEvent.KEYCODE_ENTER) {
             if (isHomeLongPress) {
-                PlatformUtils.shutDown()
+                baseBinding.layoutShutdown.visibility = View.VISIBLE
+                lastFocusView = currentFocus
+                baseBinding.tvCancel.requestFocus()
                 return true
             }
         } else if (keyCode == KeyEvent.KEYCODE_F1) {
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/PlatformUtils.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/PlatformUtils.kt
index 0859435..a1797a4 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/PlatformUtils.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/PlatformUtils.kt
@@ -63,7 +63,7 @@ object PlatformUtils {
 
     fun shutDown() {
         val intent = Intent("android.ido.intent.action.set.shutdown")
-        intent.putExtra("confirm", true)
+        intent.putExtra("confirm", false)
         CommonApplication.getContext()?.sendBroadcast(intent)
     }
 
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/wifi/ui/InputWiFiPasswordDialog.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/wifi/ui/InputWiFiPasswordDialog.kt
index f455827..07196e5 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/wifi/ui/InputWiFiPasswordDialog.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/wifi/ui/InputWiFiPasswordDialog.kt
@@ -72,13 +72,13 @@ class InputWiFiPasswordDialog : DialogFragment() {
             }
             return@setOnKeyListener false
         }
-        mBinding?.etPassword?.setOnFocusChangeListener { v, hasFocus ->
-            if (!hasFocus) {
-                mBinding?.etPassword?.hideIme()
-            } else {
-                mBinding?.etPassword?.showIme()
-            }
-        }
+//        mBinding?.etPassword?.setOnFocusChangeListener { v, hasFocus ->
+//            if (!hasFocus) {
+//                mBinding?.etPassword?.hideIme()
+//            } else {
+//                mBinding?.etPassword?.showIme()
+//            }
+//        }
 
 
         mBinding?.tvCancel?.setOnClickListener {
diff --git a/app/src/main/res/drawable/bg_input.xml b/app/src/main/res/drawable/bg_input.xml
index 4014c3d..9cc5ce2 100644
--- a/app/src/main/res/drawable/bg_input.xml
+++ b/app/src/main/res/drawable/bg_input.xml
@@ -2,8 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="#F4F4F4" />
-
-    <corners android:radius="8dp" />
+    <solid android:color="@color/_242f4d" />
+    <stroke android:color="@color/white" android:width="@dimen/_6dp"/>
+    <corners android:radius="@dimen/_20dp" />
 
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_base.xml b/app/src/main/res/layout/activity_base.xml
index 5f96f6b..ec5633e 100644
--- a/app/src/main/res/layout/activity_base.xml
+++ b/app/src/main/res/layout/activity_base.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/container"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/_303852">
+    android:background="@color/_303852"
+    android:orientation="vertical">
 
     <com.yinuo.safetywatcher.watcher.ui.view.CommonTopBar
         android:id="@+id/topBar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/_120dp"/>
+        android:layout_height="@dimen/_120dp" />
 
     <RelativeLayout
         android:id="@+id/area_sound"
@@ -25,19 +25,64 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
-            android:textSize="@dimen/_40dp"
+            android:text="音量"
             android:textColor="@color/white"
-            android:text="音量"/>
+            android:textSize="@dimen/_40dp" />
+
         <SeekBar
             android:id="@+id/sb_sound"
             style="@style/LightSeekbarStyle"
-            android:focusable="true"
             android:layout_width="@dimen/_630dp"
             android:layout_height="@dimen/_100dp"
-            android:layout_marginTop="@dimen/_20dp"
             android:layout_below="@+id/tv"
+            android:layout_marginTop="@dimen/_20dp"
+            android:focusable="true"
             android:min="0"
-            android:padding="0dp"/>
+            android:padding="0dp" />
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/layout_shutdown"
+        android:layout_width="@dimen/_960dp"
+        android:layout_height="200px"
+        android:layout_centerInParent="true"
+        android:background="@drawable/warn_setting_btn_bg"
+        android:visibility="gone">
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="@dimen/_32dp"
+            android:layout_marginBottom="@dimen/_32dp"
+            android:text="您的设备将会关机！"
+            android:textColor="@color/white"
+            android:textSize="@dimen/_36dp" />
+
+        <TextView
+            android:id="@+id/tv_cancel"
+            android:layout_width="@dimen/_480dp"
+            android:layout_height="@dimen/_81dp"
+            android:layout_alignParentBottom="true"
+            android:background="@drawable/cancel_btn_bg"
+            android:focusable="true"
+            android:gravity="center"
+            android:text="@string/cancel"
+            android:textColor="@color/white_30"
+            android:textSize="@dimen/_36dp" />
+
+        <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:focusable="true"
+            android:gravity="center"
+            android:text="@string/confirm"
+            android:textColor="@color/white"
+            android:textSize="@dimen/_36dp" />
     </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index e745bf5..2d91bdd 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -148,7 +148,7 @@
             <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/camera_switch"
                 android:layout_width="wrap_content"
-                android:checked="true"
+                android:checked="false"
                 android:layout_height="@dimen/_34dp"
                 android:layout_marginStart="@dimen/_13dp" />
         </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_input_wifi_password.xml b/app/src/main/res/layout/dialog_input_wifi_password.xml
index 7a66eae..7cb60c2 100644
--- a/app/src/main/res/layout/dialog_input_wifi_password.xml
+++ b/app/src/main/res/layout/dialog_input_wifi_password.xml
@@ -36,10 +36,11 @@
         android:layout_margin="12dp"
         android:background="@drawable/bg_input"
         android:inputType="textPassword"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
+        android:paddingLeft="@dimen/_32dp"
+        android:paddingRight="@dimen/_32dp"
         android:textCursorDrawable="@drawable/bg_cursor"
         android:textSize="@dimen/font_24dp"
+        android:textColor="@color/white"
         android:focusable="true"
         android:focusedByDefault="true"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/library-push/src/main/java/org/easydarwin/PushHelper.kt b/library-push/src/main/java/org/easydarwin/PushHelper.kt
index 77dedf2..8b100e3 100644
--- a/library-push/src/main/java/org/easydarwin/PushHelper.kt
+++ b/library-push/src/main/java/org/easydarwin/PushHelper.kt
@@ -89,7 +89,7 @@ object PushHelper {
             LogUtils.e("PushHelper error, please setPushUrl first!!")
             return
         }
-        if (mPusher == null){
+        if (mPusher == null) {
             mPusher = EasyPusher()
         }
         mPusher?.initPush(mApplicationContext, callback)