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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp +++ /dev/null Binary files differ 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..afb59d2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..afb59d2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9f921f2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..afb59d2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9f921f2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +++ /dev/null Binary files differ 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..afb59d2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9f921f2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..2d0b7ee --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..afb59d2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9f921f2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..2d0b7ee --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp +++ /dev/null Binary files differ 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..afb59d2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9f921f2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..2d0b7ee --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..46d222d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..afb59d2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9f921f2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..2d0b7ee --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..46d222d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..83f9d55 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..afb59d2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9f921f2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..2d0b7ee --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..46d222d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..83f9d55 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp +++ /dev/null Binary files differ 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..afb59d2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9f921f2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..2d0b7ee --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..46d222d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..83f9d55 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..7d22dcf --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differ 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..afb59d2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9f921f2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..2d0b7ee --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..46d222d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..83f9d55 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..7d22dcf --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp +++ /dev/null Binary files differ 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..afb59d2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9f921f2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..2d0b7ee --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..46d222d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..83f9d55 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..7d22dcf --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..c404549 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differ 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..afb59d2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9f921f2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..2d0b7ee --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..46d222d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..83f9d55 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..7d22dcf --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..c404549 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..eeb1999 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differ 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..afb59d2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9f921f2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..2d0b7ee --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..46d222d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..83f9d55 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..7d22dcf --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..c404549 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..eeb1999 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a695..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp +++ /dev/null Binary files differ 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..afb59d2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9f921f2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..2d0b7ee --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..46d222d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..83f9d55 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..7d22dcf --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..c404549 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..eeb1999 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a695..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..1b18545 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differ 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..afb59d2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9f921f2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..2d0b7ee --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..46d222d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..83f9d55 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..7d22dcf --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..c404549 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..eeb1999 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a695..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..1b18545 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp +++ /dev/null Binary files differ 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..afb59d2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9f921f2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..2d0b7ee --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..46d222d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..83f9d55 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..7d22dcf --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..c404549 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..eeb1999 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a695..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..1b18545 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..f1538ec --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png Binary files differ 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..afb59d2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9f921f2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..2d0b7ee --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..46d222d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..83f9d55 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..7d22dcf --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..c404549 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..eeb1999 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a695..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..1b18545 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..f1538ec --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..a79100e --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Binary files differ 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..afb59d2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9f921f2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..2d0b7ee --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..46d222d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..83f9d55 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..7d22dcf --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..c404549 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..eeb1999 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a695..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..1b18545 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..f1538ec --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..a79100e --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f50..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp +++ /dev/null Binary files differ 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..afb59d2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9f921f2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..2d0b7ee --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..46d222d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..83f9d55 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..7d22dcf --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..c404549 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..eeb1999 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a695..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..1b18545 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..f1538ec --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..a79100e --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f50..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..42a776f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png Binary files differ 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..afb59d2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9f921f2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..2d0b7ee --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..46d222d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..83f9d55 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..7d22dcf --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..c404549 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..eeb1999 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a695..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..1b18545 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..f1538ec --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..a79100e --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f50..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..42a776f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d642..0000000 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp +++ /dev/null Binary files differ 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..afb59d2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9f921f2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..2d0b7ee --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..46d222d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..83f9d55 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..7d22dcf --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..c404549 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..eeb1999 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a695..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..1b18545 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..f1538ec --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..a79100e --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f50..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..42a776f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d642..0000000 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..2d10cdd --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png Binary files differ 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..afb59d2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9f921f2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..2d0b7ee --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..46d222d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..83f9d55 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..7d22dcf --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..c404549 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..eeb1999 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a695..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..1b18545 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..f1538ec --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..a79100e --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f50..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..42a776f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d642..0000000 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..2d10cdd --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..a96d39f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png Binary files differ 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..afb59d2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9f921f2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..2d0b7ee --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..46d222d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..83f9d55 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..7d22dcf --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..c404549 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..eeb1999 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a695..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..1b18545 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..f1538ec --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..a79100e --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f50..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..42a776f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d642..0000000 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..2d10cdd --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..a96d39f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9126ae3..0000000 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp +++ /dev/null Binary files differ 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 80a3b67..4a86ca8 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 @@ -61,6 +61,7 @@ binding.cardView.layoutParams = viewParams binding.lineChart.initConfig() dataSet.setDrawCircles(false) + dataSet.color = R.color.mainThemeColor.convertColor(requireContext()) val markerView = LineChartMarkerView(requireContext()) markerView.chartView = binding.lineChart markerView.setXAxisDate(xAxisLabels) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt index 1601565..6ac70d6 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/widgets/LineChartMarkerView.kt @@ -1,20 +1,24 @@ package com.casic.app.safetreecontroller.widgets import android.content.Context +import android.graphics.Canvas import android.widget.TextView +import androidx.core.graphics.drawable.toBitmap import com.casic.app.safetreecontroller.R import com.github.mikephil.charting.components.MarkerView import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.utils.MPPointF +import com.pengxh.kt.lite.extensions.convertDrawable class LineChartMarkerView(context: Context) : MarkerView(context, R.layout.popu_line_chart_marker) { private val timeView: TextView = findViewById(R.id.timeView) private val valueView: TextView = findViewById(R.id.valueView) - private var xAxisDate: MutableList = ArrayList() + private var xAxisDate = ArrayList() + private val dotBitmap = R.drawable.ic_chart_dot.convertDrawable(context)!!.toBitmap() - fun setXAxisDate(date: MutableList) { + fun setXAxisDate(date: ArrayList) { this.xAxisDate = date } @@ -32,4 +36,22 @@ override fun getOffset(): MPPointF { return MPPointF((-(width shr 1)).toFloat(), (-height).toFloat()) } + + /** + * 绘制自适应界面的Marker + * */ + override fun draw(canvas: Canvas, posX: Float, posY: Float) { + if (chartView == null) { + super.draw(canvas, posX, posY) + return + } + + val saveId = canvas.save() + canvas.translate(posX, posY) + + canvas.drawBitmap(dotBitmap, -dotBitmap.width / 2f, -dotBitmap.height / 2f, null) + + draw(canvas) + canvas.restoreToCount(saveId) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_chart_dot.xml b/app/src/main/res/drawable/ic_chart_dot.xml new file mode 100644 index 0000000..32dc2ed --- /dev/null +++ b/app/src/main/res/drawable/ic_chart_dot.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index 990497e..64c1b6c 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -76,6 +76,7 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" + android:text="1.99" android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..036d09b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..add46fb --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..afb59d2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9f921f2 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..2d0b7ee --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..46d222d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..83f9d55 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..7d22dcf --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..c404549 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..eeb1999 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a695..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..1b18545 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..f1538ec --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..a79100e --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f50..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..42a776f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d642..0000000 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..2d10cdd --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..a96d39f --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9126ae3..0000000 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp +++ /dev/null Binary files differ diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..c5d5899 --- /dev/null +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file