diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/BarChart.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/BarChart.kt
index e038aec..aba2522 100644
--- a/app/src/main/java/com/casic/qd/smartwell/extensions/BarChart.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/extensions/BarChart.kt
@@ -13,6 +13,10 @@
 fun BarChart.init(barLabels: MutableList<String>) {
     this.setNoDataText("无数据，无法渲染...")
     this.setNoDataTextColor(R.color.orangeTextColor)
+    if (barLabels.isEmpty()) {
+        this.clearValues()
+        return
+    }
     this.getPaint(Chart.PAINT_INFO).textSize =
         SizeUtil.dp2px(BaseApplication.obtainInstance(), 14f).toFloat()
     this.animateY(1200, Easing.EaseInOutQuad)

diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/BarChart.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/BarChart.kt
index e038aec..aba2522 100644
--- a/app/src/main/java/com/casic/qd/smartwell/extensions/BarChart.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/extensions/BarChart.kt
@@ -13,6 +13,10 @@
 fun BarChart.init(barLabels: MutableList<String>) {
     this.setNoDataText("无数据，无法渲染...")
     this.setNoDataTextColor(R.color.orangeTextColor)
+    if (barLabels.isEmpty()) {
+        this.clearValues()
+        return
+    }
     this.getPaint(Chart.PAINT_INFO).textSize =
         SizeUtil.dp2px(BaseApplication.obtainInstance(), 14f).toFloat()
     this.animateY(1200, Easing.EaseInOutQuad)
diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/HorizontalBarChart.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/HorizontalBarChart.kt
index 14037df..a74a561 100644
--- a/app/src/main/java/com/casic/qd/smartwell/extensions/HorizontalBarChart.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/extensions/HorizontalBarChart.kt
@@ -13,6 +13,10 @@
 fun HorizontalBarChart.init(barLabels: MutableList<String>) {
     this.setNoDataText("无数据，无法渲染...")
     this.setNoDataTextColor(R.color.orangeTextColor)
+    if (barLabels.isEmpty()) {
+        this.clearValues()
+        return
+    }
     this.getPaint(Chart.PAINT_INFO).textSize =
         SizeUtil.dp2px(BaseApplication.obtainInstance(), 14f).toFloat()
     this.animateY(1200, Easing.EaseInOutQuad)

diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/BarChart.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/BarChart.kt
index e038aec..aba2522 100644
--- a/app/src/main/java/com/casic/qd/smartwell/extensions/BarChart.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/extensions/BarChart.kt
@@ -13,6 +13,10 @@
 fun BarChart.init(barLabels: MutableList<String>) {
     this.setNoDataText("无数据，无法渲染...")
     this.setNoDataTextColor(R.color.orangeTextColor)
+    if (barLabels.isEmpty()) {
+        this.clearValues()
+        return
+    }
     this.getPaint(Chart.PAINT_INFO).textSize =
         SizeUtil.dp2px(BaseApplication.obtainInstance(), 14f).toFloat()
     this.animateY(1200, Easing.EaseInOutQuad)
diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/HorizontalBarChart.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/HorizontalBarChart.kt
index 14037df..a74a561 100644
--- a/app/src/main/java/com/casic/qd/smartwell/extensions/HorizontalBarChart.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/extensions/HorizontalBarChart.kt
@@ -13,6 +13,10 @@
 fun HorizontalBarChart.init(barLabels: MutableList<String>) {
     this.setNoDataText("无数据，无法渲染...")
     this.setNoDataTextColor(R.color.orangeTextColor)
+    if (barLabels.isEmpty()) {
+        this.clearValues()
+        return
+    }
     this.getPaint(Chart.PAINT_INFO).textSize =
         SizeUtil.dp2px(BaseApplication.obtainInstance(), 14f).toFloat()
     this.animateY(1200, Easing.EaseInOutQuad)
diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt
index 1dabd47..9c3f609 100644
--- a/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt
@@ -35,6 +35,11 @@
     ) {
         //每次加载数据都初始化折线图
         chart.init()
+        //[{"entryList":[],"lineColor":-13118290}]
+        if (entryModels[0].entryList?.isEmpty() == true) {
+            chart.clearValues()
+            return
+        }
         //绑定数据
         val lineDataSets: MutableList<ILineDataSet> = ArrayList()
         val entrySize = entryModels[0].entryList!!.size
@@ -152,6 +157,10 @@
     fun setPieChartData(chart: PieChart, entries: List<PieEntry?>) {
         //每次加载数据都初始化饼图
         chart.init()
+        if (entries.isEmpty()) {
+            chart.clearValues()
+            return
+        }
         //绑定数据
         val dataSet = PieDataSet(entries, "")
         dataSet.sliceSpace = 1.5f //设置饼状块之间的间隙

diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/BarChart.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/BarChart.kt
index e038aec..aba2522 100644
--- a/app/src/main/java/com/casic/qd/smartwell/extensions/BarChart.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/extensions/BarChart.kt
@@ -13,6 +13,10 @@
 fun BarChart.init(barLabels: MutableList<String>) {
     this.setNoDataText("无数据，无法渲染...")
     this.setNoDataTextColor(R.color.orangeTextColor)
+    if (barLabels.isEmpty()) {
+        this.clearValues()
+        return
+    }
     this.getPaint(Chart.PAINT_INFO).textSize =
         SizeUtil.dp2px(BaseApplication.obtainInstance(), 14f).toFloat()
     this.animateY(1200, Easing.EaseInOutQuad)
diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/HorizontalBarChart.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/HorizontalBarChart.kt
index 14037df..a74a561 100644
--- a/app/src/main/java/com/casic/qd/smartwell/extensions/HorizontalBarChart.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/extensions/HorizontalBarChart.kt
@@ -13,6 +13,10 @@
 fun HorizontalBarChart.init(barLabels: MutableList<String>) {
     this.setNoDataText("无数据，无法渲染...")
     this.setNoDataTextColor(R.color.orangeTextColor)
+    if (barLabels.isEmpty()) {
+        this.clearValues()
+        return
+    }
     this.getPaint(Chart.PAINT_INFO).textSize =
         SizeUtil.dp2px(BaseApplication.obtainInstance(), 14f).toFloat()
     this.animateY(1200, Easing.EaseInOutQuad)
diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt
index 1dabd47..9c3f609 100644
--- a/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt
@@ -35,6 +35,11 @@
     ) {
         //每次加载数据都初始化折线图
         chart.init()
+        //[{"entryList":[],"lineColor":-13118290}]
+        if (entryModels[0].entryList?.isEmpty() == true) {
+            chart.clearValues()
+            return
+        }
         //绑定数据
         val lineDataSets: MutableList<ILineDataSet> = ArrayList()
         val entrySize = entryModels[0].entryList!!.size
@@ -152,6 +157,10 @@
     fun setPieChartData(chart: PieChart, entries: List<PieEntry?>) {
         //每次加载数据都初始化饼图
         chart.init()
+        if (entries.isEmpty()) {
+            chart.clearValues()
+            return
+        }
         //绑定数据
         val dataSet = PieDataSet(entries, "")
         dataSet.sliceSpace = 1.5f //设置饼状块之间的间隙
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 1387c74..c24c23b 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
@@ -59,14 +59,15 @@
 
     override fun initData() {
         deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-    }
-
-    override fun initEvent() {
         //默认加载近一周的数据
         val time = System.currentTimeMillis()
         val startTime = time.timestampToLastWeekTime()
         val endTime = time.timestampToTime()
         deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime)
+        deviceViewModel.obtainTotalDayData(deviceCode, startTime, endTime)
+    }
+
+    override fun initEvent() {
         deviceViewModel.dayDataModel.observe(this, {
             if (it.code == 200) {
                 val entryModels: MutableList<LineChartEntryModel> = ArrayList()
@@ -87,7 +88,6 @@
             }
         })
 
-        deviceViewModel.obtainTotalDayData(deviceCode, startTime, endTime)
         deviceViewModel.totalDataModel.observe(this, {
             val entryModels: MutableList<LineChartEntryModel> = ArrayList()
             val xAxisDate: MutableList<String> = ArrayList()

diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/BarChart.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/BarChart.kt
index e038aec..aba2522 100644
--- a/app/src/main/java/com/casic/qd/smartwell/extensions/BarChart.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/extensions/BarChart.kt
@@ -13,6 +13,10 @@
 fun BarChart.init(barLabels: MutableList<String>) {
     this.setNoDataText("无数据，无法渲染...")
     this.setNoDataTextColor(R.color.orangeTextColor)
+    if (barLabels.isEmpty()) {
+        this.clearValues()
+        return
+    }
     this.getPaint(Chart.PAINT_INFO).textSize =
         SizeUtil.dp2px(BaseApplication.obtainInstance(), 14f).toFloat()
     this.animateY(1200, Easing.EaseInOutQuad)
diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/HorizontalBarChart.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/HorizontalBarChart.kt
index 14037df..a74a561 100644
--- a/app/src/main/java/com/casic/qd/smartwell/extensions/HorizontalBarChart.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/extensions/HorizontalBarChart.kt
@@ -13,6 +13,10 @@
 fun HorizontalBarChart.init(barLabels: MutableList<String>) {
     this.setNoDataText("无数据，无法渲染...")
     this.setNoDataTextColor(R.color.orangeTextColor)
+    if (barLabels.isEmpty()) {
+        this.clearValues()
+        return
+    }
     this.getPaint(Chart.PAINT_INFO).textSize =
         SizeUtil.dp2px(BaseApplication.obtainInstance(), 14f).toFloat()
     this.animateY(1200, Easing.EaseInOutQuad)
diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt
index 1dabd47..9c3f609 100644
--- a/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/utils/ChartViewHelper.kt
@@ -35,6 +35,11 @@
     ) {
         //每次加载数据都初始化折线图
         chart.init()
+        //[{"entryList":[],"lineColor":-13118290}]
+        if (entryModels[0].entryList?.isEmpty() == true) {
+            chart.clearValues()
+            return
+        }
         //绑定数据
         val lineDataSets: MutableList<ILineDataSet> = ArrayList()
         val entrySize = entryModels[0].entryList!!.size
@@ -152,6 +157,10 @@
     fun setPieChartData(chart: PieChart, entries: List<PieEntry?>) {
         //每次加载数据都初始化饼图
         chart.init()
+        if (entries.isEmpty()) {
+            chart.clearValues()
+            return
+        }
         //绑定数据
         val dataSet = PieDataSet(entries, "")
         dataSet.sliceSpace = 1.5f //设置饼状块之间的间隙
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 1387c74..c24c23b 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
@@ -59,14 +59,15 @@
 
     override fun initData() {
         deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java)
-    }
-
-    override fun initEvent() {
         //默认加载近一周的数据
         val time = System.currentTimeMillis()
         val startTime = time.timestampToLastWeekTime()
         val endTime = time.timestampToTime()
         deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime)
+        deviceViewModel.obtainTotalDayData(deviceCode, startTime, endTime)
+    }
+
+    override fun initEvent() {
         deviceViewModel.dayDataModel.observe(this, {
             if (it.code == 200) {
                 val entryModels: MutableList<LineChartEntryModel> = ArrayList()
@@ -87,7 +88,6 @@
             }
         })
 
-        deviceViewModel.obtainTotalDayData(deviceCode, startTime, endTime)
         deviceViewModel.totalDataModel.observe(this, {
             val entryModels: MutableList<LineChartEntryModel> = ArrayList()
             val xAxisDate: MutableList<String> = ArrayList()
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt
index b474060..d75ec21 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/WellDetailActivity.kt
@@ -45,12 +45,12 @@
                 }
                 wellTypeView.text = typeName
                 ownershipView.text = wellDetail.deptName
-                val depth = wellDetail.deep.toString()
-                if (depth.isBlank()) {
-                    wellDepthView.text = resources.getString(R.string.unknown)
+                val depth = if (wellDetail.deep.toString().isBlank()) {
+                    resources.getString(R.string.unknown)
                 } else {
-                    wellDepthView.text = depth
+                    wellDetail.deep.toString()
                 }
+                wellDepthView.text = depth
                 //绑定窨井位置
                 val wellPosition = wellDetail.position.toString()
                 wellLocationView.text = wellPosition