diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
index abaffb2..67f51d9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
@@ -40,7 +40,11 @@
     override fun initLayoutView(): Int = R.layout.activity_alarm_management
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "当前告警"
+        rightOptionView.setOnClickListener {
+            this.navigatePageTo(SearchAlarmActivity::class.java)
+        }
     }
 
     override fun initData() {
@@ -115,10 +119,6 @@
                 }
             }
         })
-
-        rightOptionView.setOnClickListener {
-            this.navigatePageTo(SearchAlarmActivity::class.java)
-        }
     }
 
     private fun obtainAlarmList(pageIndex: Int) {

diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
index abaffb2..67f51d9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
@@ -40,7 +40,11 @@
     override fun initLayoutView(): Int = R.layout.activity_alarm_management
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "当前告警"
+        rightOptionView.setOnClickListener {
+            this.navigatePageTo(SearchAlarmActivity::class.java)
+        }
     }
 
     override fun initData() {
@@ -115,10 +119,6 @@
                 }
             }
         })
-
-        rightOptionView.setOnClickListener {
-            this.navigatePageTo(SearchAlarmActivity::class.java)
-        }
     }
 
     private fun obtainAlarmList(pageIndex: Int) {
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
index a8a2695..cb4dce9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
@@ -26,15 +26,9 @@
     override fun initLayoutView(): Int = R.layout.activity_device_data_detail
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         deviceCode = intent.getStringExtra(Constant.INTENT_PARAM)!!
         titleView.text = String.format("${deviceCode}历史数据")
-    }
-
-    override fun initData() {
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-    }
-
-    override fun initEvent() {
         rightOptionView.setOnClickListener {
             DateSelectDialog.Builder()
                 .setContext(this)
@@ -61,7 +55,13 @@
                 .setCalendarType(Type.ALL)
                 .build().show()
         }
+    }
 
+    override fun initData() {
+        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
+    }
+
+    override fun initEvent() {
         //默认加载近一周的数据
         val time = System.currentTimeMillis()
         val startTime = time.timestampToLastWeekTime()

diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
index abaffb2..67f51d9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
@@ -40,7 +40,11 @@
     override fun initLayoutView(): Int = R.layout.activity_alarm_management
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "当前告警"
+        rightOptionView.setOnClickListener {
+            this.navigatePageTo(SearchAlarmActivity::class.java)
+        }
     }
 
     override fun initData() {
@@ -115,10 +119,6 @@
                 }
             }
         })
-
-        rightOptionView.setOnClickListener {
-            this.navigatePageTo(SearchAlarmActivity::class.java)
-        }
     }
 
     private fun obtainAlarmList(pageIndex: Int) {
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
index a8a2695..cb4dce9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
@@ -26,15 +26,9 @@
     override fun initLayoutView(): Int = R.layout.activity_device_data_detail
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         deviceCode = intent.getStringExtra(Constant.INTENT_PARAM)!!
         titleView.text = String.format("${deviceCode}历史数据")
-    }
-
-    override fun initData() {
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-    }
-
-    override fun initEvent() {
         rightOptionView.setOnClickListener {
             DateSelectDialog.Builder()
                 .setContext(this)
@@ -61,7 +55,13 @@
                 .setCalendarType(Type.ALL)
                 .build().show()
         }
+    }
 
+    override fun initData() {
+        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
+    }
+
+    override fun initEvent() {
         //默认加载近一周的数据
         val time = System.currentTimeMillis()
         val startTime = time.timestampToLastWeekTime()
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
index d8af9d8..2f561c9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
@@ -239,9 +239,9 @@
             val userDetail = Gson().fromJson<UserDetailModel.DataBean>(
                 userDetailJson, object : TypeToken<UserDetailModel.DataBean>() {}.type
             )
-            userNameView.text = userDetail.name
-            userDeptView.text = userDetail.deptName
-            userRoleView.text = userDetail.roleNames.toString()
+            userNameView.text = String.format("姓名：${userDetail.name}")
+            userDeptView.text = String.format("职位：${userDetail.deptName}")
+            userRoleView.text = String.format("单位：${userDetail.roleNames.toString()}")
         }
     }
 

diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
index abaffb2..67f51d9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
@@ -40,7 +40,11 @@
     override fun initLayoutView(): Int = R.layout.activity_alarm_management
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "当前告警"
+        rightOptionView.setOnClickListener {
+            this.navigatePageTo(SearchAlarmActivity::class.java)
+        }
     }
 
     override fun initData() {
@@ -115,10 +119,6 @@
                 }
             }
         })
-
-        rightOptionView.setOnClickListener {
-            this.navigatePageTo(SearchAlarmActivity::class.java)
-        }
     }
 
     private fun obtainAlarmList(pageIndex: Int) {
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
index a8a2695..cb4dce9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
@@ -26,15 +26,9 @@
     override fun initLayoutView(): Int = R.layout.activity_device_data_detail
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         deviceCode = intent.getStringExtra(Constant.INTENT_PARAM)!!
         titleView.text = String.format("${deviceCode}历史数据")
-    }
-
-    override fun initData() {
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-    }
-
-    override fun initEvent() {
         rightOptionView.setOnClickListener {
             DateSelectDialog.Builder()
                 .setContext(this)
@@ -61,7 +55,13 @@
                 .setCalendarType(Type.ALL)
                 .build().show()
         }
+    }
 
+    override fun initData() {
+        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
+    }
+
+    override fun initEvent() {
         //默认加载近一周的数据
         val time = System.currentTimeMillis()
         val startTime = time.timestampToLastWeekTime()
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
index d8af9d8..2f561c9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
@@ -239,9 +239,9 @@
             val userDetail = Gson().fromJson<UserDetailModel.DataBean>(
                 userDetailJson, object : TypeToken<UserDetailModel.DataBean>() {}.type
             )
-            userNameView.text = userDetail.name
-            userDeptView.text = userDetail.deptName
-            userRoleView.text = userDetail.roleNames.toString()
+            userNameView.text = String.format("姓名：${userDetail.name}")
+            userDeptView.text = String.format("职位：${userDetail.deptName}")
+            userRoleView.text = String.format("单位：${userDetail.roleNames.toString()}")
         }
     }
 
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
index 28b0fb4..c8fa96e 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
@@ -53,7 +53,16 @@
     override fun initLayoutView(): Int = R.layout.activity_data_search
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "数据查询"
+        rightOptionView.setOnClickListener {
+            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
+                rightDrawerLayout.closeDrawer(GravityCompat.END)
+            } else {
+                rightDrawerLayout.openDrawer(GravityCompat.END)
+            }
+        }
+        rightDrawerLayout.addDrawerListener(this)
     }
 
     override fun initData() {
@@ -114,15 +123,6 @@
             obtainSearchResult(pageIndex)
         }
 
