From 3726cf632a28444ebbde344062bc92a0fe7ad85a Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期二, 04 六月 2024 10:33:30 +0800 Subject: [PATCH] 2024年06月04日10:33:10 --- app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 2 +- app/src/main/res/values-zh/strings.xml | 2 +- app/src/main/res/layout/fragment_home_page.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/values-en/strings.xml | 2 +- app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java | 2 +- app/src/main/res/layout/item_plant_details.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java index 37bfc80..f4d8c36 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java @@ -60,7 +60,7 @@ HouseIdBean houseIdBean = this.mList.get(position); holder.homeNameTv.setText(houseIdBean.getHomeName().trim()); //瑁呮満瀹归噺 - String capacity = mContext.getString(R.string.my_power_station_installed_capacity) + ":" + HdlCommonLogic.getConvertDoubleUnit(houseIdBean.getInstalledCapacity(), UnitType.kWp); + String capacity = mContext.getString(R.string.string_capacity) + ":" + HdlCommonLogic.getConvertDoubleUnit(houseIdBean.getInstalledCapacity(), UnitType.kWp); holder.capacityTv.setText(capacity); //鍙戠數鍔熺巼 holder.power_value_tv.setText(HdlCommonLogic.getConvertDoubleUnit(houseIdBean.getPower(), UnitType.kW)); 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 11422ae..f42953a 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 @@ -417,7 +417,7 @@ String dataStr = TimeUtils.getDateTimestamp(TimeUtils.getCurrentTimestamp(), TimeUtils.getTimeDateFormat(timeType)); viewBinding.yearMonthDayTv.setText(dataStr); - String installed_capacity = getString(R.string.my_power_station_installed_capacity) + "(" + UnitType.kWp + ")"; + String installed_capacity = getString(R.string.string_capacity) + "(" + UnitType.kWp + ")"; viewBinding.infoRl1Text2Tv.setText(installed_capacity); String generated_power = getString(R.string.generated_power) + "(" + UnitType.kW + ")"; viewBinding.infoRl1Text4Tv.setText(generated_power); diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml index 80bdd5d..9d227d0 100644 --- a/app/src/main/res/layout/fragment_home_page.xml +++ b/app/src/main/res/layout/fragment_home_page.xml @@ -146,7 +146,7 @@ android:layout_below="@+id/info_rl1_text1_tv" android:layout_alignStart="@+id/info_rl1_text1_tv" android:layout_marginTop="3dp" - android:text="@string/my_power_station_installed_capacity" /> + android:text="@string/string_capacity" /> <TextView android:id="@+id/info_rl1_text3_tv" diff --git a/app/src/main/res/layout/item_plant_details.xml b/app/src/main/res/layout/item_plant_details.xml index 260a010..1b7cf5e 100644 --- a/app/src/main/res/layout/item_plant_details.xml +++ b/app/src/main/res/layout/item_plant_details.xml @@ -54,7 +54,7 @@ android:layout_alignStart="@+id/device_details_name_tv" android:layout_marginTop="@dimen/dp_3" android:gravity="center_vertical" - android:text="@string/my_power_station_installed_capacity" + android:text="@string/string_capacity" android:textColor="@color/text_66000000" android:textSize="@dimen/text_12" /> diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index ae8959d..635e3f8 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -77,7 +77,7 @@ <string name="power_station_generated_power">Power generation</string> <string name="power_station_Power_generation_today">Today power generation</string> <string name="power_station_creation_time">Established at</string> - <string name="my_power_station_installed_capacity">Installed capacity</string> + <string name="my_power_station_installed_capacity1">Installed capacity</string> <string name="my_power_station_connecting">Connecting</string> <string name="my_power_station_off_line">Offline</string> <string name="my_power_station_malfunction">Malfunction</string> diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 9a26a99..9512341 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -77,7 +77,7 @@ <string name="power_station_generated_power">鍙戠數鍔熺巼</string> <string name="power_station_Power_generation_today">浠婃棩鍙戠數</string> <string name="power_station_creation_time">鍒涘缓鏃堕棿</string> - <string name="my_power_station_installed_capacity">瑁呮満瀹归噺</string> + <string name="my_power_station_installed_capacity1">瑁呮満瀹归噺</string> <string name="my_power_station_connecting">杩炴帴涓�</string> <string name="my_power_station_off_line">绂荤嚎</string> <string name="my_power_station_malfunction">鏁呴殰</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 30a410c..c8f526f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -77,7 +77,7 @@ <string name="power_station_generated_power">鍙戠數鍔熺巼</string> <string name="power_station_Power_generation_today">浠婃棩鍙戠數</string> <string name="power_station_creation_time">鍒涘缓鏃堕棿</string> - <string name="my_power_station_installed_capacity">瑁呮満瀹归噺</string> + <string name="my_power_station_installed_capacity1">瑁呮満瀹归噺</string> <string name="my_power_station_connecting">杩炴帴涓�</string> <string name="my_power_station_off_line">绂荤嚎</string> <string name="my_power_station_malfunction">鏁呴殰</string> -- Gitblit v1.8.0