diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0bf09e0..3ea0e96 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -49,6 +49,8 @@
         <activity android:name=".view.AddIoTDeviceActivity" />
         <activity android:name=".view.SelectWifiActivity" />
         <activity android:name=".view.SelectBluetoothActivity" />
+        <activity android:name=".view.SearchDeviceResult" />
+        <activity android:name=".view.AddDeviceResultActivity" />
         <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 0bf09e0..3ea0e96 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -49,6 +49,8 @@
         <activity android:name=".view.AddIoTDeviceActivity" />
         <activity android:name=".view.SelectWifiActivity" />
         <activity android:name=".view.SelectBluetoothActivity" />
+        <activity android:name=".view.SearchDeviceResult" />
+        <activity android:name=".view.AddDeviceResultActivity" />
         <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 441f0bf..ce8f99e 100644
--- a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
@@ -31,10 +31,12 @@
     override fun initEvent() {
         iotDevice.setOnClickListener {
             navigatePageTo<AddIoTDeviceActivity>()
+            finish()
         }
 
         notIotDevice.setOnClickListener {
             navigatePageTo<AddDeviceTabActivity>()
+            finish()
         }
     }
 }
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0bf09e0..3ea0e96 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -49,6 +49,8 @@
         <activity android:name=".view.AddIoTDeviceActivity" />
         <activity android:name=".view.SelectWifiActivity" />
         <activity android:name=".view.SelectBluetoothActivity" />
+        <activity android:name=".view.SearchDeviceResult" />
+        <activity android:name=".view.AddDeviceResultActivity" />
         <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 441f0bf..ce8f99e 100644
--- a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
@@ -31,10 +31,12 @@
     override fun initEvent() {
         iotDevice.setOnClickListener {
             navigatePageTo<AddIoTDeviceActivity>()
+            finish()
         }
 
         notIotDevice.setOnClickListener {
             navigatePageTo<AddDeviceTabActivity>()
+            finish()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/AddDeviceResultActivity.kt b/app/src/main/java/com/casic/br/view/AddDeviceResultActivity.kt
new file mode 100644
index 0000000..d58aebd
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/AddDeviceResultActivity.kt
@@ -0,0 +1,32 @@
+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 kotlinx.android.synthetic.main.activity_add_device_result.*
+
+class AddDeviceResultActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_add_device_result
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+        initLayoutImmersionBar(rootView)
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+        completeButton.setOnClickListener {
+            finish()
+        }
+    }
+}
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0bf09e0..3ea0e96 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -49,6 +49,8 @@
         <activity android:name=".view.AddIoTDeviceActivity" />
         <activity android:name=".view.SelectWifiActivity" />
         <activity android:name=".view.SelectBluetoothActivity" />
+        <activity android:name=".view.SearchDeviceResult" />
+        <activity android:name=".view.AddDeviceResultActivity" />
         <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 441f0bf..ce8f99e 100644
--- a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
@@ -31,10 +31,12 @@
     override fun initEvent() {
         iotDevice.setOnClickListener {
             navigatePageTo<AddIoTDeviceActivity>()
+            finish()
         }
 
         notIotDevice.setOnClickListener {
             navigatePageTo<AddDeviceTabActivity>()
+            finish()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/AddDeviceResultActivity.kt b/app/src/main/java/com/casic/br/view/AddDeviceResultActivity.kt
new file mode 100644
index 0000000..d58aebd
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/AddDeviceResultActivity.kt
@@ -0,0 +1,32 @@
+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 kotlinx.android.synthetic.main.activity_add_device_result.*
+
+class AddDeviceResultActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_add_device_result
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+        initLayoutImmersionBar(rootView)
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+        completeButton.setOnClickListener {
+            finish()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
index 38ec46a..25ce475 100644
--- a/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
@@ -50,6 +50,7 @@
             } else {
                 navigatePageTo<SelectBluetoothActivity>()
             }
+            finish()
         }
     }
 }
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0bf09e0..3ea0e96 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -49,6 +49,8 @@
         <activity android:name=".view.AddIoTDeviceActivity" />
         <activity android:name=".view.SelectWifiActivity" />
         <activity android:name=".view.SelectBluetoothActivity" />
