diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index db94db8..0bf09e0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,6 +46,9 @@
         <activity android:name=".view.SettingsActivity" />
         <activity android:name=".view.AllDeviceActivity" />
         <activity android:name=".view.AddDeviceActivity" />
+        <activity android:name=".view.AddIoTDeviceActivity" />
+        <activity android:name=".view.SelectWifiActivity" />
+        <activity android:name=".view.SelectBluetoothActivity" />
         <activity android:name=".view.AddDeviceTabActivity" />
         <activity android:name=".view.device.WaterHeaterActivity" />
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index db94db8..0bf09e0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,6 +46,9 @@
         <activity android:name=".view.SettingsActivity" />
         <activity android:name=".view.AllDeviceActivity" />
         <activity android:name=".view.AddDeviceActivity" />
+        <activity android:name=".view.AddIoTDeviceActivity" />
+        <activity android:name=".view.SelectWifiActivity" />
+        <activity android:name=".view.SelectBluetoothActivity" />
         <activity android:name=".view.AddDeviceTabActivity" />
         <activity android:name=".view.device.WaterHeaterActivity" />
 
diff --git a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
index bb3262d..441f0bf 100644
--- a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
@@ -30,7 +30,7 @@
 
     override fun initEvent() {
         iotDevice.setOnClickListener {
-
+            navigatePageTo<AddIoTDeviceActivity>()
         }
 
         notIotDevice.setOnClickListener {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index db94db8..0bf09e0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,6 +46,9 @@
         <activity android:name=".view.SettingsActivity" />
         <activity android:name=".view.AllDeviceActivity" />
         <activity android:name=".view.AddDeviceActivity" />
+        <activity android:name=".view.AddIoTDeviceActivity" />
+        <activity android:name=".view.SelectWifiActivity" />
+        <activity android:name=".view.SelectBluetoothActivity" />
         <activity android:name=".view.AddDeviceTabActivity" />
         <activity android:name=".view.device.WaterHeaterActivity" />
 
diff --git a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
index bb3262d..441f0bf 100644
--- a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
@@ -30,7 +30,7 @@
 
     override fun initEvent() {
         iotDevice.setOnClickListener {
-
+            navigatePageTo<AddIoTDeviceActivity>()
         }
 
         notIotDevice.setOnClickListener {
diff --git a/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt b/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt
index eb552e4..2239c9d 100644
--- a/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt
@@ -14,6 +14,9 @@
 import kotlinx.android.synthetic.main.activity_add_device_tab.*
 import kotlinx.android.synthetic.main.include_left_back_title.*
 
+/**
+ * 添加非IoT设备
+ * */
 class AddDeviceTabActivity : KotlinBaseActivity() {
 
     private var menuItem: MenuItem? = null

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index db94db8..0bf09e0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,6 +46,9 @@
         <activity android:name=".view.SettingsActivity" />
         <activity android:name=".view.AllDeviceActivity" />
         <activity android:name=".view.AddDeviceActivity" />
+        <activity android:name=".view.AddIoTDeviceActivity" />
+        <activity android:name=".view.SelectWifiActivity" />
+        <activity android:name=".view.SelectBluetoothActivity" />
         <activity android:name=".view.AddDeviceTabActivity" />
         <activity android:name=".view.device.WaterHeaterActivity" />
 
diff --git a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
index bb3262d..441f0bf 100644
--- a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
@@ -30,7 +30,7 @@
 
     override fun initEvent() {
         iotDevice.setOnClickListener {
-
+            navigatePageTo<AddIoTDeviceActivity>()
         }
 
         notIotDevice.setOnClickListener {
diff --git a/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt b/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt
index eb552e4..2239c9d 100644
--- a/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt
@@ -14,6 +14,9 @@
 import kotlinx.android.synthetic.main.activity_add_device_tab.*
 import kotlinx.android.synthetic.main.include_left_back_title.*
 
+/**
+ * 添加非IoT设备
+ * */
 class AddDeviceTabActivity : KotlinBaseActivity() {
 
     private var menuItem: MenuItem? = null
diff --git a/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
new file mode 100644
index 0000000..38ec46a
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
@@ -0,0 +1,55 @@
+package com.casic.br.view
+
+import android.view.View
+import android.widget.AdapterView
+import com.casic.br.R
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.extensions.navigatePageTo
+import kotlinx.android.synthetic.main.activity_add_device_iot.*
+
+/**
+ * 添加IoT设备
+ * */
+class AddIoTDeviceActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_add_device_iot
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+        initLayoutImmersionBar(rootView)
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+        //默认选择WIFI快连
+        connectTypeSpinner.setSelection(0)
+    }
+
+    override fun initEvent() {
+        connectTypeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(
+                parent: AdapterView<*>?, view: View?, position: Int, id: Long
+            ) {
+
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+
+            }
+        }
+
+        nextStepButton.setOnClickListener {
+            if (connectTypeSpinner.selectedItemPosition == 0) {
+                navigatePageTo<SelectWifiActivity>()
+            } else {
+                navigatePageTo<SelectBluetoothActivity>()
+            }
+        }
+    }
+}
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index db94db8..0bf09e0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,6 +46,9 @@
         <activity android:name=".view.SettingsActivity" />
         <activity android:name=".view.AllDeviceActivity" />
         <activity android:name=".view.AddDeviceActivity" />
+        <activity android:name=".view.AddIoTDeviceActivity" />
+        <activity android:name=".view.SelectWifiActivity" />
+        <activity android:name=".view.SelectBluetoothActivity" />
         <activity android:name=".view.AddDeviceTabActivity" />
         <activity android:name=".view.device.WaterHeaterActivity" />
 
diff --git a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
index bb3262d..441f0bf 100644
--- a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
@@ -30,7 +30,7 @@
 
     override fun initEvent() {
         iotDevice.setOnClickListener {
-
+            navigatePageTo<AddIoTDeviceActivity>()
         }
 
         notIotDevice.setOnClickListener {
diff --git a/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt b/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt
index eb552e4..2239c9d 100644
--- a/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt
@@ -14,6 +14,9 @@
 import kotlinx.android.synthetic.main.activity_add_device_tab.*
 import kotlinx.android.synthetic.main.include_left_back_title.*
 
+/**
+ * 添加非IoT设备
+ * */
 class AddDeviceTabActivity : KotlinBaseActivity() {
 
     private var menuItem: MenuItem? = null
diff --git a/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
new file mode 100644
index 0000000..38ec46a
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
@@ -0,0 +1,55 @@
+package com.casic.br.view
+
+import android.view.View
+import android.widget.AdapterView
+import com.casic.br.R
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.extensions.navigatePageTo
+import kotlinx.android.synthetic.main.activity_add_device_iot.*
+
+/**
+ * 添加IoT设备
+ * */
+class AddIoTDeviceActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_add_device_iot
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+        initLayoutImmersionBar(rootView)
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+        //默认选择WIFI快连
+        connectTypeSpinner.setSelection(0)
+    }
+
+    override fun initEvent() {
+        connectTypeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(
+                parent: AdapterView<*>?, view: View?, position: Int, id: Long
+            ) {
+
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+
+            }
+        }
+
+        nextStepButton.setOnClickListener {
+            if (connectTypeSpinner.selectedItemPosition == 0) {
+                navigatePageTo<SelectWifiActivity>()
+            } else {
+                navigatePageTo<SelectBluetoothActivity>()
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/SelectBluetoothActivity.kt b/app/src/main/java/com/casic/br/view/SelectBluetoothActivity.kt
new file mode 100644
index 0000000..4375725
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/SelectBluetoothActivity.kt
@@ -0,0 +1,25 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class SelectBluetoothActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_select_wifi
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index db94db8..0bf09e0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,6 +46,9 @@
         <activity android:name=".view.SettingsActivity" />
         <activity android:name=".view.AllDeviceActivity" />
         <activity android:name=".view.AddDeviceActivity" />
+        <activity android:name=".view.AddIoTDeviceActivity" />
+        <activity android:name=".view.SelectWifiActivity" />
+        <activity android:name=".view.SelectBluetoothActivity" />
         <activity android:name=".view.AddDeviceTabActivity" />
         <activity android:name=".view.device.WaterHeaterActivity" />
 
diff --git a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
index bb3262d..441f0bf 100644
--- a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
@@ -30,7 +30,7 @@
 
     override fun initEvent() {
         iotDevice.setOnClickListener {
-
+            navigatePageTo<AddIoTDeviceActivity>()
         }
 
         notIotDevice.setOnClickListener {
diff --git a/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt b/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt
index eb552e4..2239c9d 100644
--- a/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt
@@ -14,6 +14,9 @@
 import kotlinx.android.synthetic.main.activity_add_device_tab.*
 import kotlinx.android.synthetic.main.include_left_back_title.*
 
+/**
+ * 添加非IoT设备
+ * */
 class AddDeviceTabActivity : KotlinBaseActivity() {
 
     private var menuItem: MenuItem? = null
diff --git a/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
new file mode 100644
index 0000000..38ec46a
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
@@ -0,0 +1,55 @@
+package com.casic.br.view
+
+import android.view.View
+import android.widget.AdapterView
+import com.casic.br.R
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.extensions.navigatePageTo
+import kotlinx.android.synthetic.main.activity_add_device_iot.*
+
+/**
+ * 添加IoT设备
+ * */
+class AddIoTDeviceActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_add_device_iot
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+        initLayoutImmersionBar(rootView)
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+        //默认选择WIFI快连
+        connectTypeSpinner.setSelection(0)
+    }
+
+    override fun initEvent() {
+        connectTypeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(
+                parent: AdapterView<*>?, view: View?, position: Int, id: Long
+            ) {
+
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+
+            }
+        }
+
+        nextStepButton.setOnClickListener {
+            if (connectTypeSpinner.selectedItemPosition == 0) {
+                navigatePageTo<SelectWifiActivity>()
+            } else {
+                navigatePageTo<SelectBluetoothActivity>()
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/SelectBluetoothActivity.kt b/app/src/main/java/com/casic/br/view/SelectBluetoothActivity.kt
new file mode 100644
index 0000000..4375725
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/SelectBluetoothActivity.kt
@@ -0,0 +1,25 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class SelectBluetoothActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_select_wifi
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/SelectWifiActivity.kt b/app/src/main/java/com/casic/br/view/SelectWifiActivity.kt
new file mode 100644
index 0000000..f351394
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/SelectWifiActivity.kt
@@ -0,0 +1,34 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.extensions.show
+import kotlinx.android.synthetic.main.activity_select_wifi.*
+import kotlinx.android.synthetic.main.include_base_title.*
+
+class SelectWifiActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_select_wifi
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+        initLayoutImmersionBar(rootView)
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+        nextStepButton.setOnClickListener {
+            "添加设备Loading".show(this)
+        }
+    }
+}
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index db94db8..0bf09e0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,6 +46,9 @@
         <activity android:name=".view.SettingsActivity" />
         <activity android:name=".view.AllDeviceActivity" />
         <activity android:name=".view.AddDeviceActivity" />
+        <activity android:name=".view.AddIoTDeviceActivity" />
+        <activity android:name=".view.SelectWifiActivity" />
+        <activity android:name=".view.SelectBluetoothActivity" />
         <activity android:name=".view.AddDeviceTabActivity" />
         <activity android:name=".view.device.WaterHeaterActivity" />
 
diff --git a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
index bb3262d..441f0bf 100644
--- a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
@@ -30,7 +30,7 @@
 
     override fun initEvent() {
         iotDevice.setOnClickListener {
-
+            navigatePageTo<AddIoTDeviceActivity>()
         }
 
         notIotDevice.setOnClickListener {
diff --git a/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt b/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt
index eb552e4..2239c9d 100644
--- a/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt
@@ -14,6 +14,9 @@
 import kotlinx.android.synthetic.main.activity_add_device_tab.*
 import kotlinx.android.synthetic.main.include_left_back_title.*
 
+/**
+ * 添加非IoT设备
+ * */
 class AddDeviceTabActivity : KotlinBaseActivity() {
 
     private var menuItem: MenuItem? = null
diff --git a/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
new file mode 100644
index 0000000..38ec46a
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
@@ -0,0 +1,55 @@
+package com.casic.br.view
+
+import android.view.View
+import android.widget.AdapterView
+import com.casic.br.R
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.extensions.navigatePageTo
+import kotlinx.android.synthetic.main.activity_add_device_iot.*
+
+/**
+ * 添加IoT设备
+ * */
+class AddIoTDeviceActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_add_device_iot
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+        initLayoutImmersionBar(rootView)
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+        //默认选择WIFI快连
+        connectTypeSpinner.setSelection(0)
+    }
+
+    override fun initEvent() {
+        connectTypeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(
+                parent: AdapterView<*>?, view: View?, position: Int, id: Long
+            ) {
+
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+
+            }
+        }
+
+        nextStepButton.setOnClickListener {
+            if (connectTypeSpinner.selectedItemPosition == 0) {
+                navigatePageTo<SelectWifiActivity>()
+            } else {
+                navigatePageTo<SelectBluetoothActivity>()
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/SelectBluetoothActivity.kt b/app/src/main/java/com/casic/br/view/SelectBluetoothActivity.kt
new file mode 100644
index 0000000..4375725
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/SelectBluetoothActivity.kt
@@ -0,0 +1,25 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class SelectBluetoothActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_select_wifi
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/SelectWifiActivity.kt b/app/src/main/java/com/casic/br/view/SelectWifiActivity.kt
new file mode 100644
index 0000000..f351394
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/SelectWifiActivity.kt
@@ -0,0 +1,34 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.extensions.show
+import kotlinx.android.synthetic.main.activity_select_wifi.*
+import kotlinx.android.synthetic.main.include_base_title.*
+
+class SelectWifiActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_select_wifi
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+        initLayoutImmersionBar(rootView)
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+        nextStepButton.setOnClickListener {
+            "添加设备Loading".show(this)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_add_device_iot.xml b/app/src/main/res/layout/activity_add_device_iot.xml
new file mode 100644
index 0000000..a8c71ea
--- /dev/null
+++ b/app/src/main/res/layout/activity_add_device_iot.xml
@@ -0,0 +1,64 @@
+<?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="match_parent"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight">
+
+        <ImageView
+            android:id="@+id/leftBackView"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:src="@drawable/ic_left_black" />
+
+        <com.pengxh.kt.lite.widget.EasyAppCompatSpinner
+            android:id="@+id/connectTypeSpinner"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentEnd="true"
+            android:dropDownVerticalOffset="@dimen/titleViewHeight"
+            android:entries="@array/connectTypeArray"
+            android:spinnerMode="dropdown" />
+    </RelativeLayout>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/dp_10"
+        android:text="重置设备"
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_18" />
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_200"
+        android:layout_marginHorizontal="@dimen/dp_30"
+        android:layout_marginVertical="@dimen/dp_15"
+        android:background="@color/mainThemeColor" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/dp_20"
+        android:padding="@dimen/dp_10"
+        android:text="长按复位键5秒左右，至配网指示灯闪烁（以说明书为准）"
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_18" />
+
+    <CheckBox
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="确认指示灯快闪" />
+
+    <Button
+        android:id="@+id/nextStepButton"
+        style="@style/MainButtonStyle"
+        android:layout_margin="@dimen/dp_100"
+        android:text="下一步" />
+</LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index db94db8..0bf09e0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,6 +46,9 @@
         <activity android:name=".view.SettingsActivity" />
         <activity android:name=".view.AllDeviceActivity" />
         <activity android:name=".view.AddDeviceActivity" />
+        <activity android:name=".view.AddIoTDeviceActivity" />
+        <activity android:name=".view.SelectWifiActivity" />
+        <activity android:name=".view.SelectBluetoothActivity" />
         <activity android:name=".view.AddDeviceTabActivity" />
         <activity android:name=".view.device.WaterHeaterActivity" />
 
diff --git a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
index bb3262d..441f0bf 100644
--- a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
@@ -30,7 +30,7 @@
 
     override fun initEvent() {
         iotDevice.setOnClickListener {
-
+            navigatePageTo<AddIoTDeviceActivity>()
         }
 
         notIotDevice.setOnClickListener {
diff --git a/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt b/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt
index eb552e4..2239c9d 100644
--- a/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt
@@ -14,6 +14,9 @@
 import kotlinx.android.synthetic.main.activity_add_device_tab.*
 import kotlinx.android.synthetic.main.include_left_back_title.*
 
+/**
+ * 添加非IoT设备
+ * */
 class AddDeviceTabActivity : KotlinBaseActivity() {
 
     private var menuItem: MenuItem? = null
diff --git a/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
new file mode 100644
index 0000000..38ec46a
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
@@ -0,0 +1,55 @@
+package com.casic.br.view
+
+import android.view.View
+import android.widget.AdapterView
+import com.casic.br.R
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.extensions.navigatePageTo
+import kotlinx.android.synthetic.main.activity_add_device_iot.*
+
+/**
+ * 添加IoT设备
+ * */
+class AddIoTDeviceActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_add_device_iot
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+        initLayoutImmersionBar(rootView)
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+        //默认选择WIFI快连
+        connectTypeSpinner.setSelection(0)
+    }
+
+    override fun initEvent() {
+        connectTypeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(
+                parent: AdapterView<*>?, view: View?, position: Int, id: Long
+            ) {
+
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+
+            }
+        }
+
+        nextStepButton.setOnClickListener {
+            if (connectTypeSpinner.selectedItemPosition == 0) {
+                navigatePageTo<SelectWifiActivity>()
+            } else {
+                navigatePageTo<SelectBluetoothActivity>()
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/SelectBluetoothActivity.kt b/app/src/main/java/com/casic/br/view/SelectBluetoothActivity.kt
new file mode 100644
index 0000000..4375725
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/SelectBluetoothActivity.kt
@@ -0,0 +1,25 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class SelectBluetoothActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_select_wifi
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/SelectWifiActivity.kt b/app/src/main/java/com/casic/br/view/SelectWifiActivity.kt
new file mode 100644
index 0000000..f351394
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/SelectWifiActivity.kt
@@ -0,0 +1,34 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.extensions.show
+import kotlinx.android.synthetic.main.activity_select_wifi.*
+import kotlinx.android.synthetic.main.include_base_title.*
+
+class SelectWifiActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_select_wifi
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+        initLayoutImmersionBar(rootView)
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+        nextStepButton.setOnClickListener {
+            "添加设备Loading".show(this)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_add_device_iot.xml b/app/src/main/res/layout/activity_add_device_iot.xml
new file mode 100644
index 0000000..a8c71ea
--- /dev/null
+++ b/app/src/main/res/layout/activity_add_device_iot.xml
@@ -0,0 +1,64 @@
+<?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="match_parent"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight">
+
+        <ImageView
+            android:id="@+id/leftBackView"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:src="@drawable/ic_left_black" />
+
+        <com.pengxh.kt.lite.widget.EasyAppCompatSpinner
+            android:id="@+id/connectTypeSpinner"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentEnd="true"
+            android:dropDownVerticalOffset="@dimen/titleViewHeight"
+            android:entries="@array/connectTypeArray"
+            android:spinnerMode="dropdown" />
+    </RelativeLayout>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/dp_10"
+        android:text="重置设备"
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_18" />
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_200"
+        android:layout_marginHorizontal="@dimen/dp_30"
+        android:layout_marginVertical="@dimen/dp_15"
+        android:background="@color/mainThemeColor" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/dp_20"
+        android:padding="@dimen/dp_10"
+        android:text="长按复位键5秒左右，至配网指示灯闪烁（以说明书为准）"
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_18" />
+
+    <CheckBox
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="确认指示灯快闪" />
+
+    <Button
+        android:id="@+id/nextStepButton"
+        style="@style/MainButtonStyle"
+        android:layout_margin="@dimen/dp_100"
+        android:text="下一步" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_select_wifi.xml b/app/src/main/res/layout/activity_select_wifi.xml
new file mode 100644
index 0000000..5d8aba5
--- /dev/null
+++ b/app/src/main/res/layout/activity_select_wifi.xml
@@ -0,0 +1,71 @@
+<?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="match_parent"
+    android:orientation="vertical">
+
+    <include layout="@layout/include_left_back_title" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/dp_10"
+        android:text="选择2.4GHz Wi-Fi网络并输入密码"
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_18" />
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_200"
+        android:layout_marginHorizontal="@dimen/dp_30"
+        android:layout_marginVertical="@dimen/dp_15"
+        android:background="@color/mainThemeColor" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/itemLayoutHeight"
+        android:layout_marginTop="@dimen/dp_50"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingHorizontal="@dimen/dp_50">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Wi-Fi名称：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:layout_width="0dp"
+            android:layout_height="@dimen/dp_40"
+            android:layout_weight="2"
+            android:background="@null" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/itemLayoutHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingHorizontal="@dimen/dp_50">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="密码：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:layout_width="0dp"
+            android:layout_height="@dimen/dp_40"
+            android:layout_weight="2"
+            android:background="@null"  />
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/nextStepButton"
+        style="@style/MainButtonStyle"
+        android:layout_margin="@dimen/dp_100"
+        android:text="下一步" />
+</LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index db94db8..0bf09e0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,6 +46,9 @@
         <activity android:name=".view.SettingsActivity" />
         <activity android:name=".view.AllDeviceActivity" />
         <activity android:name=".view.AddDeviceActivity" />
+        <activity android:name=".view.AddIoTDeviceActivity" />
+        <activity android:name=".view.SelectWifiActivity" />
+        <activity android:name=".view.SelectBluetoothActivity" />
         <activity android:name=".view.AddDeviceTabActivity" />
         <activity android:name=".view.device.WaterHeaterActivity" />
 
diff --git a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
index bb3262d..441f0bf 100644
--- a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
@@ -30,7 +30,7 @@
 
     override fun initEvent() {
         iotDevice.setOnClickListener {
-
+            navigatePageTo<AddIoTDeviceActivity>()
         }
 
         notIotDevice.setOnClickListener {
diff --git a/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt b/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt
index eb552e4..2239c9d 100644
--- a/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt
@@ -14,6 +14,9 @@
 import kotlinx.android.synthetic.main.activity_add_device_tab.*
 import kotlinx.android.synthetic.main.include_left_back_title.*
 
+/**
+ * 添加非IoT设备
+ * */
 class AddDeviceTabActivity : KotlinBaseActivity() {
 
     private var menuItem: MenuItem? = null
diff --git a/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
new file mode 100644
index 0000000..38ec46a
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
@@ -0,0 +1,55 @@
+package com.casic.br.view
+
+import android.view.View
+import android.widget.AdapterView
+import com.casic.br.R
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.extensions.navigatePageTo
+import kotlinx.android.synthetic.main.activity_add_device_iot.*
+
+/**
+ * 添加IoT设备
+ * */
+class AddIoTDeviceActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_add_device_iot
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+        initLayoutImmersionBar(rootView)
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+        //默认选择WIFI快连
+        connectTypeSpinner.setSelection(0)
+    }
+
+    override fun initEvent() {
+        connectTypeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(
+                parent: AdapterView<*>?, view: View?, position: Int, id: Long
+            ) {
+
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+
+            }
+        }
+
+        nextStepButton.setOnClickListener {
+            if (connectTypeSpinner.selectedItemPosition == 0) {
+                navigatePageTo<SelectWifiActivity>()
+            } else {
+                navigatePageTo<SelectBluetoothActivity>()
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/SelectBluetoothActivity.kt b/app/src/main/java/com/casic/br/view/SelectBluetoothActivity.kt
new file mode 100644
index 0000000..4375725
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/SelectBluetoothActivity.kt
@@ -0,0 +1,25 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class SelectBluetoothActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_select_wifi
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/SelectWifiActivity.kt b/app/src/main/java/com/casic/br/view/SelectWifiActivity.kt
new file mode 100644
index 0000000..f351394
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/SelectWifiActivity.kt
@@ -0,0 +1,34 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.extensions.show
+import kotlinx.android.synthetic.main.activity_select_wifi.*
+import kotlinx.android.synthetic.main.include_base_title.*
+
+class SelectWifiActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_select_wifi
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+        initLayoutImmersionBar(rootView)
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+        nextStepButton.setOnClickListener {
+            "添加设备Loading".show(this)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_add_device_iot.xml b/app/src/main/res/layout/activity_add_device_iot.xml
new file mode 100644
index 0000000..a8c71ea
--- /dev/null
+++ b/app/src/main/res/layout/activity_add_device_iot.xml
@@ -0,0 +1,64 @@
+<?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="match_parent"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight">
+
+        <ImageView
+            android:id="@+id/leftBackView"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:src="@drawable/ic_left_black" />
+
+        <com.pengxh.kt.lite.widget.EasyAppCompatSpinner
+            android:id="@+id/connectTypeSpinner"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentEnd="true"
+            android:dropDownVerticalOffset="@dimen/titleViewHeight"
+            android:entries="@array/connectTypeArray"
+            android:spinnerMode="dropdown" />
+    </RelativeLayout>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/dp_10"
+        android:text="重置设备"
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_18" />
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_200"
+        android:layout_marginHorizontal="@dimen/dp_30"
+        android:layout_marginVertical="@dimen/dp_15"
+        android:background="@color/mainThemeColor" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/dp_20"
+        android:padding="@dimen/dp_10"
+        android:text="长按复位键5秒左右，至配网指示灯闪烁（以说明书为准）"
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_18" />
+
+    <CheckBox
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="确认指示灯快闪" />
+
+    <Button
+        android:id="@+id/nextStepButton"
+        style="@style/MainButtonStyle"
+        android:layout_margin="@dimen/dp_100"
+        android:text="下一步" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_select_wifi.xml b/app/src/main/res/layout/activity_select_wifi.xml
new file mode 100644
index 0000000..5d8aba5
--- /dev/null
+++ b/app/src/main/res/layout/activity_select_wifi.xml
@@ -0,0 +1,71 @@
+<?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="match_parent"
+    android:orientation="vertical">
+
+    <include layout="@layout/include_left_back_title" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/dp_10"
+        android:text="选择2.4GHz Wi-Fi网络并输入密码"
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_18" />
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_200"
+        android:layout_marginHorizontal="@dimen/dp_30"
+        android:layout_marginVertical="@dimen/dp_15"
+        android:background="@color/mainThemeColor" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/itemLayoutHeight"
+        android:layout_marginTop="@dimen/dp_50"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingHorizontal="@dimen/dp_50">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Wi-Fi名称：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:layout_width="0dp"
+            android:layout_height="@dimen/dp_40"
+            android:layout_weight="2"
+            android:background="@null" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/itemLayoutHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingHorizontal="@dimen/dp_50">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="密码：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:layout_width="0dp"
+            android:layout_height="@dimen/dp_40"
+            android:layout_weight="2"
+            android:background="@null"  />
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/nextStepButton"
+        style="@style/MainButtonStyle"
+        android:layout_margin="@dimen/dp_100"
+        android:text="下一步" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
new file mode 100644
index 0000000..b620052
--- /dev/null
+++ b/app/src/main/res/values/array.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="connectTypeArray">
+        <item>WIFI快连</item>
+        <item>蓝牙配网</item>
+    </string-array>
+</resources>
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index db94db8..0bf09e0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,6 +46,9 @@
         <activity android:name=".view.SettingsActivity" />
         <activity android:name=".view.AllDeviceActivity" />
         <activity android:name=".view.AddDeviceActivity" />
+        <activity android:name=".view.AddIoTDeviceActivity" />
+        <activity android:name=".view.SelectWifiActivity" />
+        <activity android:name=".view.SelectBluetoothActivity" />
         <activity android:name=".view.AddDeviceTabActivity" />
         <activity android:name=".view.device.WaterHeaterActivity" />
 
diff --git a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
index bb3262d..441f0bf 100644
--- a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
@@ -30,7 +30,7 @@
 
     override fun initEvent() {
         iotDevice.setOnClickListener {
-
+            navigatePageTo<AddIoTDeviceActivity>()
         }
 
         notIotDevice.setOnClickListener {
diff --git a/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt b/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt
index eb552e4..2239c9d 100644
--- a/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddDeviceTabActivity.kt
@@ -14,6 +14,9 @@
 import kotlinx.android.synthetic.main.activity_add_device_tab.*
 import kotlinx.android.synthetic.main.include_left_back_title.*
 
+/**
+ * 添加非IoT设备
+ * */
 class AddDeviceTabActivity : KotlinBaseActivity() {
 
     private var menuItem: MenuItem? = null
diff --git a/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
new file mode 100644
index 0000000..38ec46a
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
@@ -0,0 +1,55 @@
+package com.casic.br.view
+
+import android.view.View
+import android.widget.AdapterView
+import com.casic.br.R
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.extensions.navigatePageTo
+import kotlinx.android.synthetic.main.activity_add_device_iot.*
+
+/**
+ * 添加IoT设备
+ * */
+class AddIoTDeviceActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_add_device_iot
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+        initLayoutImmersionBar(rootView)
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+        //默认选择WIFI快连
+        connectTypeSpinner.setSelection(0)
+    }
+
+    override fun initEvent() {
+        connectTypeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(
+                parent: AdapterView<*>?, view: View?, position: Int, id: Long
+            ) {
+
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+
+            }
+        }
+
+        nextStepButton.setOnClickListener {
+            if (connectTypeSpinner.selectedItemPosition == 0) {
+                navigatePageTo<SelectWifiActivity>()
+            } else {
+                navigatePageTo<SelectBluetoothActivity>()
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/SelectBluetoothActivity.kt b/app/src/main/java/com/casic/br/view/SelectBluetoothActivity.kt
new file mode 100644
index 0000000..4375725
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/SelectBluetoothActivity.kt
@@ -0,0 +1,25 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+
+class SelectBluetoothActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_select_wifi
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/SelectWifiActivity.kt b/app/src/main/java/com/casic/br/view/SelectWifiActivity.kt
new file mode 100644
index 0000000..f351394
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/SelectWifiActivity.kt
@@ -0,0 +1,34 @@
+package com.casic.br.view
+
+import com.casic.br.R
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.extensions.show
+import kotlinx.android.synthetic.main.activity_select_wifi.*
+import kotlinx.android.synthetic.main.include_base_title.*
+
+class SelectWifiActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_select_wifi
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+        initLayoutImmersionBar(rootView)
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+        nextStepButton.setOnClickListener {
+            "添加设备Loading".show(this)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_add_device_iot.xml b/app/src/main/res/layout/activity_add_device_iot.xml
new file mode 100644
index 0000000..a8c71ea
--- /dev/null
+++ b/app/src/main/res/layout/activity_add_device_iot.xml
@@ -0,0 +1,64 @@
+<?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="match_parent"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight">
+
+        <ImageView
+            android:id="@+id/leftBackView"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:src="@drawable/ic_left_black" />
+
+        <com.pengxh.kt.lite.widget.EasyAppCompatSpinner
+            android:id="@+id/connectTypeSpinner"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentEnd="true"
+            android:dropDownVerticalOffset="@dimen/titleViewHeight"
+            android:entries="@array/connectTypeArray"
+            android:spinnerMode="dropdown" />
+    </RelativeLayout>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/dp_10"
+        android:text="重置设备"
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_18" />
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_200"
+        android:layout_marginHorizontal="@dimen/dp_30"
+        android:layout_marginVertical="@dimen/dp_15"
+        android:background="@color/mainThemeColor" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/dp_20"
+        android:padding="@dimen/dp_10"
+        android:text="长按复位键5秒左右，至配网指示灯闪烁（以说明书为准）"
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_18" />
+
+    <CheckBox
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="确认指示灯快闪" />
+
+    <Button
+        android:id="@+id/nextStepButton"
+        style="@style/MainButtonStyle"
+        android:layout_margin="@dimen/dp_100"
+        android:text="下一步" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_select_wifi.xml b/app/src/main/res/layout/activity_select_wifi.xml
new file mode 100644
index 0000000..5d8aba5
--- /dev/null
+++ b/app/src/main/res/layout/activity_select_wifi.xml
@@ -0,0 +1,71 @@
+<?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="match_parent"
+    android:orientation="vertical">
+
+    <include layout="@layout/include_left_back_title" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/dp_10"
+        android:text="选择2.4GHz Wi-Fi网络并输入密码"
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_18" />
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_200"
+        android:layout_marginHorizontal="@dimen/dp_30"
+        android:layout_marginVertical="@dimen/dp_15"
+        android:background="@color/mainThemeColor" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/itemLayoutHeight"
+        android:layout_marginTop="@dimen/dp_50"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingHorizontal="@dimen/dp_50">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Wi-Fi名称：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:layout_width="0dp"
+            android:layout_height="@dimen/dp_40"
+            android:layout_weight="2"
+            android:background="@null" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/itemLayoutHeight"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingHorizontal="@dimen/dp_50">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="密码：" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
+            android:layout_width="0dp"
+            android:layout_height="@dimen/dp_40"
+            android:layout_weight="2"
+            android:background="@null"  />
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/nextStepButton"
+        style="@style/MainButtonStyle"
+        android:layout_margin="@dimen/dp_100"
+        android:text="下一步" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
new file mode 100644
index 0000000..b620052
--- /dev/null
+++ b/app/src/main/res/values/array.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="connectTypeArray">
+        <item>WIFI快连</item>
+        <item>蓝牙配网</item>
+    </string-array>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 633ea99..7e98c5a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -3,6 +3,7 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="QMUI.Compat.NoActionBar">
         <!-- Customize your theme here. -->
+        <item name="colorAccent">@color/mainThemeColor</item>
     </style>
 
     <!--按钮样式-->