diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03be9a5
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03be9a5
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ /dev/null
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03be9a5
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..72906db
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03be9a5
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..72906db
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..849a57d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03be9a5
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..72906db
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..849a57d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03be9a5
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..72906db
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..849a57d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..72ba334
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03be9a5
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..72906db
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..849a57d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..72ba334
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03be9a5
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..72906db
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..849a57d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..72ba334
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..c196ced
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03be9a5
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..72906db
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..849a57d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..72ba334
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..c196ced
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..53f1380
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03be9a5
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..72906db
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..849a57d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..72ba334
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..c196ced
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..53f1380
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a695..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03be9a5
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..72906db
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..849a57d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..72ba334
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..c196ced
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..53f1380
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a695..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/common_bkg.png b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
new file mode 100644
index 0000000..80696cd
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03be9a5
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..72906db
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..849a57d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..72ba334
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..c196ced
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..53f1380
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a695..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/common_bkg.png b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
new file mode 100644
index 0000000..80696cd
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..8f0913c
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03be9a5
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..72906db
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..849a57d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..72ba334
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..c196ced
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..53f1380
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a695..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/common_bkg.png b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
new file mode 100644
index 0000000..80696cd
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..8f0913c
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 28d4b77..0000000
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03be9a5
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..72906db
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..849a57d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..72ba334
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..c196ced
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..53f1380
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a695..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/common_bkg.png b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
new file mode 100644
index 0000000..80696cd
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..8f0913c
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 28d4b77..0000000
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..d27aa3b
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03be9a5
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..72906db
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..849a57d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..72ba334
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..c196ced
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..53f1380
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a695..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/common_bkg.png b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
new file mode 100644
index 0000000..80696cd
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..8f0913c
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 28d4b77..0000000
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..d27aa3b
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..35ac7a1
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03be9a5
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..72906db
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..849a57d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..72ba334
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..c196ced
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..53f1380
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a695..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/common_bkg.png b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
new file mode 100644
index 0000000..80696cd
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..8f0913c
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 28d4b77..0000000
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..d27aa3b
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..35ac7a1
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9287f50..0000000
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03be9a5
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..72906db
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..849a57d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..72ba334
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..c196ced
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..53f1380
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a695..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/common_bkg.png b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
new file mode 100644
index 0000000..80696cd
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..8f0913c
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 28d4b77..0000000
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..d27aa3b
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..35ac7a1
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9287f50..0000000
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/login_bkg.png b/app/src/main/res/mipmap-xxhdpi/login_bkg.png
new file mode 100644
index 0000000..3f8d14a
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/login_bkg.png
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03be9a5
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..72906db
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..849a57d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..72ba334
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..c196ced
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..53f1380
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a695..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/common_bkg.png b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
new file mode 100644
index 0000000..80696cd
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..8f0913c
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 28d4b77..0000000
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..d27aa3b
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..35ac7a1
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9287f50..0000000
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/login_bkg.png b/app/src/main/res/mipmap-xxhdpi/login_bkg.png
new file mode 100644
index 0000000..3f8d14a
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/login_bkg.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..e5375b3
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03be9a5
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..72906db
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..849a57d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..72ba334
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..c196ced
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..53f1380
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a695..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/common_bkg.png b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
new file mode 100644
index 0000000..80696cd
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..8f0913c
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 28d4b77..0000000
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..d27aa3b
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..35ac7a1
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9287f50..0000000
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/login_bkg.png b/app/src/main/res/mipmap-xxhdpi/login_bkg.png
new file mode 100644
index 0000000..3f8d14a
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/login_bkg.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..e5375b3
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
deleted file mode 100644
index aa7d642..0000000
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03be9a5
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..72906db
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..849a57d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..72ba334
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..c196ced
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..53f1380
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a695..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/common_bkg.png b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
new file mode 100644
index 0000000..80696cd
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..8f0913c
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 28d4b77..0000000
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..d27aa3b
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..35ac7a1
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9287f50..0000000
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/login_bkg.png b/app/src/main/res/mipmap-xxhdpi/login_bkg.png
new file mode 100644
index 0000000..3f8d14a
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/login_bkg.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..e5375b3
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
deleted file mode 100644
index aa7d642..0000000
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..68aa224
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03be9a5
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..72906db
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..849a57d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..72ba334
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..c196ced
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..53f1380
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a695..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/common_bkg.png b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
new file mode 100644
index 0000000..80696cd
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..8f0913c
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 28d4b77..0000000
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..d27aa3b
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..35ac7a1
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9287f50..0000000
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/login_bkg.png b/app/src/main/res/mipmap-xxhdpi/login_bkg.png
new file mode 100644
index 0000000..3f8d14a
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/login_bkg.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..e5375b3
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
deleted file mode 100644
index aa7d642..0000000
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..68aa224
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..1b8e3d7
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03be9a5
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..72906db
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..849a57d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..72ba334
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..c196ced
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..53f1380
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a695..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/common_bkg.png b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
new file mode 100644
index 0000000..80696cd
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..8f0913c
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 28d4b77..0000000
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..d27aa3b
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..35ac7a1
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9287f50..0000000
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/login_bkg.png b/app/src/main/res/mipmap-xxhdpi/login_bkg.png
new file mode 100644
index 0000000..3f8d14a
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/login_bkg.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..e5375b3
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
deleted file mode 100644
index aa7d642..0000000
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..68aa224
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..1b8e3d7
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9126ae3..0000000
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03be9a5
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..72906db
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..849a57d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..72ba334
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..c196ced
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..53f1380
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a695..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/common_bkg.png b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
new file mode 100644
index 0000000..80696cd
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..8f0913c
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 28d4b77..0000000
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..d27aa3b
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..35ac7a1
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9287f50..0000000
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/login_bkg.png b/app/src/main/res/mipmap-xxhdpi/login_bkg.png
new file mode 100644
index 0000000..3f8d14a
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/login_bkg.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..e5375b3
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
deleted file mode 100644
index aa7d642..0000000
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..68aa224
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..1b8e3d7
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9126ae3..0000000
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index cd65ba6..19d2185 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="mainThemeColor">#1D55C6</color>
-    <color name="mainTextColor">#232323</color>
+    <color name="mainThemeColor">#2483B3</color>
+    <color name="subMainThemeColor">#662483B3</color>
+    <color name="mainTextColor">#333333</color>
     <color name="subTextColor">#626262</color>
     <color name="mainBackColor">#F7F7FA</color>
     <color name="hintTextColor">#CCCCCC</color>

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03be9a5
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..72906db
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..849a57d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..72ba334
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..c196ced
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..53f1380
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a695..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/common_bkg.png b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
new file mode 100644
index 0000000..80696cd
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..8f0913c
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 28d4b77..0000000
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..d27aa3b
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..35ac7a1
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9287f50..0000000
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/login_bkg.png b/app/src/main/res/mipmap-xxhdpi/login_bkg.png
new file mode 100644
index 0000000..3f8d14a
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/login_bkg.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..e5375b3
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
deleted file mode 100644
index aa7d642..0000000
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..68aa224
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..1b8e3d7
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9126ae3..0000000
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index cd65ba6..19d2185 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="mainThemeColor">#1D55C6</color>
-    <color name="mainTextColor">#232323</color>
+    <color name="mainThemeColor">#2483B3</color>
+    <color name="subMainThemeColor">#662483B3</color>
+    <color name="mainTextColor">#333333</color>
     <color name="subTextColor">#626262</color>
     <color name="mainBackColor">#F7F7FA</color>
     <color name="hintTextColor">#CCCCCC</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 8295970..1006c76 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,5 +1,6 @@
 <resources>
     <!--字体大小-->
+    <dimen name="sp_10">10sp</dimen>
     <dimen name="sp_12">12sp</dimen>
     <dimen name="sp_14">14sp</dimen>
     <dimen name="sp_16">16sp</dimen>