+        <activity android:name=".view.SearchDeviceResult" />
+        <activity android:name=".view.AddDeviceResultActivity" />
         <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 441f0bf..ce8f99e 100644
--- a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
@@ -31,10 +31,12 @@
     override fun initEvent() {
         iotDevice.setOnClickListener {
             navigatePageTo<AddIoTDeviceActivity>()
+            finish()
         }
 
         notIotDevice.setOnClickListener {
             navigatePageTo<AddDeviceTabActivity>()
+            finish()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/AddDeviceResultActivity.kt b/app/src/main/java/com/casic/br/view/AddDeviceResultActivity.kt
new file mode 100644
index 0000000..d58aebd
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/AddDeviceResultActivity.kt
@@ -0,0 +1,32 @@
+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 kotlinx.android.synthetic.main.activity_add_device_result.*
+
+class AddDeviceResultActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_add_device_result
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+        initLayoutImmersionBar(rootView)
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+        completeButton.setOnClickListener {
+            finish()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
index 38ec46a..25ce475 100644
--- a/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
@@ -50,6 +50,7 @@
             } else {
                 navigatePageTo<SelectBluetoothActivity>()
             }
+            finish()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/SearchDeviceResult.kt b/app/src/main/java/com/casic/br/view/SearchDeviceResult.kt
new file mode 100644
index 0000000..ed466ae
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/SearchDeviceResult.kt
@@ -0,0 +1,40 @@
+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.navigatePageTo
+import kotlinx.android.synthetic.main.activity_search_device_result.*
+import kotlinx.android.synthetic.main.include_left_back_title.*
+
+class SearchDeviceResult : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_search_device_result
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+        initLayoutImmersionBar(rootView)
+        leftBackView.setOnClickListener { finish() }
+        titleView.text = "添加设备"
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+        confirmButton.setOnClickListener {
+            navigatePageTo<AddDeviceResultActivity>()
+            finish()
+        }
+
+        reSearchDeviceView.setOnClickListener {
+            navigatePageTo<AddIoTDeviceActivity>()
+        }
+    }
+}
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0bf09e0..3ea0e96 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -49,6 +49,8 @@
         <activity android:name=".view.AddIoTDeviceActivity" />
         <activity android:name=".view.SelectWifiActivity" />
         <activity android:name=".view.SelectBluetoothActivity" />
+        <activity android:name=".view.SearchDeviceResult" />
+        <activity android:name=".view.AddDeviceResultActivity" />
         <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 441f0bf..ce8f99e 100644
--- a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
@@ -31,10 +31,12 @@
     override fun initEvent() {
         iotDevice.setOnClickListener {
             navigatePageTo<AddIoTDeviceActivity>()
+            finish()
         }
 
         notIotDevice.setOnClickListener {
             navigatePageTo<AddDeviceTabActivity>()
+            finish()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/AddDeviceResultActivity.kt b/app/src/main/java/com/casic/br/view/AddDeviceResultActivity.kt
new file mode 100644
index 0000000..d58aebd
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/AddDeviceResultActivity.kt
@@ -0,0 +1,32 @@
+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 kotlinx.android.synthetic.main.activity_add_device_result.*
+
+class AddDeviceResultActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_add_device_result
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+        initLayoutImmersionBar(rootView)
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+        completeButton.setOnClickListener {
+            finish()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
index 38ec46a..25ce475 100644
--- a/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
@@ -50,6 +50,7 @@
             } else {
                 navigatePageTo<SelectBluetoothActivity>()
             }
+            finish()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/SearchDeviceResult.kt b/app/src/main/java/com/casic/br/view/SearchDeviceResult.kt
new file mode 100644
index 0000000..ed466ae
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/SearchDeviceResult.kt
@@ -0,0 +1,40 @@
+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.navigatePageTo
+import kotlinx.android.synthetic.main.activity_search_device_result.*
+import kotlinx.android.synthetic.main.include_left_back_title.*
+
+class SearchDeviceResult : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_search_device_result
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+        initLayoutImmersionBar(rootView)
+        leftBackView.setOnClickListener { finish() }
+        titleView.text = "添加设备"
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+        confirmButton.setOnClickListener {
+            navigatePageTo<AddDeviceResultActivity>()
+            finish()
+        }
+
+        reSearchDeviceView.setOnClickListener {
+            navigatePageTo<AddIoTDeviceActivity>()
+        }
+    }
+}
\ 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
index f351394..d53fc31 100644
--- a/app/src/main/java/com/casic/br/view/SelectWifiActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SelectWifiActivity.kt
@@ -4,7 +4,7 @@
 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 com.pengxh.kt.lite.extensions.navigatePageTo
 import kotlinx.android.synthetic.main.activity_select_wifi.*
 import kotlinx.android.synthetic.main.include_base_title.*
 
