From 81a95bb98f3c2d22d40cc22158883b63c79a4ed6 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 30 十二月 2024 16:51:00 +0800
Subject: [PATCH] 2024年12月30日16:50:58
---
app/src/main/res/drawable/progress_small.xml | 4 +---
app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java | 2 +-
app/src/main/java/com/hdl/photovoltaic/widget/BTypeTitleListDialog.java | 2 +-
app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java | 2 +-
app/src/main/res/drawable/circular_progress_bar.xml | 25 +++++++++++++++++++++++++
app/src/main/res/layout/dialog_default_filtering.xml | 4 ++--
6 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java b/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java
index 84c22ac..42a1fac 100644
--- a/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java
+++ b/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java
@@ -8,7 +8,7 @@
public class AppConfigManage {
/*********鏄惁姝ｅ紡鏈嶅姟鍣�*********/
- private static final boolean isOnlineServer = false;
+ private static final boolean isOnlineServer = true;
/*********姝ｅ紡鐜*********/
private static final String APP_KEY_ONLINE = "CSZEMDJL";
private static final String APP_SECRET_ONLINE = "CSZEMDKBCSZEMDKR";
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 28ebf77..0fe0505 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
@@ -86,7 +86,7 @@
.name(tipSuspendName)
// .colorByPoint(true)
.color(AARgba(56, 196, 148, 1.0f))//鐚╃孩鑹�, alpha 閫忔槑搴� 1
-// .lineWidth(1.5)
+ .lineWidth(1.5)
// .borderColor(AARgba(255,255,255,1.0f))
.fillColor(linearGradientColor)
// .fillOpacity(0.5)//鍖哄煙鑳屾櫙閫忔槑搴︼紝璁剧疆0鐨勮瘽鐪嬩笉鍒板尯鍩熻儗鏅�
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/BTypeTitleListDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/BTypeTitleListDialog.java
index 54d23da..28d1d55 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/BTypeTitleListDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/BTypeTitleListDialog.java
@@ -46,7 +46,7 @@
layoutParams.gravity = Gravity.START | Gravity.TOP;
layoutParams.width = (int) UnitConversionUtils.dpToPx(mContext, 375 - 32);
layoutParams.x = (int) UnitConversionUtils.dpToPx(mContext, 16);
- layoutParams.y = (int) UnitConversionUtils.dpToPx(mContext, 200-5);
+ layoutParams.y = (int) UnitConversionUtils.dpToPx(mContext, 137+44);
window.setAttributes(layoutParams);
}
viewBinding = DialogTypeTitleListBBinding.inflate(getLayoutInflater());
diff --git a/app/src/main/res/drawable/circular_progress_bar.xml b/app/src/main/res/drawable/circular_progress_bar.xml
new file mode 100644
index 0000000..2fa47a8
--- /dev/null
+++ b/app/src/main/res/drawable/circular_progress_bar.xml
@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M12,3.5c-5.3,0 -9.5,4.2 -9.5,9.5 0,5.3 4.2,9.5 9.5,9.5 5.3,0 9.5,-4.2 9.5,-9.5 0,-5.3 -4.2,-9.5 -9.5,-9.5z"
+ android:strokeWidth="2"
+ android:strokeColor="#000000"
+ android:trimPathStart="0"
+ android:trimPathEnd="0" />
+
+ <rotate
+ android:fromDegrees="270"
+ android:toDegrees="270"
+ android:pivotX="12"
+ android:pivotY="12">
+ <shape android:shape="ring" android:innerRadiusRatio="3" android:thicknessRatio="10" android:useLevel="false">
+ <solid android:color="#000000"/>
+ </shape>
+ </rotate>
+
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/progress_small.xml b/app/src/main/res/drawable/progress_small.xml
index 152951b..7f40da2 100644
--- a/app/src/main/res/drawable/progress_small.xml
+++ b/app/src/main/res/drawable/progress_small.xml
@@ -3,9 +3,7 @@
android:fromDegrees="0"
android:pivotX="50%"
android:pivotY="50%"
- android:toDegrees="1440"
-
- >
+ android:toDegrees="1440">
<shape
android:innerRadiusRatio="3"
android:shape="ring"
diff --git a/app/src/main/res/layout/dialog_default_filtering.xml b/app/src/main/res/layout/dialog_default_filtering.xml
index 6a2f34b..96c152e 100644
--- a/app/src/main/res/layout/dialog_default_filtering.xml
+++ b/app/src/main/res/layout/dialog_default_filtering.xml
@@ -83,7 +83,7 @@
android:layout_marginTop="@dimen/dp_18"
android:text="@string/string_capacity"
android:textColor="@color/text_FF8E8E8E"
- android:textSize="@dimen/text_16"
+ android:textSize="@dimen/text_14"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cancel_affirm_cl" />
@@ -262,7 +262,7 @@
android:layout_marginTop="167dp"
android:text="@string/grid_connected_state"
android:textColor="@color/text_FF8E8E8E"
- android:textSize="@dimen/text_16"
+ android:textSize="@dimen/text_14"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
<!--鍏ㄩ儴-->
--
Gitblit v1.8.0