From ffb521e1ef0dd0802e08975d4f9a0daa5684ebbf Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期六, 22 六月 2024 16:14:46 +0800
Subject: [PATCH] 2024年06月22日16:14:41
---
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 28 +++++
app/src/main/java/com/hdl/photovoltaic/other/HdlMemberLogic.java | 12 +-
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java | 1
app/src/main/res/values-zh/strings.xml | 10 ++
app/src/main/res/values-en/strings.xml | 166 +++++++++++++++++---------------
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 26 +++++
app/src/main/java/com/hdl/photovoltaic/enums/UserRightType.java | 9 +
7 files changed, 168 insertions(+), 84 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/enums/UserRightType.java b/app/src/main/java/com/hdl/photovoltaic/enums/UserRightType.java
new file mode 100644
index 0000000..dd62062
--- /dev/null
+++ b/app/src/main/java/com/hdl/photovoltaic/enums/UserRightType.java
@@ -0,0 +1,9 @@
+package com.hdl.photovoltaic.enums;
+
+/**
+ * (B绔�)鍛樺伐鏉冮檺绫诲瀷
+ */
+public @interface UserRightType {
+ String MANAGER = "MANAGER";//鍏徃绠＄悊鍛�
+ String USER = "USER";// 鏅�氬憳宸�
+}
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlMemberLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlMemberLogic.java
index 5b476c4..5aca561 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlMemberLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlMemberLogic.java
@@ -120,7 +120,7 @@
* @param userId -
* @param cloudCallBeak -
*/
- public void getStaffInfo(String userId, CloudCallBeak<PageNumberObject<StaffBean>> cloudCallBeak) {
+ public void getStaffInfo(String userId, CloudCallBeak<StaffBean> cloudCallBeak) {
String requestUrl = HttpApi.B_POST_GET_MANAGE_INFO;
JsonObject json = new JsonObject();
json.addProperty("userId", userId);
@@ -129,15 +129,14 @@
public void onSuccess(String jsonStr) {
if (TextUtils.isEmpty(jsonStr)) {
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(new PageNumberObject<>());
+ cloudCallBeak.onSuccess(new StaffBean());
}
}
Gson gson = new Gson();
- Type type = new TypeToken<PageNumberObject<StaffBean>>() {
- }.getType();
- PageNumberObject<StaffBean> pageNumberObject = gson.fromJson(jsonStr, type);
+
+ StaffBean staffBean = gson.fromJson(jsonStr, StaffBean.class);
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(pageNumberObject);
+ cloudCallBeak.onSuccess(staffBean);
}
}
@@ -300,6 +299,7 @@
}
+
/**
* 娣诲姞鎴愬憳锛圕绔級
*
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index 49f9bb2..79f0d45 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -555,6 +555,13 @@
}
break;
+ //鍛樺伐璇︽儏鑾峰彇
+ case HDLUniMP.UNI_EVENT_REPLY_STAFF_DETAIL: {
+ uniGetStaffInfo(type, data, callback);
+
+ }
+
+ break;
//鍛樺伐鍒犻櫎
case HDLUniMP.UNI_EVENT_REPLY_STAFF_DELETE: {
@@ -857,6 +864,24 @@
}
/**
+ * 鑾峰彇鍛樺伐璇︽儏
+ */
+ private void uniGetStaffInfo(String type, Object data, DCUniMPJSCallback callback) {
+ String userId = getKeyValue("userId", getKeyValue("data", data));
+ HdlMemberLogic.getInstance().getStaffInfo(userId, new CloudCallBeak<StaffBean>() {
+ @Override
+ public void onSuccess(StaffBean obj) {
+ uniSuccessCallback(type, obj, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniExceptionCallback(type, e, callback);
+ }
+ });
+ }
+
+ /**
* 鑾峰彇鍛樺伐鍒楄〃
*/
private void uniGetStaffList(String type, Object data, DCUniMPJSCallback callback) {
@@ -875,6 +900,7 @@
});
}
+
/**
* 鎴愬憳缂栬緫
*/
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
index 56049cc..678f93d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
@@ -17,14 +17,17 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.FragmentMeBinding;
import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch;
+import com.hdl.photovoltaic.enums.UserRightType;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
+import com.hdl.photovoltaic.other.HdlMemberLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.bean.BUserInfo;
import com.hdl.photovoltaic.ui.bean.CUserInfo;
+import com.hdl.photovoltaic.ui.bean.UserRightTypeBean;
import com.hdl.photovoltaic.ui.test.TestMainActivity;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.GlideUtils;
@@ -302,6 +305,8 @@
} else {
this.getCMemberInfo();
}
+ getUserRightType();
+
}
}
@@ -309,6 +314,29 @@
}
/**
+ * 鍛樺伐鏉冮檺绫诲瀷(B绔�)
+ * MANAGER : 鍏徃绠＄悊鍛�
+ * USER 锛� 鏅�氬憳宸�
+ */
+ private void getUserRightType() {
+ HdlMemberLogic.getInstance().getUserRightType(new CloudCallBeak<UserRightTypeBean>() {
+ @Override
+ public void onSuccess(UserRightTypeBean obj) {
+// if (obj.getUserRightType().equals(UserRightType.MANAGER)) {
+// viewBinding.fragmentMeLineUserManagementIl.getRoot().setVisibility(View.VISIBLE);
+// } else {
+// viewBinding.fragmentMeLineUserManagementIl.getRoot().setVisibility(View.GONE);
+// }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+
+ }
+ });
+ }
+
+ /**
* 鑾峰彇鐢ㄦ埛鑷畾涔夐厤缃俯搴﹀崟浣嶈鎯�(app鍚姩鐨勬椂鍊欒鑾峰彇)
*/
private void getResidenceTemperatureUnit() {
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
index 9eacc56..6abe6c5 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
@@ -105,6 +105,7 @@
public final static String UNI_EVENT_REPLY_MEMBER_EDIT = "member_edit";//鎴愬憳缂栬緫锛堝寘鍚娉ㄣ�佹潈闄愪慨鏀癸級
public final static String UNI_EVENT_REPLY_STAFF_LIST = "staff_list";//鍛樺伐鍒楄〃
public final static String UNI_EVENT_REPLY_STAFF_ADD = "staff_add";//鍛樺伐娣诲姞
+ public final static String UNI_EVENT_REPLY_STAFF_DETAIL = "staff_detail";//鍛樺伐璇︽儏鑾峰彇
public final static String UNI_EVENT_REPLY_STAFF_DELETE = "staff_delete";//鍛樺伐鍒犻櫎
public final static String UNI_EVENT_REPLY_STAFF_EDIT = "staff_edit";//鍛樺伐缂栬緫
public final static String UNI_EVENT_REPLY_USERRIGHTTYPe = "user_right_type";//鑾峰彇褰撳墠璐﹀彿鍦ㄥ叕鍙哥殑韬唤
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 635e3f8..2d0183a 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -24,7 +24,7 @@
<string name="home_login_change_password">Change password</string>
<string name="home_login_logoin">Log in</string>
<string name="home_login_be_logging_in">Logging in鈥�</string>
- <string name="home_login_power_station">Guest mode</string>
+ <string name="home_login_power_station">Demo Sites</string>
<string name="home_login_consent_service_agreement">Agree to the 銆奡ervice Agreement銆� and 銆奤ser Information Protection Regulations銆�</string>
<string name="home_login_error_account_null">Account cannot be empty.</string>
<string name="home_login_error_password_null">Password cannot be empty.</string>
@@ -44,7 +44,7 @@
<string name="home_login_null_verification_code">Verification code cannot be empty.</string>
<string name="home_login_phone_null">Phone number cannot be empty.</string>
<string name="home_login_mail_null">Email cannot be empty.</string>
- <string name="home_login_psw_unlikeliness">Passwords do not match.</string>
+ <string name="home_login_psw_unlikeliness">The two passwords are different</string>
<string name="home_login_psw_verification_repeater">Resend later</string>
<string name="home_login_verification_regain">Reacquire</string>
<string name="home_login_pws_reset_succeeded"> Password reset successful</string>
@@ -59,10 +59,10 @@
<string name="home_login_input_old_pws">Please enter your current password</string>
<string name="home_login_input_new_pws">Please enter your new password</string>
<string name="home_login_input_affirm_psw">Please enter your new password again</string>
- <string name="home_login_input_unlike_psw">New password and confirm password do not match.</string>
+ <string name="home_login_input_unlike_psw">New password and confirm password are different</string>
<string name="home_login_change_name_succeed">Remark successfully updated.</string>
<string name="verification">Verification code</string>
- <string name="home_phone_number">Area code</string>
+ <string name="home_phone_number">Country Code</string>
<string name="home_chinese_mainland">Mainland China</string>
<string name="home_password_changed_successfully_log_in">The password has been successfully changed. Please log in again.</string>
<string name="home_old_password_not_new_password">The original password and the new password should not be identical.</string>
@@ -71,17 +71,17 @@
<!--鎴戠殑鐢电珯-->
<string name="power_shome_page">Homepage</string>
- <string name="power_station">Power station</string>
- <string name="power_station_me">Mine</string>
- <string name="my_power_station">My power station</string>
+ <string name="power_station">Plants</string>
+ <string name="power_station_me">Me</string>
+ <string name="my_power_station">My Plants</string>
<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="power_station_Power_generation_today">Yield Today</string>
+ <string name="power_station_creation_time">Startup Time</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>
- <string name="my_power_station_operation">Operating</string>
+ <string name="my_power_station_operation">Running</string>
<string name="my_power_station_await">Standby</string>
<string name="my_power_station_data_null">Data is empty, create one now!</string>
@@ -100,7 +100,7 @@
<string name="messagealarm_details_content">Alarm content</string>
<string name="messagealarm_details_device">Alarm device</string>
<string name="message_alarm_detailsaffect_region">Impact area</string>
- <string name="message_alarm_detailspower_station_location">Power station location</string>
+ <string name="message_alarm_detailspower_station_location">Plant location</string>
<string name="message_alarm_details_time">Alarm time</string>
<string name="message_alarm_details_back">Back</string>
<string name="message_alarm_details_resolved">Solved</string>
@@ -109,7 +109,7 @@
<!--鎴戠殑-->
- <string name="me">Mine</string>
+ <string name="me">Me</string>
<string name="me_set">Settings</string>
<string name="me_regard">About</string>
<string name="set_account">Account Security</string>
@@ -121,8 +121,8 @@
<string name="set_general_setting">General Settings</string>
<string name="set_multilingual">Multi-language</string>
<string name="set_data_centre">Data Center</string>
- <string name="set_system_rights_managemen">System Permissions Management</string>
- <string name="set_3_msg_sharing">Third-Party Information Sharing List</string>
+ <string name="set_system_rights_managemen">Permissions Management</string>
+ <string name="set_3_msg_sharing">Data Shared with Third-Parties</string>
<string name="set_account_security">Account and Security</string>
<string name="set_temperature_unit">Temperature Unit</string>
<string name="set_logout">Log Out</string>
@@ -150,7 +150,7 @@
<!--app鏇存柊-->
<string name="app_version_number">Version number</string>
- <string name="app_scan_code_download">Scan to download the Smart Energy App</string>
+ <string name="app_scan_code_download">app_scan_code_download</string>
<string name="app_version_upgrade">Version update</string>
<string name="app_new_version">Already the latest version</string>
<string name="app_service_agreement">Service agreement</string>
@@ -162,11 +162,11 @@
<string name="app_stop_current_download">Stop current download?</string>
<string name="app_version">Version</string>
<string name="app_package_size">Size</string>
- <string name="app_update_content">In order to upgrade the HDL APP normally, please click the Settings button to allow the installation of applications from unknown sources. This function is only available for APP upgrades. Android versions 11 and above need to be re-downloaded and installed after authorization.</string>
+ <string name="app_update_content">In order to upgrade the HDL APP successfully, please click the Settings button to allow the installation of applications from unknown sources. This function is only available for APP upgrades. Android versions 11 and above need to be re-downloaded and installed after authorization.</string>
<string name="app_update_fail">Authorization failed, unable to install the application</string>
<!--ota-->
- <string name="ota_binding_cloud_upgrade_fails">The inverter has not been bound before, upgrade failed.</string>
+ <string name="ota_binding_cloud_upgrade_fails">The inverter is not bound, upgrade failed</string>
<string name="ota_not_cloud_upgrade_fails">The inverter is not connected to the cloud, upgrade failed.</string>
@@ -180,8 +180,8 @@
<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="kill_app">Press again to exit the application</string>
- <string name="loading_not_supported">Sorry, not supported at the moment.</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>
<string name="loading_app_restart">Confirm to restart the App.</string>
<string name="loading_log_out">Confirm logout?</string>
@@ -195,9 +195,9 @@
<!-- 鍥剧墖涓婁紶 -->
<string name="camera_album_file_get_fial">Failed to retrieve image</string>
<string name="camera_album_system_fial">System failed to process image, please retry</string>
- <string name="apk_update_content">In order to upgrade the HDL APP normally, please click the Settings button to allow the installation of applications from unknown sources. This function is only available for APP upgrades. Android versions 11 and above need to be re-downloaded and installed after authorization.</string>
+ <string name="apk_update_content">In order to upgrade the APP successfully, please click the Settings button to allow the installation of applications from unknown sources. This function is only available for APP upgrades. Android versions 11 and above need to be re-downloaded and installed after authorization.</string>
<string name="apk_update_sure">Settings</string>
- <string name="permission_open">Please authorize permission in settings</string>
+ <string name="permission_open">Please go to Settings to enable permission</string>
<string name="please_go_set_permissions">Please set permissions.</string>
@@ -248,63 +248,73 @@
<string name="port_conflict">Application conflicts. You need to close onpro or other versions of debugging application and then restart the this to try</string>
- <string name="cancel_download_successfully">鍙栨秷涓嬭浇鎴愬姛.</string>
- <string name="writing_firmware_upgrade_memory_succeeded">鍐欏叆鏂板浐浠舵枃浠跺埌鍐呭瓨鎴愬姛.</string>
- <string name="download_firmware_upgrade_file_failed">涓嬭浇鍥轰欢鍗囩骇鏂囦欢澶辫触.</string>
- <string name="found_locally_firmware_upgrade_file">鏈湴鎵句笉鍒板崌绾у浐浠舵枃浠�,璇蜂笅杞藉ソ鍥轰欢鏂囦欢,鍐嶉噸鏂板崌绾�.</string>
- <string name="notify_gateway_firmware_upgrade_failed">閫氱煡缁欑綉鍏冲崌绾у浐浠舵枃浠跺湴鍧�澶辫触,鏃犳硶鍗囩骇.</string>
- <string name="local_service_fails">鏈湴鏈嶅姟鏈夊紓甯稿け璐�,鏃犳硶鍗囩骇.</string>
- <string name="writing_drive_memory_succeeded">鍐欏叆鏂伴┍鍔ㄦ枃浠跺埌鍐呭瓨鎴愬姛.</string>
- <string name="download_drive_file_failed">涓嬭浇椹卞姩鍗囩骇鏂囦欢澶辫触.</string>
- <string name="found_locally_drive_file">鏈湴鎵句笉鍒板崌绾ч┍鍔ㄦ枃浠�,璇蜂笅杞藉ソ椹卞姩鏂囦欢,鍐嶉噸鏂板崌绾�.</string>
- <string name="notify_gateway_drive_failed">閫氱煡缁欑綉鍏冲崌绾ч┍鍔ㄦ枃浠跺湴鍧�澶辫触,鏃犳硶鍗囩骇.</string>
- <string name="time_selectd">鏃堕棿閫夋嫨</string>
- <string name="life_cycle">鐢熷懡鏈�</string>
- <string name="year">骞�</string>
- <string name="month">鏈�</string>
- <string name="day">鏃�</string>
- <string name="hour">鏃�</string>
- <string name="minutc">鍒�</string>
- <string name="seconds">绉�</string>
- <string name="the_query_date_is_exceeded">瓒呭嚭鏌ヨ鏃ユ湡.</string>
- <string name="energy_generation_statistics">鍙戠數閲忕粺璁�</string>
- <string name="social_contribution">绀句細璐＄尞</string>
- <string name="day_power_generation">褰撴棩鍙戠數閲�</string>
- <string name="month_power_generation">褰撴湀鍙戠數閲�</string>
- <string name="year_power_generation">褰撳勾鍙戠數閲�</string>
- <string name="cumulative_power_generation">绱鍙戠數閲�</string>
- <string name="generated_power">鍙戠數鍔熺巼</string>
- <string name="generation">鍙戠數閲�</string>
- <string name="station_name">鐢电珯鍚嶇О</string>
- <string name="search">鎼滅储</string>
- <string name="history_search">鍘嗗彶鎼滅储</string>
- <string name="search_content_null">鎼滅储鍐呭涓嶈兘涓虹┖.</string>
- <string name="no_equipment">鏆傛棤璁惧.</string>
- <string name="filtering">绛涢��</string>
- <string name="reset">閲嶇疆</string>
- <string name="string_capacity">缁勪覆瀹归噺</string>
- <string name="grid_connected_state">骞剁綉鐘舵��</string>
- <string name="grid_connected">骞剁綉</string>
- <string name="off_network">绂荤綉</string>
- <string name="the_input_value_has_been_exceeded">杈撳叆鍊煎凡缁忚秴杩�</string>
- <string name="all_read">鍏ㄩ儴宸茶</string>
- <string name="contact_us">鑱旂郴鎴戜滑</string>
- <string name="wechat_id">寰俊鍙�</string>
- <string name="email_address">閭鍦板潃</string>
- <string name="successful_replication">宸插鍒跺埌鍓垏鏉�</string>
- <string name="to_be_added">寰呮帴鍏�</string>
- <string name="saving_standard_coal">鑺傜害鏍囧噯鐓�</string>
- <string name="co_reduction_rate">CO2鍑忔帓</string>
- <string name="quantity_of_equivalent_values">绛夋晥妞嶆爲閲�</string>
- <string name="pv_power">鍙戠數鍔熺巼</string>
- <string name="device_run_state">璁惧杩愯鐘舵��</string>
- <string name="search_station">鎼滅储鐢电珯</string>
- <string name="enter_the_device_sn_and_device_name">杈撳叆璁惧SN鍙�/璁惧鍚嶇О</string>
- <string name="enter_alarm_name">杈撳叆鎶ヨ鍚嶇О</string>
- <string name="device">璁惧</string>
- <string name="Offline_fault">绂荤嚎鏈夋晠闅�</string>
- <string name="active_power">鏈夊姛鍔熺巼</string>
- <string name="t">t</string>
+ <string name="cancel_download_successfully">Cancel downloading successfully</string>
+ <string name="writing_firmware_upgrade_memory_succeeded">write new firmware successfully</string>
+ <string name="download_firmware_upgrade_file_failed">downloading new firmware failed</string>
+ <string name="found_locally_firmware_upgrade_file">firmware upgrade file cannot be found locally, please download it and upgrade again</string>
+ <string name="notify_gateway_firmware_upgrade_failed">Failed to notify the gateway of the firmware upgrade address. upgrade failed</string>
+ <string name="local_service_fails"> local service error, cannot be upgraded</string>
+ <string name="writing_drive_memory_succeeded">write new drive file to flash successfully</string>
+ <string name="download_drive_file_failed">downloading new drive file failed</string>
+ <string name="found_locally_drive_file">drive upgrade file cannot be found locally, please download it and upgrade again</string>
+ <string name="notify_gateway_drive_failed">Failed to notify the gateway of the drive upgrade address. upgrade failed</string>
+ <string name="time_selectd">Select</string>
+ <string name="life_cycle">Lifetime</string>
+ <string name="year">Year</string>
+ <string name="month">Month</string>
+ <string name="day">Day</string>
+ <string name="hour">Hour</string>
+ <string name="minutc">Minute</string>
+ <string name="seconds">Second</string>
+ <string name="the_query_date_is_exceeded">Out of query date</string>
+ <string name="energy_generation_statistics">Enviromentail Benefits</string>
+ <string name="social_contribution">Statistics</string>
+ <string name="day_power_generation">Yield Today</string>
+ <string name="month_power_generation">Yield this month</string>
+ <string name="year_power_generation">Yield this year</string>
+ <string name="cumulative_power_generation">Total yield</string>
+ <string name="generated_power">Power generated</string>
+ <string name="generation">Power Generation </string>
+ <string name="station_name">Name</string>
+ <string name="search">Search</string>
+ <string name="history_search">Search history</string>
+ <string name="search_content_null">Search content cannot be empty</string>
+ <string name="no_equipment">No equipment!</string>
+ <string name="filtering">Select</string>
+ <string name="reset">Reset</string>
+ <string name="string_capacity">String capacity</string>
+ <string name="grid_connected_state">Grid-connected state</string>
+ <string name="grid_connected">Grid-Tied</string>
+ <string name="off_network">Off grid</string>
+ <string name="the_input_value_has_been_exceeded">Input value exceeded</string>
+ <string name="all_read">All read</string>
+ <string name="contact_us">contact us</string>
+ <string name="wechat_id">Wechat ID</string>
+ <string name="email_address">email address</string>
+ <string name="successful_replication">Copied to clipboard</string>
+ <string name="to_be_added">To be added</string>
+ <string name="saving_standard_coal">Stanard 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="device_run_state">equipment operational Status</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>
+ <string name="Offline_fault">Offline with fault</string>
+ <string name="active_power">Active power</string>
+ <string name="t">Ton</string>
<string name="number"></string>
+ <string name="device_off">Device Offline!</string>
+ <string name="summarize">Summary</string>
+ <string name="qr_code_business_card">QR Code</string>
+ <string name="save_qr_code_successfully">Succeed to save QC code</string>
+ <string name="failed_to_save_qr_code">failed to save QC code</string>
+ <string name="staff_management">Staff Account management</string>
+ <string name="alarm">alarm</string>
+ <string name="add_power_station">Additional power station</string>
+ <string name="add_power_station_failing">Adding power station failed</string>
+ <string name="add_power_station_succeed">Adding the power station succeeded</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 9512341..815fcdc 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -304,6 +304,16 @@
<string name="active_power">鏈夊姛鍔熺巼</string>
<string name="t">鍚�</string>
<string name="number">妫�</string>
+ <string name="device_off">璁惧宸茬绾�!</string>
+ <string name="summarize">姒傝</string>
+ <string name="qr_code_business_card">浜岀淮鐮佸悕鐗�</string>
+ <string name="save_qr_code_successfully">淇濆瓨浜岀淮鐮佹垚鍔�.</string>
+ <string name="failed_to_save_qr_code">淇濆瓨浜岀淮鐮佸け璐�.</string>
+ <string name="staff_management">鍛樺伐绠＄悊</string>
+ <string name="alarm">鎶ヨ</string>
+ <string name="add_power_station">娣诲姞鐢电珯</string>
+ <string name="add_power_station_failing">娣诲姞鐢电珯澶辫触.</string>
+ <string name="add_power_station_succeed">娣诲姞鐢电珯鎴愬姛.</string>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0