@@ -20,8 +21,10 @@
     <dimen name="dp_40">40dp</dimen>
     <dimen name="dp_50">50dp</dimen>
     <dimen name="dp_55">55dp</dimen>
+    <dimen name="dp_60">60dp</dimen>
     <dimen name="dp_80">80dp</dimen>
     <dimen name="dp_100">100dp</dimen>
+    <dimen name="dp_115">115dp</dimen>
     <dimen name="dp_200">200dp</dimen>
     <dimen name="dp_300">300dp</dimen>
 

diff --git a/app/build.gradle b/app/build.gradle
index 7cc948d..163aeb6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
     //沉浸式状态栏。基础依赖包，必须要依赖
-    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
     //空白页
     implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
     implementation 'com.qmuiteam:arch:0.3.1'
diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index bae3254..9f8c814 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c387fc..defbd7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
+        android:resizeableActivity="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -37,10 +38,20 @@
 
         <activity android:name=".view.SplashScreenActivity" />
         <activity android:name=".view.MainActivity" />
+        <activity android:name=".view.LoginActivity" />
         <activity android:name=".view.EditUserActivity" />
         <activity android:name=".view.AddressManagerActivity" />
         <activity android:name=".view.SettingsActivity" />
-        <activity android:name=".view.AllDeviceActivity"/>
+        <activity android:name=".view.AllDeviceActivity" />
+
+        <!--适配华为（huawei）刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true" />
+        <!--适配小米（xiaomi）刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
index 48321ae..58a92c8 100644
--- a/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
+++ b/app/src/main/java/com/casic/br/adapter/AddedDeviceAdapter.kt
@@ -1,40 +1,89 @@
 package com.casic.br.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.casic.br.R
 import com.casic.br.model.AddedDeviceModel
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.obtainScreenWidth
 