-        rightOptionView.setOnClickListener {
-            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
-                rightDrawerLayout.closeDrawer(GravityCompat.END)
-            } else {
-                rightDrawerLayout.openDrawer(GravityCompat.END)
-            }
-        }
-        rightDrawerLayout.addDrawerListener(this)
-
         areaViewModel.areaModel.observe(this, {
             if (it.code == 200) {
                 val firstLevelArea: MutableList<AreaModel.DataBean> = ArrayList()

diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
index abaffb2..67f51d9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
@@ -40,7 +40,11 @@
     override fun initLayoutView(): Int = R.layout.activity_alarm_management
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "当前告警"
+        rightOptionView.setOnClickListener {
+            this.navigatePageTo(SearchAlarmActivity::class.java)
+        }
     }
 
     override fun initData() {
@@ -115,10 +119,6 @@
                 }
             }
         })
-
-        rightOptionView.setOnClickListener {
-            this.navigatePageTo(SearchAlarmActivity::class.java)
-        }
     }
 
     private fun obtainAlarmList(pageIndex: Int) {
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
index a8a2695..cb4dce9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
@@ -26,15 +26,9 @@
     override fun initLayoutView(): Int = R.layout.activity_device_data_detail
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         deviceCode = intent.getStringExtra(Constant.INTENT_PARAM)!!
         titleView.text = String.format("${deviceCode}历史数据")
-    }
-
-    override fun initData() {
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-    }
-
-    override fun initEvent() {
         rightOptionView.setOnClickListener {
             DateSelectDialog.Builder()
                 .setContext(this)
@@ -61,7 +55,13 @@
                 .setCalendarType(Type.ALL)
                 .build().show()
         }
+    }
 
+    override fun initData() {
+        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
+    }
+
+    override fun initEvent() {
         //默认加载近一周的数据
         val time = System.currentTimeMillis()
         val startTime = time.timestampToLastWeekTime()
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
index d8af9d8..2f561c9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
@@ -239,9 +239,9 @@
             val userDetail = Gson().fromJson<UserDetailModel.DataBean>(
                 userDetailJson, object : TypeToken<UserDetailModel.DataBean>() {}.type
             )
-            userNameView.text = userDetail.name
-            userDeptView.text = userDetail.deptName
-            userRoleView.text = userDetail.roleNames.toString()
+            userNameView.text = String.format("姓名：${userDetail.name}")
+            userDeptView.text = String.format("职位：${userDetail.deptName}")
+            userRoleView.text = String.format("单位：${userDetail.roleNames.toString()}")
         }
     }
 
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
index 28b0fb4..c8fa96e 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
@@ -53,7 +53,16 @@
     override fun initLayoutView(): Int = R.layout.activity_data_search
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "数据查询"
+        rightOptionView.setOnClickListener {
+            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
+                rightDrawerLayout.closeDrawer(GravityCompat.END)
+            } else {
+                rightDrawerLayout.openDrawer(GravityCompat.END)
+            }
+        }
+        rightDrawerLayout.addDrawerListener(this)
     }
 
     override fun initData() {
@@ -114,15 +123,6 @@
             obtainSearchResult(pageIndex)
         }
 
-        rightOptionView.setOnClickListener {
-            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
-                rightDrawerLayout.closeDrawer(GravityCompat.END)
-            } else {
-                rightDrawerLayout.openDrawer(GravityCompat.END)
-            }
-        }
-        rightDrawerLayout.addDrawerListener(this)
-
         areaViewModel.areaModel.observe(this, {
             if (it.code == 200) {
                 val firstLevelArea: MutableList<AreaModel.DataBean> = ArrayList()
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt
index 346c8cf..35dd8ef 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt
@@ -70,7 +70,16 @@
     override fun initLayoutView(): Int = R.layout.activity_device_search
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "设备查询"
+        rightOptionView.setOnClickListener {
+            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
+                rightDrawerLayout.closeDrawer(GravityCompat.END)
+            } else {
+                rightDrawerLayout.openDrawer(GravityCompat.END)
+            }
+        }
+        rightDrawerLayout.addDrawerListener(this)
     }
 
     override fun initData() {
@@ -138,15 +147,6 @@
             obtainSearchResult(pageIndex)
         }
 
-        rightOptionView.setOnClickListener {
-            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
-                rightDrawerLayout.closeDrawer(GravityCompat.END)
-            } else {
-                rightDrawerLayout.openDrawer(GravityCompat.END)
-            }
-        }
-        rightDrawerLayout.addDrawerListener(this)
-
         //数据监听
         dataModelObserve()
     }

diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
index abaffb2..67f51d9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
@@ -40,7 +40,11 @@
     override fun initLayoutView(): Int = R.layout.activity_alarm_management
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "当前告警"
+        rightOptionView.setOnClickListener {
+            this.navigatePageTo(SearchAlarmActivity::class.java)
+        }
     }
 
     override fun initData() {
@@ -115,10 +119,6 @@
                 }
             }
         })
-
-        rightOptionView.setOnClickListener {
-            this.navigatePageTo(SearchAlarmActivity::class.java)
-        }
     }
 
     private fun obtainAlarmList(pageIndex: Int) {
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
index a8a2695..cb4dce9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
@@ -26,15 +26,9 @@
     override fun initLayoutView(): Int = R.layout.activity_device_data_detail
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         deviceCode = intent.getStringExtra(Constant.INTENT_PARAM)!!
         titleView.text = String.format("${deviceCode}历史数据")
-    }
-
-    override fun initData() {
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-    }
-
-    override fun initEvent() {
         rightOptionView.setOnClickListener {
             DateSelectDialog.Builder()
                 .setContext(this)
@@ -61,7 +55,13 @@
                 .setCalendarType(Type.ALL)
                 .build().show()
         }
+    }
 
