From f50e8e60e9da99e4f69d8ab76810dc7e5fb448bc Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 02 十二月 2024 10:29:09 +0800
Subject: [PATCH] 2024年12月02日10:29:05
---
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java | 2 --
app/src/main/res/drawable/tip_fail.png | 0
app/src/main/res/layout/fragment_home_page.xml | 4 +++-
app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java | 17 ++++++++++++++---
app/src/main/res/drawable/dialog_flashing_box.xml | 4 ++--
app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/CustomStyleChartComposer.java | 3 ++-
app/src/main/res/drawable/tip_succeed.png | 0
7 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
index 5547160..33a4d7b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -59,8 +59,6 @@
@Override
public Object getContentView() {
-
- setNotificationBarBackgroundColor(CustomColor.blue);
viewBinding = ActivityHomeLoginBinding.inflate(getLayoutInflater());
return viewBinding.getRoot();
}
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 df72e80..07db5b1 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
@@ -9,7 +9,9 @@
import com.github.AAChartModel.AAChartCore.AAChartEnum.AAChartSymbolType;
import com.github.AAChartModel.AAChartCore.AAChartEnum.AAChartType;
import com.github.AAChartModel.AAChartCore.AAChartEnum.AAChartZoomType;
+import com.github.AAChartModel.AAChartCore.AAOptionsModel.AAChart;
import com.github.AAChartModel.AAChartCore.AAOptionsModel.AAStyle;
+import com.github.AAChartModel.AAChartCore.AAOptionsModel.AATitle;
import com.github.AAChartModel.AAChartCore.AAOptionsModel.AATooltip;
import com.github.AAChartModel.AAChartCore.AATools.AAColor;
import com.github.AAChartModel.AAChartCore.AATools.AAGradientColor;
@@ -23,7 +25,7 @@
.backgroundColor("#EDEFF2")
// .backgroundColor("#4b2b7f")
.dataLabelsEnabled(false)
- .yAxisGridLineWidth(1)
+ .yAxisGridLineWidth(0.5)
.touchEventEnabled(true);
}
@@ -68,10 +70,17 @@
AALinearGradientDirection.ToBottom,
"rgba(56,196,148,0.5)",//娣辩矇鑹�, alpha 閫忔槑搴�1
"rgba(255,255,255,0)"//鐑儏鐨勭矇绾�, alpha 閫忔槑搴� 0.1
- );//棰滆壊瀛楃涓茶缃敮鎸佸崄鍏繘鍒剁被鍨嬪拰 rgba 绫诲瀷
+ );
+ //棰滆壊瀛楃涓茶缃敮鎸佸崄鍏繘鍒剁被鍨嬪拰 rgba 绫诲瀷
+// AAStyle aaStyle = new AAStyle();
+// aaStyle.color("#FFFFFFFF");
+// aaStyle.background("#FF555859");
+
+
AATooltip aaTooltip = new AATooltip()
.enabled(true)
.valueDecimals(2);
+
AASeriesElement element1 = new AASeriesElement()
.name(tipSuspendName)
// .colorByPoint(true)
@@ -87,7 +96,7 @@
// .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("#EDEFF2")
+ .backgroundColor("#333738")
.legendEnabled(false)
.markerRadius(0)
// .markerSymbol(AAChartSymbolType.Circle)
@@ -97,6 +106,8 @@
.zoomType(AAChartZoomType.None)//鎵嬪娍缂╂斁
// .yAxisMax(100)
.yAxisMin(0)
+ .titleStyle(AAStyle.style("#66FFFFFF", 12))//鍧愭爣杞村瓧浣撻鑹�
+// .axesTextColor("#FFFFFF")//鑳屾櫙棰滆壊
.series(new AASeriesElement[]{element1});
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/CustomStyleChartComposer.java b/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/CustomStyleChartComposer.java
index 5cc68c7..9dc8de9 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/CustomStyleChartComposer.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/CustomStyleChartComposer.java
@@ -197,7 +197,8 @@
.valueDecimals(2);
return new AAChartModel()
.chartType(AAChartType.Column)
- .backgroundColor("#EDEFF2")
+ .backgroundColor("#333738")
+ .titleStyle(AAStyle.style("#66FFFFFF", 12))//鍧愭爣杞村瓧浣撻鑹�
.colorsTheme(new String[]{"#38C494",})
.categories(categories)
.xAxisLabelsEnabled(true)
diff --git a/app/src/main/res/drawable/dialog_flashing_box.xml b/app/src/main/res/drawable/dialog_flashing_box.xml
index 0b6f1ba..edb61a3 100644
--- a/app/src/main/res/drawable/dialog_flashing_box.xml
+++ b/app/src/main/res/drawable/dialog_flashing_box.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
-<corners android:radius="@dimen/dp_4"/>
- <solid android:color="#000000"/>
+<corners android:radius="@dimen/dp_13"/>
+ <solid android:color="#80000000"/>
</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tip_fail.png b/app/src/main/res/drawable/tip_fail.png
index 778a759..9b8e47e 100644
--- a/app/src/main/res/drawable/tip_fail.png
+++ b/app/src/main/res/drawable/tip_fail.png
Binary files differ
diff --git a/app/src/main/res/drawable/tip_succeed.png b/app/src/main/res/drawable/tip_succeed.png
index d9a4794..81a0f9e 100644
--- a/app/src/main/res/drawable/tip_succeed.png
+++ b/app/src/main/res/drawable/tip_succeed.png
Binary files differ
diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml
index 37c28a7..c93e5f0 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -525,8 +525,8 @@
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_16"
- android:paddingBottom="@dimen/dp_16"
android:background="@drawable/bj_ff333738"
+ android:paddingBottom="@dimen/dp_16"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_page_station_info_cl">
@@ -730,7 +730,9 @@
<FrameLayout
android:layout_width="0dp"
android:layout_height="284dp"
+ android:layout_marginStart="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_18"
+ android:layout_marginEnd="@dimen/dp_4"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/chart_title_rl">
--
Gitblit v1.8.0