+@SuppressLint("NotifyDataSetChanged")
 class AddedDeviceAdapter(
-    private val context: Context,
-    private val dataRows: MutableList<AddedDeviceModel>
+    private val context: Context, private val spacing: Float
 ) : RecyclerView.Adapter<AddedDeviceAdapter.ItemViewHolder>() {
 
     private var layoutInflater: LayoutInflater = LayoutInflater.from(context)
+    private val screenWidth = context.obtainScreenWidth()
+    private var dataRows: MutableList<AddedDeviceModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        layoutInflater.inflate(R.layout.item_added_device_rv_l, parent, false)
-    )
+    fun setupDevice(devices: MutableList<AddedDeviceModel>) {
+        dataRows = devices
+        notifyDataSetChanged()
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        holder.deviceNameView.text = dataRows[position].deviceName
-        holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
-        holder.itemView.setOnClickListener {
-            clickListener?.onItemClick(position)
+    fun deleteDevice(position: Int) {
+        if (dataRows.isNotEmpty()) {
+            dataRows.removeAt(position)
+            notifyDataSetChanged()
         }
     }
 
-    override fun getItemCount(): Int = dataRows.size
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        return ItemViewHolder(
+            layoutInflater.inflate(R.layout.item_added_device_rv_g, parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        if (position == itemCount - 1) {
+            holder.deviceNameView.text = "添加设备"
+            holder.moreOperateButton.visibility = View.GONE
+
+            holder.imageView.setImageResource(R.drawable.ic_add_device)
+            if (holder.imageView.layoutParams is ViewGroup.MarginLayoutParams) {
+                val params = holder.imageView.layoutParams as ViewGroup.MarginLayoutParams
+                params.setMargins(0, 3f.dp2px(context), 0, 0)
+                holder.imageView.requestLayout()
+            }
+            holder.imageView.layoutParams.width = 40f.dp2px(context)
+            holder.imageView.layoutParams.height = 40f.dp2px(context)
+
+            holder.tempLayout.visibility = View.GONE
+            holder.imageView.setOnClickListener { //添加图片
+                clickListener?.onAddDeviceClick()
+            }
+        } else {
+            holder.deviceNameView.text = dataRows[position].deviceName
+            holder.deviceModelView.text = dataRows[position].deviceModel
+            holder.deviceUsedTimeView.text = dataRows[position].deviceUsedTime
+            holder.rootView.setOnClickListener {
+                clickListener?.onItemClick(position)
+            }
+            // 长按监听
+            holder.moreOperateButton.setOnClickListener {
+                clickListener?.onButtonClick(position)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = dataRows.size + 1
 
     private var clickListener: OnItemClickListener? = null
 
     interface OnItemClickListener {
+        fun onAddDeviceClick()
+
         fun onItemClick(position: Int)
+
+        fun onButtonClick(position: Int)
     }
 
     fun setOnItemClickListener(clickListener: OnItemClickListener?) {
@@ -42,8 +91,12 @@
     }
 
     class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val rootView: LinearLayout = itemView.findViewById(R.id.rootView)
         val deviceNameView: TextView = itemView.findViewById(R.id.deviceNameView)
+        val moreOperateButton: Button = itemView.findViewById(R.id.moreOperateButton)
+        val imageView: ImageView = itemView.findViewById(R.id.imageView)
+        val tempLayout: LinearLayout = itemView.findViewById(R.id.tempLayout)
+        val deviceModelView: TextView = itemView.findViewById(R.id.deviceModelView)
         val deviceUsedTimeView: TextView = itemView.findViewById(R.id.deviceUsedTimeView)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/extensions/Context.kt b/app/src/main/java/com/casic/br/extensions/Context.kt
new file mode 100644
index 0000000..5866614
--- /dev/null
+++ b/app/src/main/java/com/casic/br/extensions/Context.kt
@@ -0,0 +1,12 @@
+package com.casic.br.extensions
+
+import android.content.Context
+import android.view.ViewGroup
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+
+fun Context.initLayoutImmersionBar(rootView: ViewGroup) {
+    //根据不同设备状态栏高度设置"跳过"按钮的Margin值
+    val statusBarHeight = QMUIDisplayHelper.getStatusBarHeight(this)
+    rootView.setPadding(0, statusBarHeight, 0, 0)
+    rootView.requestLayout()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 9857505..c52f538 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -1,8 +1,9 @@
 package com.casic.br.fragment
 
-import androidx.recyclerview.widget.DividerItemDecoration
+import android.graphics.Typeface
 import com.casic.br.R
 import com.casic.br.adapter.AddedDeviceAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.AddedDeviceModel
 import com.casic.br.view.AllDeviceActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
@@ -17,7 +18,9 @@
     override fun initLayoutView(): Int = R.layout.fragment_device
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "设备"
+        leftTitleView.typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
     }
 
     override fun initData() {
@@ -25,33 +28,40 @@
         val deviceModels = ArrayList<AddedDeviceModel>()
         for (i in 0..2) {
             val model = AddedDeviceModel()
-            model.deviceName = "*****热水器"
+            model.deviceName = "万家乐热水器"
+            model.deviceModel = "D40-DM1"
             model.deviceUsedTime = "已使用${Random().nextInt(12)}个月${Random().nextInt(31)}天"
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
-        )
+        val addedDeviceAdapter = AddedDeviceAdapter(requireContext(), 13f)
+        addedDeviceAdapter.setupDevice(deviceModels)
         deviceRecyclerView.adapter = addedDeviceAdapter
         addedDeviceAdapter.setOnItemClickListener(object :
             AddedDeviceAdapter.OnItemClickListener {
+            override fun onAddDeviceClick() {
+
+            }
+
             override fun onItemClick(position: Int) {
                 //TODO 需要根据设备类型显示不同的页面
                 val deviceModel = deviceModels[position]
                 deviceModel.deviceName.show(requireContext())
             }
+
+            override fun onButtonClick(position: Int) {
+
+            }
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         showAllDeviceLayout.setOnClickListener {
             requireContext().navigatePageTo<AllDeviceActivity>()
         }
-
-        addDeviceLayout.setOnClickListener {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
index 07dfe01..8aba9b2 100644
--- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt
@@ -4,10 +4,13 @@
 import com.casic.br.R
 import com.casic.br.adapter.ConnectGridAdapter
 import com.casic.br.adapter.HomeGridAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.model.BannerImageModel
 import com.casic.br.utils.GridItemDecoration
 import com.casic.br.utils.LocaleConstant
+import com.casic.br.view.LoginActivity
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.youth.banner.Banner
 import com.youth.banner.adapter.BannerImageAdapter
@@ -15,7 +18,6 @@
 import com.youth.banner.indicator.CircleIndicator
 import com.youth.banner.transformer.AlphaPageTransformer
 import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_recommend.*
 import java.util.*
 
 class HomePageFragment : KotlinBaseFragment() {
@@ -23,7 +25,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_home
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -82,7 +84,13 @@
         })
     }
 
-    override fun initEvent() {
+    override fun observeRequestState() {
 
     }
+
+    override fun initEvent() {
+        rightOperateView.setOnClickListener {
+            requireContext().navigatePageTo<LoginActivity>()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
index 16fde61..90dcfcf 100644
--- a/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MessagePageFragment.kt
@@ -5,13 +5,13 @@
 import androidx.recyclerview.widget.DividerItemDecoration
 import com.casic.br.R
 import com.casic.br.adapter.MessageListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.extensions.showEmptyPage
 import com.casic.br.model.LocaleMessageBean
 import com.casic.br.utils.DataBaseManager
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import kotlinx.android.synthetic.main.fragment_message.*
-import kotlinx.android.synthetic.main.fragment_mine.*
 import kotlinx.android.synthetic.main.include_empty_view.*
 import kotlinx.android.synthetic.main.include_main_title.*
 
@@ -28,6 +28,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_message
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "消息"
     }
 
@@ -35,6 +36,10 @@
         weakReferenceHandler = WeakReferenceHandler(callback)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         messageLayout.setOnRefreshListener {
             isRefresh = true
@@ -96,7 +101,7 @@
                 } else {
                     emptyView!!.hide()
                     messageAdapter = MessageListAdapter(requireContext(), dataBeans)
-                    settingsRecyclerView.addItemDecoration(
+                    messageRecyclerView.addItemDecoration(
                         DividerItemDecoration(
                             requireContext(), DividerItemDecoration.VERTICAL
                         )
diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
index b3f222a..afc5de7 100644
--- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt
@@ -6,6 +6,7 @@
 import com.casic.br.R
 import com.casic.br.adapter.IconTextGridAdapter
 import com.casic.br.adapter.IconTextListAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.utils.LocaleConstant
 import com.casic.br.view.AddressManagerActivity
 import com.casic.br.view.EditUserActivity
@@ -20,6 +21,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_mine
 
     override fun setupTopBarLayout() {
+        requireContext().initLayoutImmersionBar(rootView)
         leftTitleView.text = "我的"
     }
 
@@ -85,6 +87,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         editUserView.setOnClickListener {
             requireContext().navigatePageTo<EditUserActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
index 8b11894..cc69400 100644
--- a/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/ShopPageFragment.kt
@@ -3,6 +3,7 @@
 import androidx.fragment.app.Fragment
 import com.casic.br.R
 import com.casic.br.adapter.SubViewPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
 import com.casic.br.fragment.shop.ComponentFragment
 import com.casic.br.fragment.shop.RecommendFragment
 import com.casic.br.fragment.shop.SmartHomeFragment
@@ -26,7 +27,7 @@
     override fun initLayoutView(): Int = R.layout.fragment_shop
 
     override fun setupTopBarLayout() {
-
+        requireContext().initLayoutImmersionBar(rootView)
     }
 
     override fun initData() {
@@ -37,6 +38,10 @@
         shopTopTabLayout.setupWithViewPager(shopViewPager)
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
index dc67cc4..760d844 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/ComponentFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
index 68791a0..a013b9e 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/RecommendFragment.kt
@@ -99,6 +99,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
index 09753d6..508fc18 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartHomeFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
index 535e512..0c4e37a 100644
--- a/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/shop/SmartKitchenFragment.kt
@@ -15,6 +15,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
index 40a545c..451a69a 100644
--- a/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
+++ b/app/src/main/java/com/casic/br/model/AddedDeviceModel.java
@@ -4,11 +4,20 @@
  * 已添加设备（Iot和非Iot设备）数据模型
  */
 public class AddedDeviceModel {
-    private String deviceImage;
     private String deviceName;
+    private String deviceImage;
+    private String deviceModel;
     private String deviceType;
     private String deviceUsedTime;
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
     public String getDeviceImage() {
         return deviceImage;
     }
@@ -17,12 +26,12 @@
         this.deviceImage = deviceImage;
     }
 
-    public String getDeviceName() {
-        return deviceName;
+    public String getDeviceModel() {
+        return deviceModel;
     }
 
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
+    public void setDeviceModel(String deviceModel) {
+        this.deviceModel = deviceModel;
     }
 
     public String getDeviceType() {
diff --git a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
index bdf257e..1842b75 100644
--- a/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddressManagerActivity.kt
@@ -23,6 +23,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
index bafd851..c4bb8d2 100644
--- a/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AllDeviceActivity.kt
@@ -35,19 +35,23 @@
 
             deviceModels.add(model)
         }
-        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
-        deviceRecyclerView.addItemDecoration(
-            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
-        )
-        deviceRecyclerView.adapter = addedDeviceAdapter
-        addedDeviceAdapter.setOnItemClickListener(object :
-            AddedDeviceAdapter.OnItemClickListener {
-            override fun onItemClick(position: Int) {
-                //TODO 需要根据设备类型显示不同的页面
-                val deviceModel = deviceModels[position]
-                deviceModel.deviceName.show(this@AllDeviceActivity)
-            }
-        })
+//        val addedDeviceAdapter = AddedDeviceAdapter(this, deviceModels)
+//        deviceRecyclerView.addItemDecoration(
+//            DividerItemDecoration(this, DividerItemDecoration.VERTICAL)
+//        )
+//        deviceRecyclerView.adapter = addedDeviceAdapter
+//        addedDeviceAdapter.setOnItemClickListener(object :
+//            AddedDeviceAdapter.OnItemClickListener {
+//            override fun onItemClick(position: Int) {
+//                //TODO 需要根据设备类型显示不同的页面
+//                val deviceModel = deviceModels[position]
+//                deviceModel.deviceName.show(this@AllDeviceActivity)
+//            }
+//        })
+    }
+
+    override fun observeRequestState() {
+
     }
 
     override fun initEvent() {
diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
index 9b04044..70ecf10 100644
--- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt
+++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt
@@ -41,6 +41,10 @@
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         avatarLayout.setOnClickListener {
             BottomActionSheet.Builder()
diff --git a/app/src/main/java/com/casic/br/view/LoginActivity.kt b/app/src/main/java/com/casic/br/view/LoginActivity.kt
new file mode 100644
index 0000000..9de6790
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/LoginActivity.kt
@@ -0,0 +1,26 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class LoginActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_login
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/MainActivity.kt b/app/src/main/java/com/casic/br/view/MainActivity.kt
index c2fe809..a2fb29a 100644
--- a/app/src/main/java/com/casic/br/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/br/view/MainActivity.kt
@@ -9,9 +9,7 @@
 import com.casic.br.fragment.*
 import com.gyf.immersionbar.ImmersionBar
 import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : KotlinBaseActivity() {
@@ -32,13 +30,16 @@
 
     override fun setupTopBarLayout() {
         ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
     }
 
     override fun initData() {
 
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         bottomNavigation.itemIconTintList = null
         bottomNavigation.setOnItemSelectedListener { menuItem ->
diff --git a/app/src/main/java/com/casic/br/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
index 62a5fb8..1a2a9c8 100644
--- a/app/src/main/java/com/casic/br/view/PermissionActivity.kt
+++ b/app/src/main/java/com/casic/br/view/PermissionActivity.kt
@@ -1,47 +1,34 @@
 package com.casic.br.view
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.casic.br.R
 import com.casic.br.utils.LocaleConstant
-import com.gyf.immersionbar.ImmersionBar
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.navigatePageTo
-import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil
-import kotlinx.android.synthetic.main.activity_permssion.*
 import pub.devrel.easypermissions.EasyPermissions
 import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks
 
-class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks {
+class PermissionActivity : AppCompatActivity(), PermissionCallbacks {
 
-    override fun initLayoutView(): Int = R.layout.activity_permssion
-
-    override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(true).init()
-        ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this))
-    }
-
-    override fun initData() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
         if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) {
             startSplashScreenActivity()
         } else {
-            enterMainButton.setOnClickListener {
-                EasyPermissions.requestPermissions(
-                    this@PermissionActivity,
-                    resources.getString(R.string.app_name) + "需要获取存储相关权限",
-                    LocaleConstant.PERMISSIONS_CODE,
-                    *LocaleConstant.USER_PERMISSIONS
-                )
-            }
+            EasyPermissions.requestPermissions(
+                this@PermissionActivity,
+                resources.getString(R.string.app_name) + "需要获取存储相关权限",
+                LocaleConstant.PERMISSIONS_CODE,
+                *LocaleConstant.USER_PERMISSIONS
+            )
         }
     }
 
-    override fun initEvent() {
-
-    }
-
     private fun startSplashScreenActivity() {
-        navigatePageTo<SplashScreenActivity>()
+        //TODO 不要开屏页
+//        navigatePageTo<SplashScreenActivity>()
+        navigatePageTo<MainActivity>()
         finish()
     }
 
diff --git a/app/src/main/java/com/casic/br/view/SettingsActivity.kt b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
index b8dd006..2c89b31 100644
--- a/app/src/main/java/com/casic/br/view/SettingsActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SettingsActivity.kt
@@ -43,6 +43,10 @@
         })
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
 
     }
diff --git a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
index 26ea221..4fdf7dd 100644
--- a/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SplashScreenActivity.kt
@@ -41,6 +41,10 @@
         }
     }
 
+    override fun observeRequestState() {
+
+    }
+
     override fun initEvent() {
         countDownTimer.start()
         skipButton.setChangeAlphaWhenPress(true)
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
new file mode 100644
index 0000000..3561f6e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
new file mode 100644
index 0000000..5d1d1f4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_main_radius_7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/lineViewSize"
+        android:color="@color/mainThemeColor" />
+
+    <corners android:radius="@dimen/dp_7" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
deleted file mode 100644
index a93ef6c..0000000
--- a/app/src/main/res/drawable/bg_stroke_layout_radius_5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="@dimen/lineViewSize"
-        android:color="@color/mainBackColor" />
-
-    <corners android:radius="@dimen/dp_5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_common_selector.xml b/app/src/main/res/drawable/button_common_selector.xml
new file mode 100644
index 0000000..d806fcf
--- /dev/null
+++ b/app/src/main/res/drawable/button_common_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="13dp" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="13dp" />
+            <!-- 点击按钮时候改变背景色50% -->
+            <solid android:color="#80D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
index 5875998..f8e7781 100644
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ b/app/src/main/res/drawable/button_main_selector.xml
@@ -3,16 +3,16 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="@color/mainThemeColor" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#801D55C6" />
+            <solid android:color="#802483B3" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
index 4dd3c0b..c32a27e 100644
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ b/app/src/main/res/drawable/button_white_selector.xml
@@ -3,14 +3,14 @@
 
     <item android:state_pressed="false">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#F1F1F1" />
         </shape>
     </item>
 
     <item android:state_pressed="true">
         <shape>
-            <corners android:radius="@dimen/dp_5" />
+            <corners android:radius="@dimen/dp_7" />
             <solid android:color="#D3D3D3" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_add_device.xml b/app/src/main/res/drawable/ic_add_device.xml
index 14c8ec9..e228615 100644
--- a/app/src/main/res/drawable/ic_add_device.xml
+++ b/app/src/main/res/drawable/ic_add_device.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
+    android:width="64px"
+    android:height="64px"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/mainTextColor"
-        android:pathData="M800,480l-256,0L544,224c0,-17.66 -14.34,-32 -32,-32s-32,14.34 -32,32l0,256L224,480c-17.66,0 -32,14.34 -32,32s14.34,32 32,32l256,0 0,256c0,17.7 14.34,32 32,32s32,-14.3 32,-32l0,-256 256,0c17.7,0 32,-14.34 32,-32S817.7,480 800,480z" />
+        android:fillColor="@color/mainThemeColor"
+        android:pathData="M512,42.67c259.2,0 469.33,210.13 469.33,469.33s-210.13,469.33 -469.33,469.33S42.67,771.2 42.67,512 252.8,42.67 512,42.67zM512,106.67C288.15,106.67 106.67,288.15 106.67,512s181.48,405.33 405.33,405.33 405.33,-181.48 405.33,-405.33S735.85,106.67 512,106.67zM546.13,320c4.69,0 8.53,3.84 8.53,8.53L554.67,469.33h140.8c4.69,0 8.53,3.84 8.53,8.53v46.93a8.53,8.53 0,0 1,-8.53 8.53L554.67,533.33v140.8a8.53,8.53 0,0 1,-8.53 8.53h-46.93a8.53,8.53 0,0 1,-8.53 -8.53L490.67,533.33h-140.8a8.53,8.53 0,0 1,-8.53 -8.53v-46.93c0,-4.69 3.84,-8.53 8.53,-8.53L490.67,469.33v-140.8c0,-4.69 3.84,-8.53 8.53,-8.53h46.93z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index b612ce9..0000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFDEF1"
-        android:pathData="M483.4,336.6H147.2c-12.8,0 -23.2,10.4 -23.2,23.2v438c0,12.8 10.4,23.2 23.2,23.2h736.6c12.8,0 23.2,-10.4 23.2,-23.2v-438c0,-12.8 -10.4,-23.2 -23.2,-23.2h-70.6M811,335.4l-33.2,-93.2c-3.2,-9.2 -12,-15.4 -22,-15.4H540.6c-9.8,0 -18.6,6.2 -22,15.4l-33.2,93.2" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M126.8,444h780.2v319.8H126.8z" />
-    <path
-        android:fillColor="#5ACCC3"
-        android:pathData="M891.6,816.2H140.4c-8,0 -14.4,-6.4 -14.4,-14.4v-23.4c0,-8 6.4,-14.4 14.4,-14.4h751.2c8,0 14.4,6.4 14.4,14.4v23.4c0,7.8 -6.4,14.4 -14.4,14.4z" />
-    <path
-        android:fillColor="#6DE2D9"
-        android:pathData="M752.8,337.4H543.6l21.4,-58.2c2.2,-5.8 7.8,-9.6 14,-9.6h138.4c6.4,0 12,3.8 14,9.6l21.4,58.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M752.8,343.4L543.6,343.4c-2,0 -3.8,-1 -5,-2.6 -1.2,-1.6 -1.4,-3.6 -0.8,-5.6l21.4,-58.2c3,-8.2 11,-13.6 19.6,-13.6h138.4c9,0 16.8,5.4 19.6,13.6l21.4,58c0.6,1.8 0.4,3.8 -0.8,5.6 -0.8,1.8 -2.6,2.8 -4.6,2.8zM552.2,331.4h192l-18.4,-50.2c-1.2,-3.4 -4.4,-5.6 -8.4,-5.6h-138.4c-3.8,0 -7,2.4 -8.4,5.8l-18.4,50z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M883.8,827H147.2c-16.2,0 -29.2,-13 -29.2,-29.2v-438c0,-16.2 13,-29.2 29.2,-29.2h336.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6H147.2c-9.4,0 -17.2,7.8 -17.2,17.2v438c0,9.4 7.8,17.2 17.2,17.2h736.6c9.4,0 17.2,-7.8 17.2,-17.2v-438c0,-9.4 -7.8,-17.2 -17.2,-17.2h-70.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h70.6c16,0 29.2,13 29.2,29.2v438c0,16.2 -13,29.2 -29.2,29.2z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M811,341.4c-2.4,0 -4.8,-1.6 -5.6,-4l-33.2,-93.2c-2.4,-6.8 -9,-11.4 -16.4,-11.4L540.6,232.8c-7.2,0 -13.8,4.6 -16.4,11.4l-33.2,93.2c-1.2,3.2 -4.6,4.8 -7.6,3.6 -3.2,-1.2 -4.8,-4.6 -3.6,-7.6l33.2,-93.2c4.2,-11.6 15.4,-19.4 27.6,-19.4h215.2c12.6,0 23.6,7.8 27.6,19.4l33.2,93.2c1.2,3.2 -0.6,6.6 -3.6,7.6 -0.6,0.2 -1.4,0.4 -2,0.4zM421.4,341.4h-124c-9.8,0 -17.8,-8 -17.8,-17.8v-25c0,-9.8 8,-17.8 17.8,-17.8h124c9.8,0 17.8,8 17.8,17.8v25c-0.4,10 -8.2,17.8 -17.8,17.8zM297.4,292.8c-3.2,0 -5.8,2.6 -5.8,5.8v25c0,3.2 2.6,5.8 5.8,5.8h124c3.2,0 5.8,-2.6 5.8,-6v-24.8c0,-3.2 -2.6,-5.8 -5.8,-5.8h-124z" />
-    <path
-        android:fillColor="#17A8A5"
-        android:pathData="M245,335.4H175.2v-15c0,-8.8 7.2,-16 16,-16h37.8c8.8,0 16,7.2 16,16v15z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M245,341.4L175.2,341.4c-3.4,0 -6,-2.6 -6,-6v-15c0,-12.2 9.8,-22 22,-22h37.8c12.2,0 22,9.8 22,22v15c0,3.4 -2.6,6 -6,6zM181.2,329.4h57.8v-9c0,-5.6 -4.4,-10 -10,-10L191.2,310.4c-5.6,0 -10,4.4 -10,10v9z" />
-    <path
-        android:fillColor="#8895F2"
-        android:pathData="M648.2,581.6m-195.8,0a195.8,195.8 0,1 0,391.6 0,195.8 195.8,0 1,0 -391.6,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,783.4c-111.2,0 -201.8,-90.6 -201.8,-201.8 0,-111.2 90.6,-201.8 201.8,-201.8 111.2,0 201.8,90.6 201.8,201.8 0,111.2 -90.6,201.8 -201.8,201.8zM648.2,391.8c-104.6,0 -189.8,85.2 -189.8,189.8s85.2,189.8 189.8,189.8 189.8,-85.2 189.8,-189.8 -85.2,-189.8 -189.8,-189.8z" />
-    <path
-        android:fillColor="#C0CBFF"
-        android:pathData="M648.2,581.6m-143.4,0a143.4,143.4 0,1 0,286.8 0,143.4 143.4,0 1,0 -286.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M648.2,731c-82.4,0 -149.4,-67 -149.4,-149.4s67,-149.4 149.4,-149.4 149.4,67 149.4,149.4 -67,149.4 -149.4,149.4zM648.2,444.2c-75.8,0 -137.4,61.6 -137.4,137.4 0,75.8 61.6,137.4 137.4,137.4 75.8,0 137.4,-61.6 137.4,-137.4 0,-75.8 -61.6,-137.4 -137.4,-137.4z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M754.4,565.2c-2.8,0 -5.4,-2 -5.8,-5 -0.4,-2 -1,-4 -1.4,-6 -1.2,-4.4 -2.8,-8.8 -5,-13.6 -1.4,-3 0,-6.6 3.2,-7.8 3,-1.4 6.6,0 7.8,3.2 2.4,5.4 4.2,10.4 5.4,15.2 0.6,2.4 1.2,4.6 1.8,7.2 0.6,3.2 -1.6,6.4 -4.8,7 -0.4,-0.2 -0.8,-0.2 -1.2,-0.2zM740,529.6c-2,0 -4,-1 -5,-2.8 -10.4,-16.4 -25,-29.4 -42,-37.6 -3,-1.4 -4.2,-5 -2.8,-8 1.4,-3 5,-4.2 8,-2.8 19,9.2 35.2,23.8 46.8,42 1.8,2.8 1,6.6 -1.8,8.2 -1,0.6 -2,1 -3.2,1zM563.8,655.8c-1.8,0 -3.4,-0.8 -4.6,-2.2 -10.2,-12.4 -17.4,-26.6 -21.6,-41.8 -0.8,-3.2 1,-6.4 4.2,-7.4 3.2,-0.8 6.4,1 7.4,4.2 3.8,13.6 10.2,26.2 19.2,37.4 2,2.6 1.6,6.4 -0.8,8.4 -1.2,1 -2.4,1.4 -3.8,1.4zM576.8,669.4c-1.6,0 -3,-0.6 -4.2,-1.8l-0.8,-0.8c-2.4,-2.4 -2.4,-6.2 0,-8.4s6.2,-2.4 8.4,0l0.8,0.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM628.2,694.2c-0.4,0 -0.8,0 -1.2,-0.2 -14.6,-2.8 -28,-8 -40,-15.6 -2.8,-1.8 -3.6,-5.4 -1.8,-8.2 1.8,-2.8 5.4,-3.6 8.2,-1.8 10.8,6.8 22.8,11.6 36,14 3.2,0.6 5.4,3.8 4.8,7 -0.6,2.8 -3.2,4.8 -6,4.8z" />
-    <path
-        android:fillColor="#FFB3E2"
-        android:pathData="M171.4,719.2m-19.4,0a19.4,19.4 0,1 0,38.8 0,19.4 19.4,0 1,0 -38.8,0Z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M900.2,450h-112.4c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h112.4c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM504.8,450h-380c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h380c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM900.2,769.8H720c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h180.2c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM576.4,769.8H126.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h449.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M310.8,769.8c-3.4,0 -6,-2.6 -6,-6V444c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v319.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#F25CAB"
-        android:pathData="M707.2,539.4c-15.6,-15.6 -41,-15.6 -56.4,0l-2.6,2.6 -2.6,-2.6c-15.6,-15.6 -41,-15.6 -56.4,0 -6.2,6.2 -19.2,28 -7,49.6 18,32 66,66 66,66s47.8,-34 66,-66c12,-21.6 -0.8,-43.4 -7,-49.6z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,409h-49.8c-5.6,0 -10,-4.6 -10,-10v-18.8c0,-5.6 4.6,-10 10,-10h49.8c5.6,0 10,4.6 10,10v18.8c0,5.6 -4.4,10 -10,10z" />
-    <path
-        android:fillColor="#F272B5"
-        android:pathData="M866.8,415h-49.8c-8.8,0 -16,-7.2 -16,-16v-18.8c0,-8.8 7.2,-16 16,-16h49.8c8.8,0 16,7.2 16,16v18.8c0,9 -7,16 -16,16zM817,376.2c-2.2,0 -4,1.8 -4,4v18.8c0,2.2 1.8,4 4,4h49.8c2.2,0 4,-1.8 4,-4v-18.8c0,-2.2 -1.8,-4 -4,-4h-49.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M309,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6zM334.2,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M359.4,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M384.6,335.6c-3.4,0 -6,-2.6 -6,-6v-42.6c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.6c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M409.8,337.6c-3.4,0 -6,-2.6 -6,-6v-42.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v42.8c0,3.4 -2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,399.4h-3.8c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h3.8c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M165.6,405.4h-3.8c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h3.8c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM161.8,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h3.8c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-3.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,399.4h-27.2c-5.4,0 -9.6,-4.4 -9.6,-9.8s4.4,-9.8 9.6,-9.8h27.2c5.4,0 9.6,4.4 9.6,9.8s-4.4,9.8 -9.6,9.8z" />
-    <path
-        android:fillColor="#07B1AE"
-        android:pathData="M235.4,405.4h-27.2c-8.6,0 -15.6,-7 -15.6,-15.8s7,-15.8 15.6,-15.8h27.2c8.6,0 15.6,7 15.6,15.8s-7,15.8 -15.6,15.8zM208.2,385.8c-2,0 -3.6,1.8 -3.6,3.8 0,2.2 1.6,3.8 3.6,3.8h27.2c2,0 3.6,-1.8 3.6,-3.8 0,-2.2 -1.6,-3.8 -3.6,-3.8h-27.2z" />
-    <path
-        android:fillColor="#E84091"
-        android:pathData="M135.4,208.4l13.8,37.2c0.2,0.6 0.8,1.2 1.4,1.4l37.2,13.8c2,0.8 2,3.8 0,4.4l-37.2,13.8c-0.6,0.2 -1.2,0.8 -1.4,1.4l-13.8,37.2c-0.8,2 -3.6,2 -4.4,0l-13.8,-37.2c-0.2,-0.6 -0.8,-1.2 -1.4,-1.4l-37.2,-13.8c-2,-0.8 -2,-3.8 0,-4.4l37.2,-13.8c0.6,-0.2 1.2,-0.8 1.4,-1.4l13.8,-37.2c0.6,-2 3.6,-2 4.4,0z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M209.2,178.6c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM209.2,236.8c-3.4,0 -6,-2.6 -6,-6v-9.8c0,-3.4 2.6,-6 6,-6s6,2.6 6,6v9.8c0,3.4 -2.6,6 -6,6zM185,202.8h-9.8c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.8c3.4,0 6,2.6 6,6s-2.6,6 -6,6zM243,202.8h-9.6c-3.4,0 -6,-2.6 -6,-6s2.6,-6 6,-6h9.6c3.4,0 6,2.6 6,6s-2.6,6 -6,6z" />
-    <path
-        android:fillColor="#2C3AC4"
-        android:pathData="M192,185.6c-1.6,0 -3,-0.6 -4.2,-1.8l-6.8,-6.8c-2.4,-2.4 -2.4,-6.2 0,-8.4 2.4,-2.4 6.2,-2.4 8.4,0l6.8,6.8c2.4,2.4 2.4,6.2 0,8.4 -1.2,1.2 -2.6,1.8 -4.2,1.8zM233.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.6l-7,-6.8c-2.4,-2.4 -2.4,-6.2 -0.2,-8.4 2.4,-2.4 6.2,-2.4 8.4,-0.2l7,6.8c2.4,2.4 2.4,6.2 0.2,8.4 -1,1.2 -2.6,1.8 -4.2,1.8zM185.2,226.8c-1.6,0 -3,-0.6 -4.2,-1.8 -2.4,-2.4 -2.4,-6.2 0,-8.4l6.8,-6.8c2.4,-2.4 6.2,-2.4 8.4,0 2.4,2.4 2.4,6.2 0,8.4l-6.8,6.8c-1.2,1.2 -2.6,1.8 -4.2,1.8zM226.2,185.6c-1.6,0 -3.2,-0.6 -4.4,-1.8 -2.4,-2.4 -2.2,-6.2 0.2,-8.4l7,-6.8c2.4,-2.4 6.2,-2.2 8.4,0.2 2.4,2.4 2.2,6.2 -0.2,8.4l-7,6.8c-1,1 -2.4,1.6 -4,1.6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index 52e376f..0000000
--- a/app/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#FFB300"
-        android:pathData="M8,552l152,88 20,12 188,104 24,12 112,64 400,-228 20,-12 100,-60 -312,-184 -20,-12 -156,-92 -212,124 -20,12 -296,172z" />
-    <path
-        android:fillColor="#2AA849"
-        android:pathData="M8,552v100l496,284v-104l-112,-64 -24,-12 -188,-104 -20,-12 -152,-88z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M504,936l520,-298V532l-100,60 -20,12 -400,228v104z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M100,516l36,20 32,16 44,24v-96.16L152,376l-52,48v92z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M152,376l104,-52 60,96 -104,59.84L152,376z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M212,576l104,-60v-96l-104,59.84V576z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M136,536v-64l32,16v64l-32,-16z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M212,479.84L100,424l52,-48 60,103.84z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M756,32a55,55 0,0 0,-27.56 7.08l-56,32C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244 56,-32s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,908 228c0,-88.44 -81.12,-196 -152,-196z" />
-    <path
-        android:fillColor="#80DAE0"
-        android:pathData="M852,260c0,-88.44 -81.12,-196 -152,-196a55,55 0,0 0,-27.56 7.08C652.68,82.4 640,106.64 640,140a200.84,200.84 0,0 0,20 84l104,244s79.04,-164.76 80.44,-168A99.64,99.64 0,0 0,852 260z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M904,604l20,-12 -312,-184 100,-60 -20,-12 -208,120 -160,-88 -20,12 156.4,88.56L160,640l20,12 140,-80 187.48,100.6L368,756l24,12 164.52,-96.6L344,560l244,-140 316,184zM738,146.16c25.4,14.36 46,49.36 46,78.12s-20.6,40.44 -46,26.08S692,201 692,172.2s20.6,-40.44 46,-26.04z" />
-    <path
-        android:fillColor="#FFFACC"
-        android:pathData="M616,640l28,16 24,12 36,20v-76l-48,-72 -40,28v72z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M656,540l84,-48 44,76 -80,44 -48,-72z" />
-    <path
-        android:fillColor="#B39E91"
-        android:pathData="M704,688l80,-48v-72l-80,44v76z" />
-    <path
-        android:fillColor="#E8383E"
-        android:pathData="M644,656v-48l24,12v48l-24,-12z" />
-    <path
-        android:fillColor="#FF5959"
-        android:pathData="M704,612l-88,-44 40,-28 48,72z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qq.xml b/app/src/main/res/drawable/ic_qq.xml
new file mode 100644
index 0000000..9b330f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qq.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1025"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M512.01,0C229.23,0 0,229.23 0,511.99c0,282.78 229.23,512.01 512.01,512.01 282.78,0 512.01,-229.23 512.01,-512.01C1024,229.23 794.77,0 512.01,0zM801.26,668.86c-21.74,18.64 -49.96,-61.35 -54.01,-49.04 -9.88,29.94 -14.53,49.94 -43.64,82.51 -1.55,1.74 33.67,14.47 43.64,41.63 9.54,26.03 28.14,67.29 -93.49,80.23 -71.38,7.58 -122.94,-38.02 -128.09,-37.59 -9.52,0.84 -5.28,0 -15.52,0 -8.37,0 -8.93,0.62 -16.81,0 -2.17,-0.17 -25.88,37.59 -131.98,37.59 -82.23,0 -103.51,-51.75 -86.99,-80.23 16.55,-28.46 44.13,-36.75 40.24,-41.25 -19.14,-22.19 -32.36,-45.92 -40.24,-67.36 -1.94,-5.34 -3.59,-10.53 -4.87,-15.52 -2.99,-11.45 -25.88,67.23 -50.46,49.04 -24.58,-18.17 -22.39,-64.41 -6.48,-108.69 16.06,-44.61 56.49,-87.59 56.94,-97.07 1.62,-35.3 -3.47,-41.16 0,-50.42 7.75,-20.77 17.2,-12.79 17.2,-23.57 0,-135.73 100.86,-245.76 225.29,-245.76 124.41,0 225.28,110.03 225.28,245.76 0,5.21 13.52,0 19.98,23.57 1.33,4.87 2.26,23.66 0.67,50.42 -0.75,12.85 34.27,28.5 52.36,97.07C828.44,628.76 810.32,661.11 801.26,668.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 898c1cf..0000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128px"
-    android:height="128px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F9DA8A"
-        android:pathData="M220.16,560v200.32L512,881.92V542.08l-72.96,109.44 -218.88,-91.52z" />
-    <path
-        android:fillColor="#F6BE53"
-        android:pathData="M584.96,651.52L512,542.08v339.84l291.84,-121.6V560l-218.88,91.52z" />
-    <path
-        android:fillColor="#EA5E5A"
-        android:pathData="M512,298.88l-291.84,121.6L512,542.08l291.84,-121.6L512,298.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M556.16,334.4l8.96,-22.59 243.07,97.28 -9.02,22.53zM215.87,409.28l243.01,-97.28 8.96,22.66 -242.94,97.28zM512,895.36l-304,-126.08V566.4h24.32v186.24L512,869.12l279.68,-116.48V566.4h24.32v202.88L512,895.36z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,554.88L215.68,431.36l8.96,-22.4L512,528.64l287.36,-119.68 8.96,22.4L512,554.88z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M580.48,666.24L501.76,548.48l20.48,-13.44 67.2,101.12 268.8,-112 -64.64,-97.28 20.48,-13.44 81.28,121.6 -314.88,131.2z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M443.52,666.24L128.64,535.04l81.28,-121.6 20.48,13.44 -65.28,97.28 269.44,112 67.2,-101.12 20.48,13.44 -78.72,117.76z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M499.84,542.08h24.32v340.48h-24.32zM813.44,427.52l-19.2,-14.72 63.36,-84.48 -268.16,-112 -18.56,28.16 -20.48,-13.44 30.08,-44.8L896,317.44l-82.56,110.08zM210.56,427.52L128,317.44l315.52,-131.2 30.08,44.8 -20.48,13.44 -18.56,-28.16L166.4,328.32l63.36,84.48 -19.2,14.72zM499.84,274.56h24.32v194.56h-24.32z" />
-    <path
-        android:fillColor="#34303D"
-        android:pathData="M512,486.4L442.88,416.64l16.64,-17.28 52.48,52.48 52.48,-52.48 17.28,17.28L512,486.4zM499.84,225.92h24.32v24.32h-24.32zM499.84,177.28h24.32v24.32h-24.32zM499.84,128.64h24.32v24.32h-24.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wechat.xml b/app/src/main/res/drawable/ic_wechat.xml
new file mode 100644
index 0000000..5cc61ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wechat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M579.8,511.87c-11.67,0 -23.34,10.84 -23.34,24.17 0,10.84 11.67,21.68 23.34,21.68 17.51,0 30.02,-10.84 30.02,-21.68C609.82,522.71 597.31,511.87 579.8,511.87L579.8,511.87zM503.1,399.31c18.34,0 30.02,-11.67 30.02,-29.18 0,-18.34 -11.67,-29.18 -30.02,-29.18 -17.51,0 -34.18,10.84 -34.18,29.18C468.91,387.64 485.59,399.31 503.1,399.31L503.1,399.31zM512.27,0.56c-282.62,0 -511.72,229.1 -511.72,511.72 0,282.62 229.1,511.72 511.72,511.72 282.62,0 511.72,-229.1 511.72,-511.72C1023.99,229.66 794.89,0.56 512.27,0.56L512.27,0.56zM415.56,641.93c-30.85,0 -53.36,-5 -82.54,-13.34l-84.21,42.52 24.18,-71.71c-59.2,-41.68 -94.22,-94.21 -94.22,-158.41 0,-113.39 106.72,-200.1 236.78,-200.1 115.05,0 217.61,68.37 237.61,165.09 -8.34,-1.67 -15.84,-2.5 -22.51,-2.5 -113.39,0 -200.93,85.04 -200.93,187.59 0,17.51 2.5,33.35 6.67,50.02C429.73,641.93 422.23,641.93 415.56,641.93L415.56,641.93zM763.23,723.63l16.67,60.03 -63.36,-35.85c-24.18,5 -47.52,12.5 -71.7,12.5 -111.72,0 -200.1,-76.7 -200.1,-171.75 0,-95.05 88.38,-171.75 200.1,-171.75 105.88,0 200.93,76.7 200.93,171.75C845.76,641.93 809.92,689.45 763.23,723.63L763.23,723.63zM338.02,340.95c-17.51,0 -35.85,10.84 -35.85,29.18 0,17.51 18.34,29.19 35.85,29.19 16.68,0 30.02,-11.67 30.02,-29.19C368.03,351.79 354.7,340.95 338.02,340.95L338.02,340.95zM710.7,511.87c-12.51,0 -23.35,10.84 -23.35,24.17 0,10.84 10.84,21.68 23.35,21.68 16.67,0 29.18,-10.84 29.18,-21.68C739.88,522.71 727.37,511.87 710.7,511.87L710.7,511.87zM710.7,511.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_zfb.xml b/app/src/main/res/drawable/ic_zfb.xml
new file mode 100644
index 0000000..71fa53d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_zfb.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112px"
+    android:height="112px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="@color/mainThemeColor"
+      android:pathData="M230.4,576.54c-12.09,9.73 -25.04,23.93 -28.81,41.98 -5.12,24.67 -1.07,55.54 22.73,79.76 28.83,29.36 72.64,37.4 91.56,38.78 51.4,3.72 106.18,-21.77 147.48,-50.84 16.18,-11.42 43.9,-34.35 70.39,-69.72 -59.37,-30.65 -133.48,-64.56 -212.7,-61.24 -40.47,1.69 -69.45,10.08 -90.65,21.28zM983.26,712.08C1009.46,650.57 1024,582.97 1024,512 1024,229.69 794.34,0 512,0 229.66,0 0,229.69 0,512c0,282.33 229.66,512 512,512 170.38,0 321.49,-83.72 414.63,-212.12 -88,-43.74 -233.03,-115.73 -322.36,-159.3 -42.63,48.6 -105.65,97.3 -176.84,118.5 -44.72,13.29 -85.04,18.36 -127.2,9.75 -41.74,-8.55 -72.48,-28.09 -90.4,-47.68 -9.13,-9.99 -19.61,-22.71 -27.2,-37.82a71.25,71.25 0,0 0,1.2 3.05s-4.36,-7.52 -7.7,-19.5a85.99,85.99 0,0 1,-3.34 -18.14,93.52 93.52,0 0,1 -0.2,-13.05c-0.38,-7.7 -0.07,-15.78 1.67,-24.06 4.18,-20.24 12.82,-43.81 35.17,-65.69 49.06,-48.04 114.78,-50.62 148.81,-50.42 50.42,0.29 138.04,22.35 211.81,48.44 20.44,-43.52 33.55,-90.07 42.01,-121.1L305.31,434.84v-33.17h157.52v-66.34L272.14,335.34v-33.17h190.69v-66.32c0,-9.1 1.8,-16.58 16.58,-16.58h74.62v82.9h207.29v33.17L554.03,335.34v66.34h165.82s-16.65,92.83 -68.72,184.32c115.56,41.27 278.13,104.85 332.13,126.09z"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
new file mode 100644
index 0000000..b18e5c5
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bg_solid_layout_white_radius_10.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape>
+            <stroke android:width="@dimen/lineViewSize" android:color="@color/mainThemeColor" />
+            <corners android:radius="@dimen/dp_10" />
+            <solid android:color="#D3E6F0" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..1ae1069
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/login_bkg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNumberView"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="欢迎登录"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="智慧厨房AIot物联管理平台"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/userNumberView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_above="@id/passwordView"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入手机号码"
+        android:inputType="phone"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <com.pengxh.kt.lite.widget.DeleteEditText
+        android:id="@+id/passwordView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:background="@drawable/bg_stroke_layout_main_radius_7"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="@dimen/dp_10"
+        android:singleLine="true"
+        android:textColorHint="#551D55C6"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/loginButton"
+        style="@style/MainButtonStyle"
+        android:layout_below="@id/passwordView"
+        android:layout_marginHorizontal="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_50"
+        android:text="登录"
+        android:textColor="@color/white" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/loginButton"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/dp_80">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:text="第三方登录"
+                android:textColor="@color/mainThemeColor"
+                android:textSize="@dimen/sp_12" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1px"
+                android:layout_weight="1"
+                android:background="@color/mainThemeColor" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/dp_20">
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_wechat" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_qq" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:src="@drawable/ic_zfb" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
deleted file mode 100644
index 9f87568..0000000
--- a/app/src/main/res/layout/activity_permssion.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_40"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/v"
-            android:layout_width="192px"
-            android:layout_height="192px"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:background="@mipmap/ic_launcher" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/t"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="欢迎使用"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-black"
-                android:text="@string/app_name"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_22" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_50"
-        android:text="为了提供及时有效的提供相关业务服务，本应用需向您申请以下权限："
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_16" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_storage" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="存储权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读写应用所需要的相关数据"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_camera" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相机权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="拍摄应用内业务相关的图片"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_location" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="位置权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="获取用户当前所在位置"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_50">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_device" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="设备权限"
-                android:textColor="#FFB42F"
-                android:textSize="@dimen/sp_16" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="读取手机当前的状态，用于定位、导航、记录关键日志等"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <Button
-            android:id="@+id/enterMainButton"
-            style="@style/MainButtonStyle"
-            android:layout_alignParentBottom="true"
-            android:layout_marginHorizontal="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:text="下一步" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index a19fe53..143f3fd 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,10 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mainBackColor"
+    android:background="@mipmap/common_bkg"
     android:orientation="vertical">
 
     <include layout="@layout/include_main_title" />
@@ -11,89 +12,68 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="1dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/showAllDeviceLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_55"
-            android:background="@color/white"
             android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_10">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:text="我的设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical|end"
+            <Button
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_25"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/button_common_selector"
                 android:text="查看全部"
                 android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_14" />
-
-            <ImageView style="@style/rightImageStyle" />
-        </LinearLayout>
-
-        <include layout="@layout/include_horizontal_no_margin_line" />
+                android:textSize="@dimen/sp_10" />
+        </RelativeLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
+            android:layout_height="0dp"
+            android:layout_weight="1.25"
+            android:paddingHorizontal="@dimen/dp_10"
             android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-        <LinearLayout
-            android:id="@+id/addDeviceLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_100"
-            android:layout_marginVertical="@dimen/dp_20"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_add_device" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_5"
-                android:text="添加设备"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
-        </LinearLayout>
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="2" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="@color/white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_10">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
                 android:padding="@dimen/dp_10"
                 android:text="热门推荐"
-                android:textColor="@color/mainTextColor"
-                android:textSize="@dimen/sp_16" />
+                android:textColor="@color/black"
+                android:textSize="@dimen/sp_18" />
 
-            <include layout="@layout/include_horizontal_no_margin_line" />
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recommendRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:scrollbars="none"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e46a31a..f6102b8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 9537d5b..d127909 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index d935c02..fefb0ae 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml
index 17b4316..1fab9ff 100644
--- a/app/src/main/res/layout/fragment_shop.xml
+++ b/app/src/main/res/layout/fragment_shop.xml
@@ -1,6 +1,7 @@
 <?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:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -28,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_5"
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_weight="1"
-            android:background="@drawable/bg_stroke_layout_radius_5"
+            android:background="@drawable/bg_stroke_layout_gray_radius_7"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/include_main_title.xml b/app/src/main/res/layout/include_main_title.xml
index 1d115fa..61f0129 100644
--- a/app/src/main/res/layout/include_main_title.xml
+++ b/app/src/main/res/layout/include_main_title.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/titleViewHeight"
-    android:background="@color/white">
+    android:layout_height="@dimen/titleViewHeight">
 
     <TextView
         android:id="@+id/leftTitleView"
@@ -11,6 +10,6 @@
         android:gravity="center_vertical"
         android:paddingHorizontal="@dimen/dp_10"
         android:text="@string/app_name"
-        android:textColor="@color/mainTextColor"
-        android:textSize="@dimen/sp_18" />
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_20" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_g.xml b/app/src/main/res/layout/item_added_device_rv_g.xml
new file mode 100644
index 0000000..be56a47
--- /dev/null
+++ b/app/src/main/res/layout/item_added_device_rv_g.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/dp_3"
+    android:layout_marginBottom="@dimen/dp_7"
+    android:background="@drawable/selector_bg_solid_layout_white_radius_10"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_5">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/moreOperateButton"
+            android:fontFamily="sans-serif-medium"
+            android:text="万家乐热水器"
+            android:textSize="@dimen/sp_12" />
+
+        <Button
+            android:id="@+id/moreOperateButton"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_25"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_common_selector"
+            android:paddingHorizontal="@dimen/dp_7"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="更多操作"
+            android:textColor="@color/mainTextColor"
+            android:textSize="@dimen/sp_10" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_15">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="@dimen/dp_55"
+            android:layout_height="@dimen/dp_55"
+            android:src="@mipmap/ic_launcher_foreground" />
+
+        <LinearLayout
+            android:id="@+id/tempLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_10">
+
+            <TextView
+                android:id="@+id/deviceModelView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/mainTextColor"
+                android:textSize="@dimen/sp_12" />
+
+            <TextView
+                android:id="@+id/deviceUsedTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingVertical="@dimen/dp_3"
+                android:text="@string/app_name"
+                android:textColor="@color/subTextColor"
+                android:textSize="@dimen/sp_10" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_added_device_rv_l.xml b/app/src/main/res/layout/item_added_device_rv_l.xml
deleted file mode 100644
index 9132614..0000000
--- a/app/src/main/res/layout/item_added_device_rv_l.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="@dimen/dp_10">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_55"
-        android:layout_height="@dimen/dp_55"
-        android:src="@mipmap/ic_launcher" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingHorizontal="@dimen/dp_10">
-
-        <TextView
-            android:id="@+id/deviceNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/mainTextColor"
-            android:textSize="@dimen/sp_14" />
-
-        <TextView
-            android:id="@+id/deviceUsedTimeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/subTextColor"
-            android:textSize="@dimen/sp_14" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..385acb3
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e148105
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f71883
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03be9a5
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..72906db
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..849a57d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..72ba334
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..c196ced
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..53f1380
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a695..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/common_bkg.png b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
new file mode 100644
index 0000000..80696cd
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/common_bkg.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..8f0913c
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 28d4b77..0000000
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..d27aa3b
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..35ac7a1
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9287f50..0000000
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/login_bkg.png b/app/src/main/res/mipmap-xxhdpi/login_bkg.png
new file mode 100644
index 0000000..3f8d14a
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/login_bkg.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..e5375b3
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
deleted file mode 100644
index aa7d642..0000000
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..68aa224
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..1b8e3d7
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9126ae3..0000000
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index cd65ba6..19d2185 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="mainThemeColor">#1D55C6</color>
-    <color name="mainTextColor">#232323</color>
+    <color name="mainThemeColor">#2483B3</color>
+    <color name="subMainThemeColor">#662483B3</color>
+    <color name="mainTextColor">#333333</color>
     <color name="subTextColor">#626262</color>
     <color name="mainBackColor">#F7F7FA</color>
     <color name="hintTextColor">#CCCCCC</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 8295970..1006c76 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,5 +1,6 @@
 <resources>
     <!--字体大小-->
+    <dimen name="sp_10">10sp</dimen>
     <dimen name="sp_12">12sp</dimen>
     <dimen name="sp_14">14sp</dimen>
     <dimen name="sp_16">16sp</dimen>
@@ -20,8 +21,10 @@
     <dimen name="dp_40">40dp</dimen>
     <dimen name="dp_50">50dp</dimen>
     <dimen name="dp_55">55dp</dimen>
+    <dimen name="dp_60">60dp</dimen>
     <dimen name="dp_80">80dp</dimen>
     <dimen name="dp_100">100dp</dimen>
+    <dimen name="dp_115">115dp</dimen>
     <dimen name="dp_200">200dp</dimen>
     <dimen name="dp_300">300dp</dimen>
 
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 0000000..c5d5899
--- /dev/null
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>
\ No newline at end of file