+    override fun initData() {
+        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
+    }
+
+    override fun initEvent() {
         //默认加载近一周的数据
         val time = System.currentTimeMillis()
         val startTime = time.timestampToLastWeekTime()
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
index d8af9d8..2f561c9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
@@ -239,9 +239,9 @@
             val userDetail = Gson().fromJson<UserDetailModel.DataBean>(
                 userDetailJson, object : TypeToken<UserDetailModel.DataBean>() {}.type
             )
-            userNameView.text = userDetail.name
-            userDeptView.text = userDetail.deptName
-            userRoleView.text = userDetail.roleNames.toString()
+            userNameView.text = String.format("姓名：${userDetail.name}")
+            userDeptView.text = String.format("职位：${userDetail.deptName}")
+            userRoleView.text = String.format("单位：${userDetail.roleNames.toString()}")
         }
     }
 
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
index 28b0fb4..c8fa96e 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
@@ -53,7 +53,16 @@
     override fun initLayoutView(): Int = R.layout.activity_data_search
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "数据查询"
+        rightOptionView.setOnClickListener {
+            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
+                rightDrawerLayout.closeDrawer(GravityCompat.END)
+            } else {
+                rightDrawerLayout.openDrawer(GravityCompat.END)
+            }
+        }
+        rightDrawerLayout.addDrawerListener(this)
     }
 
     override fun initData() {
@@ -114,15 +123,6 @@
             obtainSearchResult(pageIndex)
         }
 
-        rightOptionView.setOnClickListener {
-            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
-                rightDrawerLayout.closeDrawer(GravityCompat.END)
-            } else {
-                rightDrawerLayout.openDrawer(GravityCompat.END)
-            }
-        }
-        rightDrawerLayout.addDrawerListener(this)
-
         areaViewModel.areaModel.observe(this, {
             if (it.code == 200) {
                 val firstLevelArea: MutableList<AreaModel.DataBean> = ArrayList()
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt
index 346c8cf..35dd8ef 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt
@@ -70,7 +70,16 @@
     override fun initLayoutView(): Int = R.layout.activity_device_search
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "设备查询"
+        rightOptionView.setOnClickListener {
+            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
+                rightDrawerLayout.closeDrawer(GravityCompat.END)
+            } else {
+                rightDrawerLayout.openDrawer(GravityCompat.END)
+            }
+        }
+        rightDrawerLayout.addDrawerListener(this)
     }
 
     override fun initData() {
@@ -138,15 +147,6 @@
             obtainSearchResult(pageIndex)
         }
 
-        rightOptionView.setOnClickListener {
-            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
-                rightDrawerLayout.closeDrawer(GravityCompat.END)
-            } else {
-                rightDrawerLayout.openDrawer(GravityCompat.END)
-            }
-        }
-        rightDrawerLayout.addDrawerListener(this)
-
         //数据监听
         dataModelObserve()
     }
diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/MarqueeTextView.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/MarqueeTextView.kt
deleted file mode 100644
index 520f6ae..0000000
--- a/app/src/main/java/com/casic/qd/smartwell/widgets/MarqueeTextView.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.qd.smartwell.widgets
-
-import android.content.Context
-import android.util.AttributeSet
-import androidx.appcompat.widget.AppCompatTextView
-
-class MarqueeTextView(context: Context, attrs: AttributeSet? = null) :
-    AppCompatTextView(context, attrs) {
-
-    override fun isFocused(): Boolean {
-        return true //自动获取焦点
-    }
-}
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
index abaffb2..67f51d9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
@@ -40,7 +40,11 @@
     override fun initLayoutView(): Int = R.layout.activity_alarm_management
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "当前告警"
+        rightOptionView.setOnClickListener {
+            this.navigatePageTo(SearchAlarmActivity::class.java)
+        }
     }
 
     override fun initData() {
@@ -115,10 +119,6 @@
                 }
             }
         })
-
-        rightOptionView.setOnClickListener {
-            this.navigatePageTo(SearchAlarmActivity::class.java)
-        }
     }
 
     private fun obtainAlarmList(pageIndex: Int) {
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
index a8a2695..cb4dce9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
@@ -26,15 +26,9 @@
     override fun initLayoutView(): Int = R.layout.activity_device_data_detail
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         deviceCode = intent.getStringExtra(Constant.INTENT_PARAM)!!
         titleView.text = String.format("${deviceCode}历史数据")
-    }
-
-    override fun initData() {
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-    }
-
-    override fun initEvent() {
         rightOptionView.setOnClickListener {
             DateSelectDialog.Builder()
                 .setContext(this)
@@ -61,7 +55,13 @@
                 .setCalendarType(Type.ALL)
                 .build().show()
         }
+    }
 
+    override fun initData() {
+        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
+    }
+
+    override fun initEvent() {
         //默认加载近一周的数据
         val time = System.currentTimeMillis()
         val startTime = time.timestampToLastWeekTime()
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
index d8af9d8..2f561c9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
@@ -239,9 +239,9 @@
             val userDetail = Gson().fromJson<UserDetailModel.DataBean>(
                 userDetailJson, object : TypeToken<UserDetailModel.DataBean>() {}.type
             )
-            userNameView.text = userDetail.name
-            userDeptView.text = userDetail.deptName
-            userRoleView.text = userDetail.roleNames.toString()
+            userNameView.text = String.format("姓名：${userDetail.name}")
+            userDeptView.text = String.format("职位：${userDetail.deptName}")
+            userRoleView.text = String.format("单位：${userDetail.roleNames.toString()}")
         }
     }
 
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
index 28b0fb4..c8fa96e 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
@@ -53,7 +53,16 @@
     override fun initLayoutView(): Int = R.layout.activity_data_search
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "数据查询"
+        rightOptionView.setOnClickListener {
+            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
+                rightDrawerLayout.closeDrawer(GravityCompat.END)
+            } else {
+                rightDrawerLayout.openDrawer(GravityCompat.END)
+            }
+        }
+        rightDrawerLayout.addDrawerListener(this)
     }
 
     override fun initData() {
@@ -114,15 +123,6 @@
             obtainSearchResult(pageIndex)
         }
 
