From 1a5f683977ee3a486449331bca467c8a69d98bf9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 09 十二月 2024 17:58:36 +0800
Subject: [PATCH] 2024年12月09日17:58:35
---
app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 2 +-
app/src/main/res/values-zh/strings.xml | 4 +++-
app/src/main/res/values/strings.xml | 4 +++-
app/src/main/res/values-en/strings.xml | 12 +++++++-----
app/src/main/res/layout/dialog_default_filtering.xml | 5 +++--
5 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
index 08d54a1..4afa1d3 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
@@ -500,7 +500,7 @@
}
viewBinding.stationAllTotalTv.setText(HdlCommonLogic.convertString(statusOverviewBean.getTotal()));
viewBinding.stationFaultsTotalTv.setText(HdlCommonLogic.convertString(statusOverviewBean.getFault()));
- viewBinding.stationOfflineTitleTv.setText(HdlCommonLogic.convertString(statusOverviewBean.getOffline()));
+ viewBinding.stationOfflineTotalTv.setText(HdlCommonLogic.convertString(statusOverviewBean.getOffline()));
viewBinding.stationConnectedTotalTv.setText(HdlCommonLogic.convertString(statusOverviewBean.getConnecting()));
}
diff --git a/app/src/main/res/layout/dialog_default_filtering.xml b/app/src/main/res/layout/dialog_default_filtering.xml
index 982d567..7132e73 100644
--- a/app/src/main/res/layout/dialog_default_filtering.xml
+++ b/app/src/main/res/layout/dialog_default_filtering.xml
@@ -59,8 +59,7 @@
android:text="@string/filtering"
android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/dp_18"
- android:visibility="gone"
- />
+ android:visibility="gone" />
<LinearLayout
android:id="@+id/affirm_ll"
@@ -117,6 +116,7 @@
android:layout_marginStart="@dimen/dp_20"
android:background="@drawable/config_129"
android:gravity="center"
+ android:hint="@string/min"
android:inputType="number"
android:textColor="@color/text_E6FFFFFF"
android:textColorHint="@color/text_66FFFFFF"
@@ -139,6 +139,7 @@
android:layout_marginEnd="@dimen/dp_20"
android:background="@drawable/config_129"
android:gravity="center"
+ android:hint="@string/max"
android:inputType="number"
android:textColor="@color/text_E6FFFFFF"
android:textColorHint="@color/text_66FFFFFF"
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 762db1f..86e0bd6 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -179,7 +179,7 @@
<string name="loading_agree">Agree to login</string>
<string name="loading_on_agree">Disagree</string>
<string name="loading_privacy">Privacy policy and terms of service</string>
- <string name="loading_privacy_server">To better protect your legitimate rights and interests, please read and agree to the following agreements 銆奝rivacy Policy銆� and 銆奣erms of Service銆嬨��</string>
+ <string name="loading_privacy_server">To better protect your legitimate rights and interests, please read and agree to the following agreements 銆奝rivacy Policy銆� and 銆奣erms of Service銆�.</string>
<string name="kill_app">Press again to exit </string>
<string name="loading_not_supported">Sorry, not supported yet</string>
<string name="loading_title_tip">Prompt</string>
@@ -274,7 +274,7 @@
<string name="month_power_generation">This month</string>
<string name="year_power_generation">This year</string>
<string name="cumulative_power_generation">Total</string>
- <string name="generated_power">Generation</string>
+ <string name="generated_power">Rated power</string>
<string name="generation">Generation</string>
<string name="station_name">Name</string>
<string name="search">Search</string>
@@ -294,12 +294,12 @@
<string name="email_address">Email</string>
<string name="successful_replication">Copied to clipboard</string>
<string name="to_be_added">Installing</string>
- <string name="saving_standard_coal">Standard Coal Saved</string>
+ <string name="saving_standard_coal">Coal Saved</string>
<string name="co_reduction_rate">CO2 Emission Saved</string>
<string name="quantity_of_equivalent_values">Equivalent Trees Planted</string>
- <string name="pv_power">Generation capacity</string>
+ <string name="pv_power">Rated power</string>
<string name="device_run_state">equipment operational Status</string>
- <string name="search_station">Search Plants</string>
+ <string name="search_station">Search plants</string>
<string name="enter_the_device_sn_and_device_name">Enter the device SN/device name</string>
<string name="enter_alarm_name">Enter alarm name</string>
<string name="device">Device</string>
@@ -331,5 +331,7 @@
<string name="device_debugging">Device debugging</string>
<string name="save_to_album">Save to album</string>
<string name="radio">Radio</string>
+ <string name="min">Min</string>
+ <string name="max">Max</string>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 769be03..53c70ea 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -178,7 +178,7 @@
<string name="loading_agree">鍚屾剰骞剁櫥褰�</string>
<string name="loading_on_agree">涓嶅悓鎰�</string>
<string name="loading_privacy">闅愮鏉冩斂绛栧強鏈嶅姟鏉℃</string>
- <string name="loading_privacy_server">涓轰簡鏇村ソ鐨勪繚闅滄偍鐨勫悎娉曟潈鐩婏紝璇锋偍闃呰骞跺悓鎰忎互涓嬪崗璁�婄敤鎴峰崗璁�嬪拰銆婇殣绉佸崗璁�嬨��</string>
+ <string name="loading_privacy_server">涓轰簡鏇村ソ鐨勪繚闅滄偍鐨勫悎娉曟潈鐩婏紝璇锋偍闃呰骞跺悓鎰忎互涓嬪崗璁�婄敤鎴峰崗璁�嬪拰銆婇殣绉佸崗璁��.</string>
<string name="kill_app">鍐嶆寜涓�娆￠��鍑哄簲鐢�</string>
<string name="loading_not_supported">鎶辨瓑,鏆備笉鏀寔</string>
<string name="loading_title_tip">鎻愮ず</string>
@@ -328,6 +328,8 @@
<string name="device_debugging">璁惧璋冩祴</string>
<string name="save_to_album">淇濆瓨鑷崇浉鍐�</string>
<string name="radio">姣旂巼</string>
+ <string name="min">鏈�灏忓��</string>
+ <string name="max">鏈�澶у��</string>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a834b3b..53c70ea 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -178,7 +178,7 @@
<string name="loading_agree">鍚屾剰骞剁櫥褰�</string>
<string name="loading_on_agree">涓嶅悓鎰�</string>
<string name="loading_privacy">闅愮鏉冩斂绛栧強鏈嶅姟鏉℃</string>
- <string name="loading_privacy_server">涓轰簡鏇村ソ鐨勪繚闅滄偍鐨勫悎娉曟潈鐩婏紝璇锋偍闃呰骞跺悓鎰忎互涓嬪崗璁�娿�婄敤鎴峰崗璁�嬪拰銆婇殣绉佸崗璁�嬨��</string>
+ <string name="loading_privacy_server">涓轰簡鏇村ソ鐨勪繚闅滄偍鐨勫悎娉曟潈鐩婏紝璇锋偍闃呰骞跺悓鎰忎互涓嬪崗璁�婄敤鎴峰崗璁�嬪拰銆婇殣绉佸崗璁��.</string>
<string name="kill_app">鍐嶆寜涓�娆￠��鍑哄簲鐢�</string>
<string name="loading_not_supported">鎶辨瓑,鏆備笉鏀寔</string>
<string name="loading_title_tip">鎻愮ず</string>
@@ -328,6 +328,8 @@
<string name="device_debugging">璁惧璋冩祴</string>
<string name="save_to_album">淇濆瓨鑷崇浉鍐�</string>
<string name="radio">姣旂巼</string>
+ <string name="min">鏈�灏忓��</string>
+ <string name="max">鏈�澶у��</string>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0