From eb8097cb8517726094115410777083d5f63701f0 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期三, 15 五月 2024 15:08:54 +0800 Subject: [PATCH] 2024年05月15日15:08:47 --- app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/CustomStyleChartComposer.java | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/aachart/CustomStyleChartComposer.java b/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/CustomStyleChartComposer.java similarity index 99% rename from app/src/main/java/com/hdl/photovoltaic/ui/powerstation/aachart/CustomStyleChartComposer.java rename to app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/CustomStyleChartComposer.java index 3dfc464..102353a 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/aachart/CustomStyleChartComposer.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/CustomStyleChartComposer.java @@ -1,10 +1,6 @@ -package com.hdl.photovoltaic.ui.powerstation.aachart; +package com.hdl.photovoltaic.ui.home.aachart; import static com.github.AAChartModel.AAChartCore.AATools.AAColor.AARgba; -import static com.hdl.photovoltaic.ui.powerstation.aachart.AAChartSymbolConst.base64Symbol; -import static com.hdl.photovoltaic.ui.powerstation.aachart.AAChartSymbolConst.imageSymbol; -import static com.hdl.photovoltaic.ui.powerstation.aachart.AAChartSymbolConst.predefinedSymbol1; -import static com.hdl.photovoltaic.ui.powerstation.aachart.AAChartSymbolConst.predefinedSymbol2; import com.github.AAChartModel.AAChartCore.AAChartCreator.AAChartModel; import com.github.AAChartModel.AAChartCore.AAChartCreator.AASeriesElement; @@ -444,25 +440,25 @@ .name("Predefined symbol") .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}) .marker(new AAMarker() - .symbol(predefinedSymbol1)); + .symbol(AAChartSymbolConst.predefinedSymbol1)); AASeriesElement element2 = new AASeriesElement() .name("Image symbol") .data(new Object[]{0.38, 0.31, 0.32, 0.32, 0.64, 0.66, 0.86, 0.47, 0.52, 0.75, 0.52, 0.56, 0.54, 0.60, 0.46, 0.63, 0.54, 0.51, 0.58, 0.64, 0.60, 0.45, 0.36, 0.67}) .marker(new AAMarker() - .symbol(imageSymbol)); + .symbol(AAChartSymbolConst.imageSymbol)); AASeriesElement element3 = new AASeriesElement() .name("Base64 symbol (*)") .data(new Object[]{0.46, 0.32, 0.53, 0.58, 0.86, 0.68, 0.85, 0.73, 0.69, 0.71, 0.91, 0.74, 0.60, 0.50, 0.39, 0.67, 0.55, 0.49, 0.65, 0.45, 0.64, 0.47, 0.63, 0.64}) .marker(new AAMarker() - .symbol(base64Symbol)); + .symbol(AAChartSymbolConst.base64Symbol)); AASeriesElement element4 = new AASeriesElement() .name("Custom symbol") .data(new Object[]{0.60, 0.51, 0.52, 0.53, 0.64, 0.84, 0.65, 0.68, 0.63, 0.47, 0.72, 0.60, 0.65, 0.74, 0.66, 0.65, 0.71, 0.59, 0.65, 0.77, 0.52, 0.53, 0.58, 0.53}) .marker(new AAMarker() - .symbol(predefinedSymbol2)); + .symbol(AAChartSymbolConst.predefinedSymbol2)); return new AAChartModel() .chartType(AAChartType.Scatter) -- Gitblit v1.8.0