-        rightOptionView.setOnClickListener {
-            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
-                rightDrawerLayout.closeDrawer(GravityCompat.END)
-            } else {
-                rightDrawerLayout.openDrawer(GravityCompat.END)
-            }
-        }
-        rightDrawerLayout.addDrawerListener(this)
-
         areaViewModel.areaModel.observe(this, {
             if (it.code == 200) {
                 val firstLevelArea: MutableList<AreaModel.DataBean> = ArrayList()
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt
index 346c8cf..35dd8ef 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt
@@ -70,7 +70,16 @@
     override fun initLayoutView(): Int = R.layout.activity_device_search
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "设备查询"
+        rightOptionView.setOnClickListener {
+            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
+                rightDrawerLayout.closeDrawer(GravityCompat.END)
+            } else {
+                rightDrawerLayout.openDrawer(GravityCompat.END)
+            }
+        }
+        rightDrawerLayout.addDrawerListener(this)
     }
 
     override fun initData() {
@@ -138,15 +147,6 @@
             obtainSearchResult(pageIndex)
         }
 
-        rightOptionView.setOnClickListener {
-            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
-                rightDrawerLayout.closeDrawer(GravityCompat.END)
-            } else {
-                rightDrawerLayout.openDrawer(GravityCompat.END)
-            }
-        }
-        rightDrawerLayout.addDrawerListener(this)
-
         //数据监听
         dataModelObserve()
     }
diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/MarqueeTextView.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/MarqueeTextView.kt
deleted file mode 100644
index 520f6ae..0000000
--- a/app/src/main/java/com/casic/qd/smartwell/widgets/MarqueeTextView.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.qd.smartwell.widgets
-
-import android.content.Context
-import android.util.AttributeSet
-import androidx.appcompat.widget.AppCompatTextView
-
-class MarqueeTextView(context: Context, attrs: AttributeSet? = null) :
-    AppCompatTextView(context, attrs) {
-
-    override fun isFocused(): Boolean {
-        return true //自动获取焦点
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml
index 5d0a0de..49b72b4 100644
--- a/app/src/main/res/layout/activity_alarm_management.xml
+++ b/app/src/main/res/layout/activity_alarm_management.xml
@@ -10,6 +10,14 @@
         android:layout_height="@dimen/titleViewHeight"
         android:background="@color/mainThemeColor">
 
+        <ImageView
+            android:id="@+id/leftBackView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="@dimen/dp_10"
+            android:background="@drawable/ic_left_white" />
+
         <TextView
             android:id="@+id/titleView"
             android:layout_width="wrap_content"

diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
index abaffb2..67f51d9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
@@ -40,7 +40,11 @@
     override fun initLayoutView(): Int = R.layout.activity_alarm_management
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "当前告警"
+        rightOptionView.setOnClickListener {
+            this.navigatePageTo(SearchAlarmActivity::class.java)
+        }
     }
 
     override fun initData() {
@@ -115,10 +119,6 @@
                 }
             }
         })
-
-        rightOptionView.setOnClickListener {
-            this.navigatePageTo(SearchAlarmActivity::class.java)
-        }
     }
 
     private fun obtainAlarmList(pageIndex: Int) {
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
index a8a2695..cb4dce9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
@@ -26,15 +26,9 @@
     override fun initLayoutView(): Int = R.layout.activity_device_data_detail
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         deviceCode = intent.getStringExtra(Constant.INTENT_PARAM)!!
         titleView.text = String.format("${deviceCode}历史数据")
-    }
-
-    override fun initData() {
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-    }
-
-    override fun initEvent() {
         rightOptionView.setOnClickListener {
             DateSelectDialog.Builder()
                 .setContext(this)
@@ -61,7 +55,13 @@
                 .setCalendarType(Type.ALL)
                 .build().show()
         }
+    }
 
+    override fun initData() {
+        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
+    }
+
+    override fun initEvent() {
         //默认加载近一周的数据
         val time = System.currentTimeMillis()
         val startTime = time.timestampToLastWeekTime()
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
index d8af9d8..2f561c9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
@@ -239,9 +239,9 @@
             val userDetail = Gson().fromJson<UserDetailModel.DataBean>(
                 userDetailJson, object : TypeToken<UserDetailModel.DataBean>() {}.type
             )
-            userNameView.text = userDetail.name
-            userDeptView.text = userDetail.deptName
-            userRoleView.text = userDetail.roleNames.toString()
+            userNameView.text = String.format("姓名：${userDetail.name}")
+            userDeptView.text = String.format("职位：${userDetail.deptName}")
+            userRoleView.text = String.format("单位：${userDetail.roleNames.toString()}")
         }
     }
 
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
index 28b0fb4..c8fa96e 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
@@ -53,7 +53,16 @@
     override fun initLayoutView(): Int = R.layout.activity_data_search
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "数据查询"
+        rightOptionView.setOnClickListener {
+            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
+                rightDrawerLayout.closeDrawer(GravityCompat.END)
+            } else {
+                rightDrawerLayout.openDrawer(GravityCompat.END)
+            }
+        }
+        rightDrawerLayout.addDrawerListener(this)
     }
 
     override fun initData() {
@@ -114,15 +123,6 @@
             obtainSearchResult(pageIndex)
         }
 
