From b9cc7390e8e8ce64c41c26fb369c98ce669d660c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 15:02:30 +0800
Subject: [PATCH] Merge branch '1.2.0'
---
app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java | 77 +++++++++++++++++++++++++-------------
1 files changed, 50 insertions(+), 27 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java b/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java
index f5ce3d4..52419e6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java
@@ -72,18 +72,19 @@
"rgba(56,196,148,0.5)",//娣辩矇鑹�, alpha 閫忔槑搴�1
"rgba(255,255,255,0)"//鐑儏鐨勭矇绾�, alpha 閫忔槑搴� 0.1
);
-// try {
-// if (data.length > 0) {
-// for (int i = data.length - 1; i >= 0; i--) {
-// if (!(Double.parseDouble(data[i].toString()) == 0)) {
-// break;
-// }
-// data[i] = null;
-// }
-// }
-// } catch (Exception ignored) {
-//
-// }
+ boolean isValue = false;
+ try {
+ if (data.length > 0) {
+ for (int i = data.length - 1; i >= 0; i--) {
+ if (!(Double.parseDouble(data[i].toString()) == 0)) {
+ isValue = true;
+ break;
+ }
+ }
+ }
+ } catch (Exception ignored) {
+ isValue = true;
+ }
//棰滆壊瀛楃涓茶缃敮鎸佸崄鍏繘鍒剁被鍨嬪拰 rgba 绫诲瀷
AAStyle aaStyle = new AAStyle();
@@ -109,24 +110,46 @@
// AASeriesElement element2 = new AASeriesElement();
// .name("NewYork")
// .data(new Object[]{0.45, 0.43, 0.50, 0.55, 0.58, 0.62, 0.83, 0.39, 0.56, 0.67, 0.50, 0.34, 0.50, 0.67, 0.58, 0.29, 0.46, 0.23, 0.47, 0.46, 0.38, 0.56, 0.48, 0.36});
- return configureBasicOptions()
- .backgroundColor("#1C1C1E")
- .legendEnabled(false)
- .markerRadius(0)
+
+ if (isValue) {
+ return configureBasicOptions()
+ .backgroundColor("#1C1C1E")
+ .legendEnabled(false)
+ .markerRadius(0)
// .markerSymbol(AAChartSymbolType.Circle)
// .markerSymbolStyle(AAChartSymbolStyleType.Normal)
- .chartType(AAChartType.Area)
- .categories(categories)
- .zoomType(AAChartZoomType.None)//鎵嬪娍缂╂斁
- .yAxisGridLineWidth(0.10)
- .yAxisAllowDecimals(true)
- .xAxisVisible(true)
- .xAxisLineWidth(0)
-// .yAxisMax(100)
- .yAxisMin(0)
- .titleStyle(aaStyle)//鍧愭爣杞村瓧浣撻鑹�
+ .chartType(AAChartType.Area)
+ .categories(categories)
+ .zoomType(AAChartZoomType.None)//鎵嬪娍缂╂斁
+ .yAxisGridLineWidth(0.10)
+ .yAxisAllowDecimals(true)
+ .xAxisVisible(true)
+ .xAxisLineWidth(0)
+// .yAxisMax(10)
+ .yAxisMin(0)
+ .titleStyle(aaStyle)//鍧愭爣杞村瓧浣撻鑹�
// .axesTextColor("#FFFFFF")//鑳屾櫙棰滆壊
- .series(new AASeriesElement[]{element1});
+ .series(new AASeriesElement[]{element1});
+ } else {
+ return configureBasicOptions()
+ .backgroundColor("#1C1C1E")
+ .legendEnabled(false)
+ .markerRadius(0)
+// .markerSymbol(AAChartSymbolType.Circle)
+// .markerSymbolStyle(AAChartSymbolStyleType.Normal)
+ .chartType(AAChartType.Area)
+ .categories(categories)
+ .zoomType(AAChartZoomType.None)//鎵嬪娍缂╂斁
+ .yAxisGridLineWidth(0.10)
+ .yAxisAllowDecimals(true)
+ .xAxisVisible(true)
+ .xAxisLineWidth(0)
+ .yAxisMax(10)//閮芥槸0鏃讹紝涓轰簡鍜宨os鏍峰紡缁熶竴
+ .yAxisMin(0)
+ .titleStyle(aaStyle)//鍧愭爣杞村瓧浣撻鑹�
+// .axesTextColor("#FFFFFF")//鑳屾櫙棰滆壊
+ .series(new AASeriesElement[]{element1});
+ }
}
--
Gitblit v1.8.0