From 336727de9db9401a0ed0bb5e0caf080d2e69f850 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期四, 26 六月 2025 11:59:19 +0800 Subject: [PATCH] 2025年06月26日11:59:15 --- app/src/main/res/values-zh/strings.xml | 2 +- app/src/main/res/values/strings.xml | 1 + app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java | 8 +++++++- app/src/main/res/values-en/strings.xml | 1 + 4 files changed, 10 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 49f2262..1c17dc3 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 @@ -127,10 +127,16 @@ houseListAdapter.setDelOnclickListener(new HouseListAdapter.OnDelClickListener() { @Override public void onDelClick(int position, HouseIdBean houseIdBean) { + if (houseIdBean.isOtherShare()) { + //鍒嗕韩杩囨潵鐨勭數绔欎笉鑳藉垹闄� + HdlThreadLogic.toast(_mActivity, getString(R.string.no_permission_delete_home)); + return; + } + DelayedConfirmationCancelDialog delayedConfirmationCancelDialog = new DelayedConfirmationCancelDialog(_mActivity); delayedConfirmationCancelDialog.show(); delayedConfirmationCancelDialog.isHideTitle(true); - String del_home = getString(R.string.confirm_deletion) + "\"" + houseIdBean.getHomeName() + "\""+"?"; + String del_home = getString(R.string.confirm_deletion) + "\"" + houseIdBean.getHomeName() + "\"" + "?"; delayedConfirmationCancelDialog.setContent(del_home); // delayedConfirmationCancelDialog.startCountdown(4); diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 362b7b0..497a714 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -366,4 +366,5 @@ <string name="no_network_mode">No network mode</string> <string name="confirm_deletion">Delete confirmation required</string> <string name="no_network_mode_tip">Before using the offline mode, please make sure that the phone and the device are in the same local area network, otherwise it will not work properly. You can try the following two methods:\n\n1. Connect the phone to the device hotspot;\n\n2. Connect the phone to the router Wi-Fi, and the device to the router LAN port via an Ethernet cable.</string> + <string name="no_permission_delete_home">No permission to delete, please contact the administrator for operation</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 382dddf..1f69248 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -362,5 +362,5 @@ <string name="no_network_mode">鏃犵綉妯″紡</string> <string name="confirm_deletion">纭畾闇�瑕佸垹闄�</string> <string name="no_network_mode_tip">浣跨敤鏃犵綉妯″紡鍓嶏紝璇风‘淇濇墜鏈轰笌璁惧澶勪簬鍚屼竴灞�鍩熺綉鍐咃紝鍚﹀垯灏嗘棤娉曟甯镐娇鐢紝浣犲彲浠ュ皾璇曚互涓嬩袱绉嶆柟寮忥細\n\n1.鎵嬫満杩炴帴璁惧鐑偣锛沑n\n2.鎵嬫満杩炴帴璺敱鍣╓i-Fi锛岃澶囬�氳繃缃戠嚎鎺ュ叆璺敱鍣↙AN鍙c��</string> - + <string name="no_permission_delete_home">鏃犳潈闄愬垹闄わ紝璇疯仈绯荤鐞嗗憳杩涜鎿嶄綔</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 cb3c3d2..daebeaa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -368,6 +368,7 @@ <string name="no_network_mode">No network mode</string> <string name="confirm_deletion">Delete confirmation required</string> <string name="no_network_mode_tip">Before using the offline mode, please make sure that the phone and the device are in the same local area network, otherwise it will not work properly. You can try the following two methods:\n\n1. Connect the phone to the device hotspot;\n\n2. Connect the phone to the router Wi-Fi, and the device to the router LAN port via an Ethernet cable.</string> + <string name="no_permission_delete_home">No permission to delete, please contact the administrator for operation</string> -- Gitblit v1.8.0