@@ -28,7 +28,8 @@
 
     override fun initEvent() {
         nextStepButton.setOnClickListener {
-            "添加设备Loading".show(this)
+            navigatePageTo<SearchDeviceResult>()
+            finish()
         }
     }
 }
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0bf09e0..3ea0e96 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -49,6 +49,8 @@
         <activity android:name=".view.AddIoTDeviceActivity" />
         <activity android:name=".view.SelectWifiActivity" />
         <activity android:name=".view.SelectBluetoothActivity" />
+        <activity android:name=".view.SearchDeviceResult" />
+        <activity android:name=".view.AddDeviceResultActivity" />
         <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 441f0bf..ce8f99e 100644
--- a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
@@ -31,10 +31,12 @@
     override fun initEvent() {
         iotDevice.setOnClickListener {
             navigatePageTo<AddIoTDeviceActivity>()
+            finish()
         }
 
         notIotDevice.setOnClickListener {
             navigatePageTo<AddDeviceTabActivity>()
+            finish()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/AddDeviceResultActivity.kt b/app/src/main/java/com/casic/br/view/AddDeviceResultActivity.kt
new file mode 100644
index 0000000..d58aebd
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/AddDeviceResultActivity.kt
@@ -0,0 +1,32 @@
+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 kotlinx.android.synthetic.main.activity_add_device_result.*
+
+class AddDeviceResultActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_add_device_result
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+        initLayoutImmersionBar(rootView)
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+        completeButton.setOnClickListener {
+            finish()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
index 38ec46a..25ce475 100644
--- a/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
@@ -50,6 +50,7 @@
             } else {
                 navigatePageTo<SelectBluetoothActivity>()
             }
+            finish()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/SearchDeviceResult.kt b/app/src/main/java/com/casic/br/view/SearchDeviceResult.kt
new file mode 100644
index 0000000..ed466ae
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/SearchDeviceResult.kt
@@ -0,0 +1,40 @@
+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.navigatePageTo
+import kotlinx.android.synthetic.main.activity_search_device_result.*
+import kotlinx.android.synthetic.main.include_left_back_title.*
+
+class SearchDeviceResult : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_search_device_result
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+        initLayoutImmersionBar(rootView)
+        leftBackView.setOnClickListener { finish() }
+        titleView.text = "添加设备"
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+        confirmButton.setOnClickListener {
+            navigatePageTo<AddDeviceResultActivity>()
+            finish()
+        }
+
+        reSearchDeviceView.setOnClickListener {
+            navigatePageTo<AddIoTDeviceActivity>()
+        }
+    }
+}
\ 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
index f351394..d53fc31 100644
--- a/app/src/main/java/com/casic/br/view/SelectWifiActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SelectWifiActivity.kt
@@ -4,7 +4,7 @@
 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 com.pengxh.kt.lite.extensions.navigatePageTo
 import kotlinx.android.synthetic.main.activity_select_wifi.*
 import kotlinx.android.synthetic.main.include_base_title.*
 