-        rightOptionView.setOnClickListener {
-            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
-                rightDrawerLayout.closeDrawer(GravityCompat.END)
-            } else {
-                rightDrawerLayout.openDrawer(GravityCompat.END)
-            }
-        }
-        rightDrawerLayout.addDrawerListener(this)
-
         areaViewModel.areaModel.observe(this, {
             if (it.code == 200) {
                 val firstLevelArea: MutableList<AreaModel.DataBean> = ArrayList()
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt
index 346c8cf..35dd8ef 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt
@@ -70,7 +70,16 @@
     override fun initLayoutView(): Int = R.layout.activity_device_search
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "设备查询"
+        rightOptionView.setOnClickListener {
+            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
+                rightDrawerLayout.closeDrawer(GravityCompat.END)
+            } else {
+                rightDrawerLayout.openDrawer(GravityCompat.END)
+            }
+        }
+        rightDrawerLayout.addDrawerListener(this)
     }
 
     override fun initData() {
@@ -138,15 +147,6 @@
             obtainSearchResult(pageIndex)
         }
 
-        rightOptionView.setOnClickListener {
-            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
-                rightDrawerLayout.closeDrawer(GravityCompat.END)
-            } else {
-                rightDrawerLayout.openDrawer(GravityCompat.END)
-            }
-        }
-        rightDrawerLayout.addDrawerListener(this)
-
         //数据监听
         dataModelObserve()
     }
diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/MarqueeTextView.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/MarqueeTextView.kt
deleted file mode 100644
index 520f6ae..0000000
--- a/app/src/main/java/com/casic/qd/smartwell/widgets/MarqueeTextView.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.qd.smartwell.widgets
-
-import android.content.Context
-import android.util.AttributeSet
-import androidx.appcompat.widget.AppCompatTextView
-
-class MarqueeTextView(context: Context, attrs: AttributeSet? = null) :
-    AppCompatTextView(context, attrs) {
-
-    override fun isFocused(): Boolean {
-        return true //自动获取焦点
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml
index 5d0a0de..49b72b4 100644
--- a/app/src/main/res/layout/activity_alarm_management.xml
+++ b/app/src/main/res/layout/activity_alarm_management.xml
@@ -10,6 +10,14 @@
         android:layout_height="@dimen/titleViewHeight"
         android:background="@color/mainThemeColor">
 
+        <ImageView
+            android:id="@+id/leftBackView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="@dimen/dp_10"
+            android:background="@drawable/ic_left_white" />
+
         <TextView
             android:id="@+id/titleView"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_data_search.xml b/app/src/main/res/layout/activity_data_search.xml
index 55b4ee0..96367b7 100644
--- a/app/src/main/res/layout/activity_data_search.xml
+++ b/app/src/main/res/layout/activity_data_search.xml
@@ -13,6 +13,14 @@
         android:layout_height="@dimen/titleViewHeight"
         android:background="@color/mainThemeColor">
 
+        <ImageView
+            android:id="@+id/leftBackView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="@dimen/dp_10"
+            android:background="@drawable/ic_left_white" />
+
         <TextView
             android:id="@+id/titleView"
             android:layout_width="wrap_content"

diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
index abaffb2..67f51d9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
@@ -40,7 +40,11 @@
     override fun initLayoutView(): Int = R.layout.activity_alarm_management
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "当前告警"
+        rightOptionView.setOnClickListener {
+            this.navigatePageTo(SearchAlarmActivity::class.java)
+        }
     }
 
     override fun initData() {
@@ -115,10 +119,6 @@
                 }
             }
         })
-
-        rightOptionView.setOnClickListener {
-            this.navigatePageTo(SearchAlarmActivity::class.java)
-        }
     }
 
     private fun obtainAlarmList(pageIndex: Int) {
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
index a8a2695..cb4dce9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
@@ -26,15 +26,9 @@
     override fun initLayoutView(): Int = R.layout.activity_device_data_detail
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         deviceCode = intent.getStringExtra(Constant.INTENT_PARAM)!!
         titleView.text = String.format("${deviceCode}历史数据")
-    }
-
-    override fun initData() {
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-    }
-
-    override fun initEvent() {
         rightOptionView.setOnClickListener {
             DateSelectDialog.Builder()
                 .setContext(this)
@@ -61,7 +55,13 @@
                 .setCalendarType(Type.ALL)
                 .build().show()
         }
+    }
 
+    override fun initData() {
+        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
+    }
+
+    override fun initEvent() {
         //默认加载近一周的数据
         val time = System.currentTimeMillis()
         val startTime = time.timestampToLastWeekTime()
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
index d8af9d8..2f561c9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
@@ -239,9 +239,9 @@
             val userDetail = Gson().fromJson<UserDetailModel.DataBean>(
                 userDetailJson, object : TypeToken<UserDetailModel.DataBean>() {}.type
             )
-            userNameView.text = userDetail.name
-            userDeptView.text = userDetail.deptName
-            userRoleView.text = userDetail.roleNames.toString()
+            userNameView.text = String.format("姓名：${userDetail.name}")
+            userDeptView.text = String.format("职位：${userDetail.deptName}")
+            userRoleView.text = String.format("单位：${userDetail.roleNames.toString()}")
         }
     }
 
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
index 28b0fb4..c8fa96e 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
@@ -53,7 +53,16 @@
     override fun initLayoutView(): Int = R.layout.activity_data_search
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "数据查询"
+        rightOptionView.setOnClickListener {
+            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
+                rightDrawerLayout.closeDrawer(GravityCompat.END)
+            } else {
+                rightDrawerLayout.openDrawer(GravityCompat.END)
+            }
+        }
+        rightDrawerLayout.addDrawerListener(this)
     }
 
     override fun initData() {
@@ -114,15 +123,6 @@
             obtainSearchResult(pageIndex)
         }
 
-        rightOptionView.setOnClickListener {
-            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
-                rightDrawerLayout.closeDrawer(GravityCompat.END)
-            } else {
-                rightDrawerLayout.openDrawer(GravityCompat.END)
-            }
-        }
-        rightDrawerLayout.addDrawerListener(this)
-
         areaViewModel.areaModel.observe(this, {
             if (it.code == 200) {
                 val firstLevelArea: MutableList<AreaModel.DataBean> = ArrayList()
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt
index 346c8cf..35dd8ef 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt
@@ -70,7 +70,16 @@
     override fun initLayoutView(): Int = R.layout.activity_device_search
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "设备查询"
+        rightOptionView.setOnClickListener {
+            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
+                rightDrawerLayout.closeDrawer(GravityCompat.END)
+            } else {
+                rightDrawerLayout.openDrawer(GravityCompat.END)
+            }
+        }
+        rightDrawerLayout.addDrawerListener(this)
     }
 
     override fun initData() {
@@ -138,15 +147,6 @@
             obtainSearchResult(pageIndex)
         }
 
-        rightOptionView.setOnClickListener {
-            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
-                rightDrawerLayout.closeDrawer(GravityCompat.END)
-            } else {
-                rightDrawerLayout.openDrawer(GravityCompat.END)
-            }
-        }
-        rightDrawerLayout.addDrawerListener(this)
-
         //数据监听
         dataModelObserve()
     }
diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/MarqueeTextView.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/MarqueeTextView.kt
deleted file mode 100644
index 520f6ae..0000000
--- a/app/src/main/java/com/casic/qd/smartwell/widgets/MarqueeTextView.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.qd.smartwell.widgets
-
-import android.content.Context
-import android.util.AttributeSet
-import androidx.appcompat.widget.AppCompatTextView
-
-class MarqueeTextView(context: Context, attrs: AttributeSet? = null) :
-    AppCompatTextView(context, attrs) {
-
-    override fun isFocused(): Boolean {
-        return true //自动获取焦点
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml
index 5d0a0de..49b72b4 100644
--- a/app/src/main/res/layout/activity_alarm_management.xml
+++ b/app/src/main/res/layout/activity_alarm_management.xml
@@ -10,6 +10,14 @@
         android:layout_height="@dimen/titleViewHeight"
         android:background="@color/mainThemeColor">
 
+        <ImageView
+            android:id="@+id/leftBackView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="@dimen/dp_10"
+            android:background="@drawable/ic_left_white" />
+
         <TextView
             android:id="@+id/titleView"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_data_search.xml b/app/src/main/res/layout/activity_data_search.xml
index 55b4ee0..96367b7 100644
--- a/app/src/main/res/layout/activity_data_search.xml
+++ b/app/src/main/res/layout/activity_data_search.xml
@@ -13,6 +13,14 @@
         android:layout_height="@dimen/titleViewHeight"
         android:background="@color/mainThemeColor">
 
+        <ImageView
+            android:id="@+id/leftBackView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="@dimen/dp_10"
+            android:background="@drawable/ic_left_white" />
+
         <TextView
             android:id="@+id/titleView"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_device_data_detail.xml b/app/src/main/res/layout/activity_device_data_detail.xml
index 700b1de..fefceae 100644
--- a/app/src/main/res/layout/activity_device_data_detail.xml
+++ b/app/src/main/res/layout/activity_device_data_detail.xml
@@ -12,6 +12,14 @@
         android:layout_height="@dimen/titleViewHeight"
         android:background="@color/mainThemeColor">
 
+        <ImageView
+            android:id="@+id/leftBackView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="@dimen/dp_10"
+            android:background="@drawable/ic_left_white" />
+
         <TextView
             android:id="@+id/titleView"
             android:layout_width="wrap_content"

diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
index abaffb2..67f51d9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
@@ -40,7 +40,11 @@
     override fun initLayoutView(): Int = R.layout.activity_alarm_management
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "当前告警"
+        rightOptionView.setOnClickListener {
+            this.navigatePageTo(SearchAlarmActivity::class.java)
+        }
     }
 
     override fun initData() {
@@ -115,10 +119,6 @@
                 }
             }
         })
-
-        rightOptionView.setOnClickListener {
-            this.navigatePageTo(SearchAlarmActivity::class.java)
-        }
     }
 
     private fun obtainAlarmList(pageIndex: Int) {
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
index a8a2695..cb4dce9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
@@ -26,15 +26,9 @@
     override fun initLayoutView(): Int = R.layout.activity_device_data_detail
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         deviceCode = intent.getStringExtra(Constant.INTENT_PARAM)!!
         titleView.text = String.format("${deviceCode}历史数据")
-    }
-
-    override fun initData() {
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-    }
-
-    override fun initEvent() {
         rightOptionView.setOnClickListener {
             DateSelectDialog.Builder()
                 .setContext(this)
@@ -61,7 +55,13 @@
                 .setCalendarType(Type.ALL)
                 .build().show()
         }
+    }
 
+    override fun initData() {
+        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
+    }
+
+    override fun initEvent() {
         //默认加载近一周的数据
         val time = System.currentTimeMillis()
         val startTime = time.timestampToLastWeekTime()
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
index d8af9d8..2f561c9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
@@ -239,9 +239,9 @@
             val userDetail = Gson().fromJson<UserDetailModel.DataBean>(
                 userDetailJson, object : TypeToken<UserDetailModel.DataBean>() {}.type
             )
-            userNameView.text = userDetail.name
-            userDeptView.text = userDetail.deptName
-            userRoleView.text = userDetail.roleNames.toString()
+            userNameView.text = String.format("姓名：${userDetail.name}")
+            userDeptView.text = String.format("职位：${userDetail.deptName}")
+            userRoleView.text = String.format("单位：${userDetail.roleNames.toString()}")
         }
     }
 
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
index 28b0fb4..c8fa96e 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
@@ -53,7 +53,16 @@
     override fun initLayoutView(): Int = R.layout.activity_data_search
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "数据查询"
+        rightOptionView.setOnClickListener {
+            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
+                rightDrawerLayout.closeDrawer(GravityCompat.END)
+            } else {
+                rightDrawerLayout.openDrawer(GravityCompat.END)
+            }
+        }
+        rightDrawerLayout.addDrawerListener(this)
     }
 
     override fun initData() {
@@ -114,15 +123,6 @@
             obtainSearchResult(pageIndex)
         }
 
