From 0770fc4f03196a27e8f4c899a44da63bb1a683e2 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期四, 12 六月 2025 18:17:29 +0800 Subject: [PATCH] 2025年06月12日18:17:27 --- app/src/main/res/values-zh/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java | 4 ++-- app/src/main/res/values-en/strings.xml | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java index 0c61f1e..49f2262 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java @@ -130,8 +130,8 @@ DelayedConfirmationCancelDialog delayedConfirmationCancelDialog = new DelayedConfirmationCancelDialog(_mActivity); delayedConfirmationCancelDialog.show(); delayedConfirmationCancelDialog.isHideTitle(true); - String homeName = "\"" + houseIdBean.getHomeName() + "\""; - delayedConfirmationCancelDialog.setContent(getString(R.string.delete_power_station).replace("%s", homeName)); + String del_home = getString(R.string.confirm_deletion) + "\"" + houseIdBean.getHomeName() + "\""+"?"; + delayedConfirmationCancelDialog.setContent(del_home); // delayedConfirmationCancelDialog.startCountdown(4); delayedConfirmationCancelDialog.setYesOnclickListener(new DelayedConfirmationCancelDialog.onYesOnclickListener() { diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 4daf569..6cf282b 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -364,4 +364,5 @@ <string name="signature_error_log_in_again">Signature error. Log in again</string> <string name="device_failed_to_certificate">Device failed to certificate</string> <string name="no_network_mode">No network mode</string> + <string name="confirm_deletion">Delete confirmation required</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 1f14bb9..48db3de 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -360,5 +360,6 @@ <string name="signature_error_log_in_again">绛惧悕閿欒,閲嶆柊鐧诲綍</string> <string name="device_failed_to_certificate">鏌ヨ璁惧璁よ瘉澶辫触</string> <string name="no_network_mode">鏃犵綉妯″紡</string> + <string name="confirm_deletion">纭畾闇�瑕佸垹闄�</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 675c026..e45b9f4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -366,6 +366,7 @@ <string name="signature_error_log_in_again">Signature error. Log in again</string> <string name="device_failed_to_certificate">Device failed to certificate</string> <string name="no_network_mode">No network mode</string> + <string name="confirm_deletion">Delete confirmation required</string> -- Gitblit v1.8.0