@@ -28,7 +28,8 @@
 
     override fun initEvent() {
         nextStepButton.setOnClickListener {
-            "添加设备Loading".show(this)
+            navigatePageTo<SearchDeviceResult>()
+            finish()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_ok.xml b/app/src/main/res/drawable/ic_ok.xml
new file mode 100644
index 0000000..4dc792d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_ok.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="192dp"
+    android:height="192dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/greenColor"
+        android:pathData="M512,22.14c-271.01,0 -490.66,219.3 -490.66,489.86s219.68,489.86 490.66,489.86 490.66,-219.3 490.66,-489.86c0,-270.56 -219.68,-489.86 -490.66,-489.86l0,0zM781.79,394.59l-315.87,322.69c-14.53,14.82 -38.11,14.82 -52.64,0l-171.1,-174.78c-14.56,-14.88 -14.56,-38.94 0,-53.79s38.11,-14.88 52.64,0l144.77,147.9 289.57,-295.84c14.56,-14.85 38.08,-14.85 52.64,0s14.53,38.94 -0.03,53.79l0,0z" />
+</vector>

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0bf09e0..3ea0e96 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -49,6 +49,8 @@
         <activity android:name=".view.AddIoTDeviceActivity" />
         <activity android:name=".view.SelectWifiActivity" />
         <activity android:name=".view.SelectBluetoothActivity" />
+        <activity android:name=".view.SearchDeviceResult" />
+        <activity android:name=".view.AddDeviceResultActivity" />
         <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 441f0bf..ce8f99e 100644
--- a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
@@ -31,10 +31,12 @@
     override fun initEvent() {
         iotDevice.setOnClickListener {
             navigatePageTo<AddIoTDeviceActivity>()
+            finish()
         }
 
         notIotDevice.setOnClickListener {
             navigatePageTo<AddDeviceTabActivity>()
+            finish()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/AddDeviceResultActivity.kt b/app/src/main/java/com/casic/br/view/AddDeviceResultActivity.kt
new file mode 100644
index 0000000..d58aebd
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/AddDeviceResultActivity.kt
@@ -0,0 +1,32 @@
+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 kotlinx.android.synthetic.main.activity_add_device_result.*
+
+class AddDeviceResultActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_add_device_result
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+        initLayoutImmersionBar(rootView)
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+        completeButton.setOnClickListener {
+            finish()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
index 38ec46a..25ce475 100644
--- a/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
@@ -50,6 +50,7 @@
             } else {
                 navigatePageTo<SelectBluetoothActivity>()
             }
+            finish()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/SearchDeviceResult.kt b/app/src/main/java/com/casic/br/view/SearchDeviceResult.kt
new file mode 100644
index 0000000..ed466ae
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/SearchDeviceResult.kt
@@ -0,0 +1,40 @@
+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.navigatePageTo
+import kotlinx.android.synthetic.main.activity_search_device_result.*
+import kotlinx.android.synthetic.main.include_left_back_title.*
+
+class SearchDeviceResult : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_search_device_result
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+        initLayoutImmersionBar(rootView)
+        leftBackView.setOnClickListener { finish() }
+        titleView.text = "添加设备"
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+        confirmButton.setOnClickListener {
+            navigatePageTo<AddDeviceResultActivity>()
+            finish()
+        }
+
+        reSearchDeviceView.setOnClickListener {
+            navigatePageTo<AddIoTDeviceActivity>()
+        }
+    }
+}
\ 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
index f351394..d53fc31 100644
--- a/app/src/main/java/com/casic/br/view/SelectWifiActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SelectWifiActivity.kt
@@ -4,7 +4,7 @@
 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 com.pengxh.kt.lite.extensions.navigatePageTo
 import kotlinx.android.synthetic.main.activity_select_wifi.*
 import kotlinx.android.synthetic.main.include_base_title.*
 
@@ -28,7 +28,8 @@
 
     override fun initEvent() {
         nextStepButton.setOnClickListener {
-            "添加设备Loading".show(this)
+            navigatePageTo<SearchDeviceResult>()
+            finish()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_ok.xml b/app/src/main/res/drawable/ic_ok.xml
new file mode 100644
index 0000000..4dc792d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_ok.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="192dp"
+    android:height="192dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/greenColor"
+        android:pathData="M512,22.14c-271.01,0 -490.66,219.3 -490.66,489.86s219.68,489.86 490.66,489.86 490.66,-219.3 490.66,-489.86c0,-270.56 -219.68,-489.86 -490.66,-489.86l0,0zM781.79,394.59l-315.87,322.69c-14.53,14.82 -38.11,14.82 -52.64,0l-171.1,-174.78c-14.56,-14.88 -14.56,-38.94 0,-53.79s38.11,-14.88 52.64,0l144.77,147.9 289.57,-295.84c14.56,-14.85 38.08,-14.85 52.64,0s14.53,38.94 -0.03,53.79l0,0z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_add_device_result.xml b/app/src/main/res/layout/activity_add_device_result.xml
new file mode 100644
index 0000000..1eaa401
--- /dev/null
+++ b/app/src/main/res/layout/activity_add_device_result.xml
@@ -0,0 +1,43 @@
+<?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">
+
+    <ImageView
+        android:id="@+id/leftBackView"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/titleViewHeight"
+        android:paddingHorizontal="@dimen/dp_10"
+        android:src="@drawable/ic_left_black" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_above="@id/addResultView"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="@dimen/dp_30"
+            android:src="@drawable/ic_ok" />
+
+        <TextView
+            android:id="@+id/addResultView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text="添加完成"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <Button
+            android:id="@+id/completeButton"
+            style="@style/MainButtonStyle"
+            android:layout_alignParentBottom="true"
+            android:layout_margin="@dimen/dp_50"
+            android:text="完成" />
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0bf09e0..3ea0e96 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -49,6 +49,8 @@
         <activity android:name=".view.AddIoTDeviceActivity" />
         <activity android:name=".view.SelectWifiActivity" />
         <activity android:name=".view.SelectBluetoothActivity" />
+        <activity android:name=".view.SearchDeviceResult" />
+        <activity android:name=".view.AddDeviceResultActivity" />
         <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 441f0bf..ce8f99e 100644
--- a/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddDeviceActivity.kt
@@ -31,10 +31,12 @@
     override fun initEvent() {
         iotDevice.setOnClickListener {
             navigatePageTo<AddIoTDeviceActivity>()
+            finish()
         }
 
         notIotDevice.setOnClickListener {
             navigatePageTo<AddDeviceTabActivity>()
+            finish()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/AddDeviceResultActivity.kt b/app/src/main/java/com/casic/br/view/AddDeviceResultActivity.kt
new file mode 100644
index 0000000..d58aebd
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/AddDeviceResultActivity.kt
@@ -0,0 +1,32 @@
+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 kotlinx.android.synthetic.main.activity_add_device_result.*
+
+class AddDeviceResultActivity : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_add_device_result
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+        initLayoutImmersionBar(rootView)
+        leftBackView.setOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+        completeButton.setOnClickListener {
+            finish()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
index 38ec46a..25ce475 100644
--- a/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
+++ b/app/src/main/java/com/casic/br/view/AddIoTDeviceActivity.kt
@@ -50,6 +50,7 @@
             } else {
                 navigatePageTo<SelectBluetoothActivity>()
             }
+            finish()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/SearchDeviceResult.kt b/app/src/main/java/com/casic/br/view/SearchDeviceResult.kt
new file mode 100644
index 0000000..ed466ae
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/SearchDeviceResult.kt
@@ -0,0 +1,40 @@
+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.navigatePageTo
+import kotlinx.android.synthetic.main.activity_search_device_result.*
+import kotlinx.android.synthetic.main.include_left_back_title.*
+
+class SearchDeviceResult : KotlinBaseActivity() {
+
+    override fun initLayoutView(): Int = R.layout.activity_search_device_result
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+        initLayoutImmersionBar(rootView)
+        leftBackView.setOnClickListener { finish() }
+        titleView.text = "添加设备"
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+        confirmButton.setOnClickListener {
+            navigatePageTo<AddDeviceResultActivity>()
+            finish()
+        }
+
+        reSearchDeviceView.setOnClickListener {
+            navigatePageTo<AddIoTDeviceActivity>()
+        }
+    }
+}
\ 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
index f351394..d53fc31 100644
--- a/app/src/main/java/com/casic/br/view/SelectWifiActivity.kt
+++ b/app/src/main/java/com/casic/br/view/SelectWifiActivity.kt
@@ -4,7 +4,7 @@
 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 com.pengxh.kt.lite.extensions.navigatePageTo
 import kotlinx.android.synthetic.main.activity_select_wifi.*
 import kotlinx.android.synthetic.main.include_base_title.*
 
@@ -28,7 +28,8 @@
 
     override fun initEvent() {
         nextStepButton.setOnClickListener {
-            "添加设备Loading".show(this)
+            navigatePageTo<SearchDeviceResult>()
+            finish()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_ok.xml b/app/src/main/res/drawable/ic_ok.xml
new file mode 100644
index 0000000..4dc792d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_ok.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="192dp"
+    android:height="192dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/greenColor"
+        android:pathData="M512,22.14c-271.01,0 -490.66,219.3 -490.66,489.86s219.68,489.86 490.66,489.86 490.66,-219.3 490.66,-489.86c0,-270.56 -219.68,-489.86 -490.66,-489.86l0,0zM781.79,394.59l-315.87,322.69c-14.53,14.82 -38.11,14.82 -52.64,0l-171.1,-174.78c-14.56,-14.88 -14.56,-38.94 0,-53.79s38.11,-14.88 52.64,0l144.77,147.9 289.57,-295.84c14.56,-14.85 38.08,-14.85 52.64,0s14.53,38.94 -0.03,53.79l0,0z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_add_device_result.xml b/app/src/main/res/layout/activity_add_device_result.xml
new file mode 100644
index 0000000..1eaa401
--- /dev/null
+++ b/app/src/main/res/layout/activity_add_device_result.xml
@@ -0,0 +1,43 @@
+<?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">
+
+    <ImageView
+        android:id="@+id/leftBackView"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/titleViewHeight"
+        android:paddingHorizontal="@dimen/dp_10"
+        android:src="@drawable/ic_left_black" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_above="@id/addResultView"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="@dimen/dp_30"
+            android:src="@drawable/ic_ok" />
+
+        <TextView
+            android:id="@+id/addResultView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text="添加完成"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_16" />
+
+        <Button
+            android:id="@+id/completeButton"
+            style="@style/MainButtonStyle"
+            android:layout_alignParentBottom="true"
+            android:layout_margin="@dimen/dp_50"
+            android:text="完成" />
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_search_device_result.xml b/app/src/main/res/layout/activity_search_device_result.xml
new file mode 100644
index 0000000..7d3d6ae
--- /dev/null
+++ b/app/src/main/res/layout/activity_search_device_result.xml
@@ -0,0 +1,53 @@
+<?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="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/dp_10"
+        android:layout_marginVertical="@dimen/dp_30"
+        android:fontFamily="sans-serif-medium"
+        android:text="正在添加设备"
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_16" />
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_200"
+        android:layout_marginHorizontal="@dimen/dp_50"
+        android:background="@color/mainThemeColor" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_50"
+        android:fontFamily="sans-serif-medium"
+        android:gravity="center"
+        android:text="搜索到***************设备，确认添加？"
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_16" />
+
+    <Button
+        android:id="@+id/confirmButton"
+        style="@style/MainButtonStyle"
+        android:layout_marginHorizontal="@dimen/dp_100"
+        android:layout_marginVertical="@dimen/dp_30"
+        android:text="确认" />
+
+    <TextView
+        android:id="@+id/reSearchDeviceView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fontFamily="sans-serif-medium"
+        android:gravity="center"
+        android:paddingVertical="@dimen/dp_10"
+        android:text="搜索错误，点我返回重新搜索"
+        android:textColor="@color/orangeTextColor"
+        android:textSize="@dimen/sp_16" />
+</LinearLayout>
\ No newline at end of file