-        rightOptionView.setOnClickListener {
-            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
-                rightDrawerLayout.closeDrawer(GravityCompat.END)
-            } else {
-                rightDrawerLayout.openDrawer(GravityCompat.END)
-            }
-        }
-        rightDrawerLayout.addDrawerListener(this)
-
         areaViewModel.areaModel.observe(this, {
             if (it.code == 200) {
                 val firstLevelArea: MutableList<AreaModel.DataBean> = ArrayList()
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt
index 346c8cf..35dd8ef 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt
@@ -70,7 +70,16 @@
     override fun initLayoutView(): Int = R.layout.activity_device_search
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "设备查询"
+        rightOptionView.setOnClickListener {
+            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
+                rightDrawerLayout.closeDrawer(GravityCompat.END)
+            } else {
+                rightDrawerLayout.openDrawer(GravityCompat.END)
+            }
+        }
+        rightDrawerLayout.addDrawerListener(this)
     }
 
     override fun initData() {
@@ -138,15 +147,6 @@
             obtainSearchResult(pageIndex)
         }
 
-        rightOptionView.setOnClickListener {
-            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
-                rightDrawerLayout.closeDrawer(GravityCompat.END)
-            } else {
-                rightDrawerLayout.openDrawer(GravityCompat.END)
-            }
-        }
-        rightDrawerLayout.addDrawerListener(this)
-
         //数据监听
         dataModelObserve()
     }
diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/MarqueeTextView.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/MarqueeTextView.kt
deleted file mode 100644
index 520f6ae..0000000
--- a/app/src/main/java/com/casic/qd/smartwell/widgets/MarqueeTextView.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.qd.smartwell.widgets
-
-import android.content.Context
-import android.util.AttributeSet
-import androidx.appcompat.widget.AppCompatTextView
-
-class MarqueeTextView(context: Context, attrs: AttributeSet? = null) :
-    AppCompatTextView(context, attrs) {
-
-    override fun isFocused(): Boolean {
-        return true //自动获取焦点
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml
index 5d0a0de..49b72b4 100644
--- a/app/src/main/res/layout/activity_alarm_management.xml
+++ b/app/src/main/res/layout/activity_alarm_management.xml
@@ -10,6 +10,14 @@
         android:layout_height="@dimen/titleViewHeight"
         android:background="@color/mainThemeColor">
 
+        <ImageView
+            android:id="@+id/leftBackView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="@dimen/dp_10"
+            android:background="@drawable/ic_left_white" />
+
         <TextView
             android:id="@+id/titleView"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_data_search.xml b/app/src/main/res/layout/activity_data_search.xml
index 55b4ee0..96367b7 100644
--- a/app/src/main/res/layout/activity_data_search.xml
+++ b/app/src/main/res/layout/activity_data_search.xml
@@ -13,6 +13,14 @@
         android:layout_height="@dimen/titleViewHeight"
         android:background="@color/mainThemeColor">
 
+        <ImageView
+            android:id="@+id/leftBackView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="@dimen/dp_10"
+            android:background="@drawable/ic_left_white" />
+
         <TextView
             android:id="@+id/titleView"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_device_data_detail.xml b/app/src/main/res/layout/activity_device_data_detail.xml
index 700b1de..fefceae 100644
--- a/app/src/main/res/layout/activity_device_data_detail.xml
+++ b/app/src/main/res/layout/activity_device_data_detail.xml
@@ -12,6 +12,14 @@
         android:layout_height="@dimen/titleViewHeight"
         android:background="@color/mainThemeColor">
 
+        <ImageView
+            android:id="@+id/leftBackView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="@dimen/dp_10"
+            android:background="@drawable/ic_left_white" />
+
         <TextView
             android:id="@+id/titleView"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_device_search.xml b/app/src/main/res/layout/activity_device_search.xml
index 0e65996..31e22dc 100644
--- a/app/src/main/res/layout/activity_device_search.xml
+++ b/app/src/main/res/layout/activity_device_search.xml
@@ -13,6 +13,14 @@
         android:layout_height="@dimen/titleViewHeight"
         android:background="@color/mainThemeColor">
 
+        <ImageView
+            android:id="@+id/leftBackView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="@dimen/dp_10"
+            android:background="@drawable/ic_left_white" />
+
         <TextView
             android:id="@+id/titleView"
             android:layout_width="wrap_content"

diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
index abaffb2..67f51d9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt
@@ -40,7 +40,11 @@
     override fun initLayoutView(): Int = R.layout.activity_alarm_management
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "当前告警"
+        rightOptionView.setOnClickListener {
+            this.navigatePageTo(SearchAlarmActivity::class.java)
+        }
     }
 
     override fun initData() {
@@ -115,10 +119,6 @@
                 }
             }
         })
-
-        rightOptionView.setOnClickListener {
-            this.navigatePageTo(SearchAlarmActivity::class.java)
-        }
     }
 
     private fun obtainAlarmList(pageIndex: Int) {
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
index a8a2695..cb4dce9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/DeviceDataDetailActivity.kt
@@ -26,15 +26,9 @@
     override fun initLayoutView(): Int = R.layout.activity_device_data_detail
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         deviceCode = intent.getStringExtra(Constant.INTENT_PARAM)!!
         titleView.text = String.format("${deviceCode}历史数据")
-    }
-
-    override fun initData() {
-        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-    }
-
-    override fun initEvent() {
         rightOptionView.setOnClickListener {
             DateSelectDialog.Builder()
                 .setContext(this)
@@ -61,7 +55,13 @@
                 .setCalendarType(Type.ALL)
                 .build().show()
         }
+    }
 
+    override fun initData() {
+        deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
+    }
+
+    override fun initEvent() {
         //默认加载近一周的数据
         val time = System.currentTimeMillis()
         val startTime = time.timestampToLastWeekTime()
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
index d8af9d8..2f561c9 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/MainActivity.kt
@@ -239,9 +239,9 @@
             val userDetail = Gson().fromJson<UserDetailModel.DataBean>(
                 userDetailJson, object : TypeToken<UserDetailModel.DataBean>() {}.type
             )
-            userNameView.text = userDetail.name
-            userDeptView.text = userDetail.deptName
-            userRoleView.text = userDetail.roleNames.toString()
+            userNameView.text = String.format("姓名：${userDetail.name}")
+            userDeptView.text = String.format("职位：${userDetail.deptName}")
+            userRoleView.text = String.format("单位：${userDetail.roleNames.toString()}")
         }
     }
 
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
index 28b0fb4..c8fa96e 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt
@@ -53,7 +53,16 @@
     override fun initLayoutView(): Int = R.layout.activity_data_search
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "数据查询"
+        rightOptionView.setOnClickListener {
+            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
+                rightDrawerLayout.closeDrawer(GravityCompat.END)
+            } else {
+                rightDrawerLayout.openDrawer(GravityCompat.END)
+            }
+        }
+        rightDrawerLayout.addDrawerListener(this)
     }
 
     override fun initData() {
@@ -114,15 +123,6 @@
             obtainSearchResult(pageIndex)
         }
 
