diff --git a/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt b/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt index 196dafa..1500877 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt @@ -18,8 +18,7 @@ this.isScaleXEnabled = true //X轴可缩放 this.isScaleYEnabled = false //Y轴不可缩放 this.description.isEnabled = false - this.extraTopOffset = 5f //顶部边距 - this.extraBottomOffset = 5f //底部边距 + this.extraBottomOffset = 10f //底部边距 //去掉图例 this.legend.isEnabled = false this.animateY(1200, Easing.EaseInOutQuad) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt b/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt index 196dafa..1500877 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt @@ -18,8 +18,7 @@ this.isScaleXEnabled = true //X轴可缩放 this.isScaleYEnabled = false //Y轴不可缩放 this.description.isEnabled = false - this.extraTopOffset = 5f //顶部边距 - this.extraBottomOffset = 5f //底部边距 + this.extraBottomOffset = 10f //底部边距 //去掉图例 this.legend.isEnabled = false this.animateY(1200, Easing.EaseInOutQuad) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt index edf390b..353cce4 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt @@ -124,6 +124,11 @@ dataSet.values = strengthEntries lineDataSets.add(dataSet) val lineData = LineData(lineDataSets) + //最多显示10min的实时数据,旧的数据删除,优化卡顿问题 + if (lineData.entryCount > 200) { + lineData.removeDataSet(0) + lineData.notifyDataChanged() + } lineData.setDrawValues(false) binding.lineChart.data = lineData binding.lineChart.invalidate() diff --git a/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt b/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt index 196dafa..1500877 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/extensions/LineChart.kt @@ -18,8 +18,7 @@ this.isScaleXEnabled = true //X轴可缩放 this.isScaleYEnabled = false //Y轴不可缩放 this.description.isEnabled = false - this.extraTopOffset = 5f //顶部边距 - this.extraBottomOffset = 5f //底部边距 + this.extraBottomOffset = 10f //底部边距 //去掉图例 this.legend.isEnabled = false this.animateY(1200, Easing.EaseInOutQuad) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt index edf390b..353cce4 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/MethaneMonitorFragment.kt @@ -124,6 +124,11 @@ dataSet.values = strengthEntries lineDataSets.add(dataSet) val lineData = LineData(lineDataSets) + //最多显示10min的实时数据,旧的数据删除,优化卡顿问题 + if (lineData.entryCount > 200) { + lineData.removeDataSet(0) + lineData.notifyDataChanged() + } lineData.setDrawValues(false) binding.lineChart.data = lineData binding.lineChart.invalidate() diff --git a/app/src/main/java/com/casic/app/safetreecontroller/service/SocketConnectionService.kt b/app/src/main/java/com/casic/app/safetreecontroller/service/SocketConnectionService.kt index f702c79..f12f7fa 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/service/SocketConnectionService.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/service/SocketConnectionService.kt @@ -55,8 +55,8 @@ private val methaneRunnable = object : Runnable { override fun run() { tcpClient.sendMessage(CommandCreator.createMethaneCommand()) - // 每5s重复一次 - weakReferenceHandler?.postDelayed(this, 5 * 1000L) + // 每3s重复一次 + weakReferenceHandler?.postDelayed(this, 3 * 1000L) } }