-        rightOptionView.setOnClickListener {
-            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
-                rightDrawerLayout.closeDrawer(GravityCompat.END)
-            } else {
-                rightDrawerLayout.openDrawer(GravityCompat.END)
-            }
-        }
-        rightDrawerLayout.addDrawerListener(this)
-
         areaViewModel.areaModel.observe(this, {
             if (it.code == 200) {
                 val firstLevelArea: MutableList<AreaModel.DataBean> = ArrayList()
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt
index 346c8cf..35dd8ef 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt
@@ -70,7 +70,16 @@
     override fun initLayoutView(): Int = R.layout.activity_device_search
 
     override fun setupTopBarLayout() {
+        leftBackView.setOnClickListener { finish() }
         titleView.text = "设备查询"
+        rightOptionView.setOnClickListener {
+            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
+                rightDrawerLayout.closeDrawer(GravityCompat.END)
+            } else {
+                rightDrawerLayout.openDrawer(GravityCompat.END)
+            }
+        }
+        rightDrawerLayout.addDrawerListener(this)
     }
 
     override fun initData() {
@@ -138,15 +147,6 @@
             obtainSearchResult(pageIndex)
         }
 
-        rightOptionView.setOnClickListener {
-            if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) {
-                rightDrawerLayout.closeDrawer(GravityCompat.END)
-            } else {
-                rightDrawerLayout.openDrawer(GravityCompat.END)
-            }
-        }
-        rightDrawerLayout.addDrawerListener(this)
-
         //数据监听
         dataModelObserve()
     }
diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/MarqueeTextView.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/MarqueeTextView.kt
deleted file mode 100644
index 520f6ae..0000000
--- a/app/src/main/java/com/casic/qd/smartwell/widgets/MarqueeTextView.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.casic.qd.smartwell.widgets
-
-import android.content.Context
-import android.util.AttributeSet
-import androidx.appcompat.widget.AppCompatTextView
-
-class MarqueeTextView(context: Context, attrs: AttributeSet? = null) :
-    AppCompatTextView(context, attrs) {
-
-    override fun isFocused(): Boolean {
-        return true //自动获取焦点
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml
index 5d0a0de..49b72b4 100644
--- a/app/src/main/res/layout/activity_alarm_management.xml
+++ b/app/src/main/res/layout/activity_alarm_management.xml
@@ -10,6 +10,14 @@
         android:layout_height="@dimen/titleViewHeight"
         android:background="@color/mainThemeColor">
 
+        <ImageView
+            android:id="@+id/leftBackView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="@dimen/dp_10"
+            android:background="@drawable/ic_left_white" />
+
         <TextView
             android:id="@+id/titleView"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_data_search.xml b/app/src/main/res/layout/activity_data_search.xml
index 55b4ee0..96367b7 100644
--- a/app/src/main/res/layout/activity_data_search.xml
+++ b/app/src/main/res/layout/activity_data_search.xml
@@ -13,6 +13,14 @@
         android:layout_height="@dimen/titleViewHeight"
         android:background="@color/mainThemeColor">
 
+        <ImageView
+            android:id="@+id/leftBackView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="@dimen/dp_10"
+            android:background="@drawable/ic_left_white" />
+
         <TextView
             android:id="@+id/titleView"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_device_data_detail.xml b/app/src/main/res/layout/activity_device_data_detail.xml
index 700b1de..fefceae 100644
--- a/app/src/main/res/layout/activity_device_data_detail.xml
+++ b/app/src/main/res/layout/activity_device_data_detail.xml
@@ -12,6 +12,14 @@
         android:layout_height="@dimen/titleViewHeight"
         android:background="@color/mainThemeColor">
 
+        <ImageView
+            android:id="@+id/leftBackView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="@dimen/dp_10"
+            android:background="@drawable/ic_left_white" />
+
         <TextView
             android:id="@+id/titleView"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_device_search.xml b/app/src/main/res/layout/activity_device_search.xml
index 0e65996..31e22dc 100644
--- a/app/src/main/res/layout/activity_device_search.xml
+++ b/app/src/main/res/layout/activity_device_search.xml
@@ -13,6 +13,14 @@
         android:layout_height="@dimen/titleViewHeight"
         android:background="@color/mainThemeColor">
 
+        <ImageView
+            android:id="@+id/leftBackView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="@dimen/dp_10"
+            android:background="@drawable/ic_left_white" />
+
         <TextView
             android:id="@+id/titleView"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/drawer_header_layout.xml b/app/src/main/res/layout/drawer_header_layout.xml
index 49edf71..7405a1e 100644
--- a/app/src/main/res/layout/drawer_header_layout.xml
+++ b/app/src/main/res/layout/drawer_header_layout.xml
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_200"
+    android:layout_height="wrap_content"
     android:background="@color/mainThemeColor"
     android:gravity="center_vertical"
     android:orientation="vertical"
     android:padding="@dimen/dp_10">
 
-    <ImageView
-        android:layout_width="80dp"
-        android:layout_height="80dp"
-        android:src="@mipmap/app_logo" />
-
     <TextView
         android:id="@+id/userNameView"
         android:layout_width="match_parent"
@@ -26,15 +21,13 @@
         android:layout_height="wrap_content"
         android:paddingVertical="@dimen/dp_7"
         android:textColor="@color/white"
-        android:textSize="@dimen/miniFontSize" />
+        android:textSize="@dimen/textFontSize" />
 
-    <com.casic.qd.smartwell.widgets.MarqueeTextView
+    <TextView
         android:id="@+id/userDeptView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:ellipsize="marquee"
         android:paddingVertical="@dimen/dp_7"
-        android:singleLine="true"
         android:textColor="@color/white"
-        android:textSize="@dimen/miniFontSize" />
+        android:textSize="@dimen/textFontSize" />
 </LinearLayout>