From 0752b8900365704ba8d3e60a5afc66394628e2a4 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 18 十二月 2023 16:20:14 +0800
Subject: [PATCH] 2023年12月18日16:20:08
---
app/src/main/res/layout/fragment_me.xml | 9 -
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 10 --
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java | 3
app/src/main/res/values-zh/strings.xml | 79 +++++++++++++++
app/src/main/res/layout/activity_home_login.xml | 4
app/src/main/res/values-en/strings.xml | 85 +++++++++++++++-
app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java | 16 ---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 28 +++++
app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | 1
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 8 +
app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java | 46 ++++++++
11 files changed, 234 insertions(+), 55 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
index 52b2f7e..88134a4 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
@@ -16,6 +16,7 @@
import com.hdl.linkpm.sdk.ota.bean.DeviceFirmwareBean;
import com.hdl.linkpm.sdk.ota.bean.GatewayDriverBean;
import com.hdl.photovoltaic.HDLApp;
+import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
@@ -30,7 +31,9 @@
import com.hdl.photovoltaic.utils.Md5Utils;
import com.hdl.sdk.link.common.exception.HDLLinkException;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
+import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
import com.hdl.sdk.link.core.callback.HDLLinkCallBack;
+import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
import org.apache.commons.io.FileUtils;
import org.greenrobot.eventbus.EventBus;
@@ -378,13 +381,13 @@
//endregion
+
/**
- * 璁剧疆缁堟涓嬭浇鏂囦欢鎸囦护
+ * 鍙栨秷缁堟涓嬭浇鏂囦欢鎸囦护
*/
- public void setStopDriversDownload() {
+ public void stopDownloadUpgradeFile() {
this.stopDownload = true;
}
-
/**
* 鍚戜簯绔幏鍙栥�愯澶囧崌绾ф枃浠�(椹卞姩,鍥轰欢)涓嬭浇銆戝崌绾ф枃浠�
*
@@ -451,6 +454,43 @@
});
}
+ /**
+ * 鍙栨秷鍗囩骇椹卞姩,鍥轰欢鏂囦欢鎸囦护
+ *
+ * @param mac 璁惧mac
+ * @param linkCallBack 鍥炶皟update
+ */
+ public void cancelUpgrade(String mac, LinkCallBack<Boolean> linkCallBack) {
+ String requestUrl = TopicApi.SET_GATEWAY_REMOTE_EDIT;
+// JsonObject json = new JsonObject();
+// json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
+// json.addProperty("server_addr", AppConfigManage.getUserRegionUrl());
+// json.addProperty("local_secret", UserConfigManage.getInstance().getLocalSecret());
+// //瑙ｅ瘑璐熻浇鏁版嵁(鍐欏瘑閽ョ粰缃戝叧涓�瀹氭槸鏄庢枃锛屽洜涓洪偅鏃剁綉鍏宠繕娌℃湁瀵嗛挜)
+// TcpClient.getInstance().sendDataToLinkGateway(mac, false, requestUrl, json, "", new HDLLinkCallBack() {
+// @Override
+// public void onSuccess(String msg) {
+// GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(mac);
+// if (gatewayBean != null) {
+// if (!TextUtils.isEmpty(UserConfigManage.getInstance().getLocalSecret())) {
+// gatewayBean.setLocalEncrypt(true);
+// }
+// }
+// if (linkCallBack != null) {
+// linkCallBack.onSuccess(true);
+// }
+//
+// }
+//
+// @Override
+// public void onError(HDLLinkException e) {
+// if (linkCallBack != null) {
+// linkCallBack.onError(e);
+// }
+// }
+// });
+ }
+
/**
* 鍚姩鏈湴鏈嶅姟
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 3c1c9b4..d8eb013 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -268,9 +268,14 @@
this.uniUpgradeGatewayDriver(data, callback);
}
break;
- //璁惧鍙栨秷涓嬭浇鍗囩骇鏂囦欢
+ //璁惧鍙栨秷椹卞姩,鍥轰欢涓嬭浇鍗囩骇鏂囦欢
case HDLUniMP.UNI_EVENT_REPLY_OTA_DRIVER_CANCEL_DOWNLOAD: {
this.uniCancelDownloadingUpgradeFile(data, callback);
+ }
+ break;
+ //璁惧椹卞姩,鍥轰欢鍙栨秷鍗囩骇
+ case HDLUniMP.UNI_EVENT_REPLY_OTA_CANCEL_UPGRADE: {
+ this.uniCancelUpgrade(data, callback);
}
break;
//鎵撳紑鏈嶅姟
@@ -758,10 +763,27 @@
}
/**
- * 鍙栨秷涓嬭浇鍗囩骇鏂囦欢
+ * 鍙栨秷涓嬭浇銆愰┍鍔�,鍥轰欢銆戝崌绾ф枃浠�
*/
private void uniCancelDownloadingUpgradeFile(Object data, DCUniMPJSCallback callback) {
- HdlOtaLogic.getInstance().setStopDriversDownload();
+ HdlOtaLogic.getInstance().stopDownloadUpgradeFile();
+ }
+
+ /**
+ * 鍙栨秷銆愰┍鍔�,鍥轰欢銆戝崌绾�
+ */
+ private void uniCancelUpgrade(Object data, DCUniMPJSCallback callback) {
+ HdlOtaLogic.getInstance().cancelUpgrade("", new LinkCallBack<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+
+ }
+ });
}
/**
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
index 8e713f9..fb140cf 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
@@ -43,7 +43,6 @@
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog1;
import com.hdl.photovoltaic.widget.ListDialog;
import com.hdl.photovoltaic.widget.adapter.ListDialogAdapter;
-import com.hdl.sdk.link.core.utils.LanguageUtils;
import java.util.List;
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 d356751..8f018d8 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
@@ -195,13 +195,7 @@
// viewBinding.toolbarTopFragmentMeRl.topMoreIv.setVisibility(View.VISIBLE);
// viewBinding.toolbarTopFragmentMeRl.topMoreIv.setImageResource(R.drawable.message);
- viewBinding.fragmentMeLineMessageCenterIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.message_center);
- viewBinding.fragmentMeLineMessageCenterIl.fragmentMeLineTitleIv.setText(R.string.set_message_center);
- viewBinding.fragmentMeLineMessageCenterIl.fragmentMeLineV.setVisibility(View.VISIBLE);
- viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.user_management);
- viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineTitleIv.setText(R.string.set_user_management);
- viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineV.setVisibility(View.VISIBLE);
viewBinding.fragmentMeLineSetIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.set);
viewBinding.fragmentMeLineSetIl.fragmentMeLineTitleIv.setText(R.string.me_set);
@@ -210,10 +204,6 @@
viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.asregards);
viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineTitleIv.setText(R.string.me_regard);
- if (!UserConfigManage.getInstance().isBAccount()) {
- viewBinding.fragmentMeLineMessageCenterIl.getRoot().setVisibility(View.GONE);
- viewBinding.fragmentMeLineUserManagementIl.getRoot().setVisibility(View.GONE);
- }
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
index f421a78..334f56d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
@@ -1,35 +1,19 @@
package com.hdl.photovoltaic.ui.me;
-import android.content.ComponentName;
-import android.content.Context;
import android.content.Intent;
-import android.content.ServiceConnection;
import android.os.Bundle;
-import android.os.IBinder;
import android.view.View;
import androidx.annotation.Nullable;
-import com.hdl.linkpm.sdk.HDLLinkPMSdk;
-import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
-import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivitySetBinding;
-import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
-import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpService;
-import com.hdl.photovoltaic.listener.CloudCallBeak;
-import com.hdl.photovoltaic.other.HdlAccountLogic;
-import com.hdl.photovoltaic.other.HdlThreadLogic;
-import com.hdl.photovoltaic.ui.StartActivity;
-import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
-import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
-import com.hdl.photovoltaic.widget.ConfirmationInputDialog;
/**
* 鎴戠殑-璁剧疆-鐣岄潰
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
index 9568c1e..5d5a91a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
@@ -15,7 +15,9 @@
import com.google.gson.Gson;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.ConstantManage;
+import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.FragmentHouseListBinding;
import com.hdl.photovoltaic.base.CustomBaseFragment;
import com.hdl.photovoltaic.enums.ShowErrorMode;
@@ -116,7 +118,11 @@
//鐐瑰嚮浣忓畢璇︽儏
HdlLogLogic.print("鐐瑰嚮浣忓畢璇︽儏===" + new Gson().toJson(houseIdBean), false);
HdlResidenceLogic.getInstance().switchHouse(houseIdBean);
- String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS + "?homeId=" + houseIdBean.getHomeId() + "&homeName=" + houseIdBean.getHomeName() + "&powerStationStatus=" + houseIdBean.getPowerStationStatus();
+ String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS
+ + "?homeId=" + houseIdBean.getHomeId()
+ + "&homeName=" + houseIdBean.getHomeName()
+ + "&powerStationStatus=" + houseIdBean.getPowerStationStatus()
+ + "&serverAddress=" + AppConfigManage.getUserRegionUrl();
HdlUniLogic.getInstance().openUniMP(path, null);
}
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 f21fbae..4cd5037 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
@@ -46,13 +46,12 @@
public final static String UNI_EVENT_REPLY_OTA_FIRMWARES_LOCAL = "firmwares_local_list";//璁惧鏈湴鍥轰欢鍒楄〃
public final static String UNI_EVENT_REPLY_OTA_FIRMWARES_DOWNLOAD = "firmwares_download";//璁惧鍥轰欢涓嬭浇
public final static String UNI_EVENT_REPLY_OTA_FIRMWARES_UPGRADE = "firmwares_upgrade";//璁惧鍥轰欢鍗囩骇
- public final static String UNI_EVENT_REPLY_OTA_FIRMWARES_CANCEL_UPGRADE = "firmwares_cancel_upgrade";//璁惧鍥轰欢鍙栨秷鍗囩骇
public final static String UNI_EVENT_REPLY_OTA_DRIVER_LIST = "driver_current_list";//褰撳墠璁惧椹卞姩鍒楄〃
public final static String UNI_EVENT_REPLY_OTA_DRIVER_NEW = "driver_new_list";//璁惧鏂伴┍鍔ㄥ垪琛�
public final static String UNI_EVENT_REPLY_OTA_DRIVER_LOCAL = "driver_local_list";//璁惧鏈湴椹卞姩鍒楄〃
public final static String UNI_EVENT_REPLY_OTA_DRIVER_DOWNLOAD = "driver_download";//璁惧椹卞姩涓嬭浇
public final static String UNI_EVENT_REPLY_OTA_DRIVER_UPGRADE = "driver_upgrade";//璁惧椹卞姩鍗囩骇
- public final static String UNI_EVENT_REPLY_OTA_DRIVER_CANCEL_UPGRADE = "driver_cancel_upgrade";//璁惧椹卞姩鍙栨秷鍗囩骇
+ public final static String UNI_EVENT_REPLY_OTA_CANCEL_UPGRADE = "cancel_upgrade";//璁惧椹卞姩,鍥轰欢鍙栨秷鍗囩骇
public final static String UNI_EVENT_REPLY_OTA_DRIVER_CANCEL_DOWNLOAD = "cancel_download";//璁惧鍙栨秷涓嬭浇鍗囩骇鏂囦欢
public final static String UNI_EVENT_REPLY_OTA_OPEN_SERVICE = "open_service";//鎵撳紑鏈嶅姟
public final static String UNI_EVENT_REPLY_OTA_CLOSE_SERVICE = "close_service";//鍏抽棴鏈嶅姟
diff --git a/app/src/main/res/layout/activity_home_login.xml b/app/src/main/res/layout/activity_home_login.xml
index b9c52ce..f8f3558 100644
--- a/app/src/main/res/layout/activity_home_login.xml
+++ b/app/src/main/res/layout/activity_home_login.xml
@@ -236,7 +236,9 @@
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/home_login_tv" />
+ app:layout_constraintTop_toBottomOf="@+id/home_login_tv"
+ android:visibility="gone"
+ />
<ImageView
android:id="@+id/home_login_privacy_check_iv"
diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml
index 77a3376..9c789dd 100644
--- a/app/src/main/res/layout/fragment_me.xml
+++ b/app/src/main/res/layout/fragment_me.xml
@@ -35,7 +35,6 @@
android:layout_width="wrap_content"
android:layout_height="25dp"
android:layout_marginTop="@dimen/dp_16"
- android:text="寮�濮嬭璁′簡"
android:textColor="@color/text_90000000"
android:textSize="@dimen/text_18"
app:layout_constraintEnd_toEndOf="@+id/fragment_me_icon_iv"
@@ -52,14 +51,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fragment_me_icon_parent_cl">
-
- <include
- android:id="@+id/fragment_me_line_message_center_il"
- layout="@layout/fragment_me_line" />
-
- <include
- android:id="@+id/fragment_me_line_user_management_il"
- layout="@layout/fragment_me_line" />
<include
android:id="@+id/fragment_me_line_set_il"
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index bac0474..0ac2776 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -1,6 +1,6 @@
<resources>
<!-- <string name="app_name">PhotovoltaicDebug</string>-->
- <string name="app_name">intelligent energy</string>
+ <string name="app_name">鏅烘収鑳芥簮</string>
<string name="title_activity_home_login">HomeLoginActivity</string>
<!-- Strings used for fragments for navigation -->
<string name="first_fragment_label">First Fragment</string>
@@ -19,10 +19,10 @@
<string name="home_login_input_phone">璇疯緭鍏ユ墜鏈哄彿</string>
<string name="home_login_email_address">閭鍙�</string>
<string name="home_login_input_psw">璇疯緭鍏ュ瘑鐮�</string>
- <string name="home_login_register">register</string>
+ <string name="home_login_register">娉ㄥ唽</string>
<string name="home_login_forget_password">蹇樿瀵嗙爜</string>
<string name="home_login_change_password">淇敼瀵嗙爜</string>
- <string name="home_login_logoin">log in</string>
+ <string name="home_login_logoin">鐧诲綍</string>
<string name="home_login_be_logging_in">鐧诲綍涓��</string>
<string name="home_login_power_station">浣撻獙鐢电珯</string>
<string name="home_login_consent_service_agreement">鍚屾剰銆婃湇鍔″崗璁�嬪拰銆婄敤鎴蜂俊鎭繚鎶よ瀹氥��</string>
@@ -61,11 +61,14 @@
<string name="home_login_input_affirm_psw">璇峰啀娆¤緭鍏ユ柊瀵嗙爜</string>
<string name="home_login_input_unlike_psw">鏂板瘑鐮佸拰纭瀵嗙爜涓嶄竴鑷�.</string>
<string name="home_login_change_name_succeed">淇敼澶囨敞鎴愬姛.</string>
+ <string name="verification">楠岃瘉鐮�</string>
+ <string name="home_phone_number">鍖哄彿</string>
+ <string name="home_chinese_mainland">涓浗澶ч檰</string>
<!--鎴戠殑鐢电珯-->
<string name="power_station">鐢电珯</string>
- <string name="power_station_me">my</string>
+ <string name="power_station_me">鎴戠殑</string>
<string name="my_power_station">鎴戠殑鐢电珯</string>
<string name="power_station_generated_power">鍙戠數鍔熺巼:</string>
<string name="power_station_Power_generation_today">浠婃棩鍙戠數</string>
@@ -81,8 +84,21 @@
<string name="device_manual_connection">鎵嬪姩杩炴帴</string>
<string name="device_loading">鍔犺浇涓��</string>
- <!--娑堟伅-->
+ <!--鍛婅娑堟伅-->
<string name="message">娑堟伅</string>
+ <string name="message_all">鍏ㄩ儴</string>
+ <string name="message_nascent">鍙戠敓涓�</string>
+ <string name="message_recover">宸叉仮澶�</string>
+ <string name="message_alarm_info">鎶ヨ璇︽儏</string>
+ <string name="message_alarm">鍛婅</string>
+ <string name="message_alarm_malfunction">鏁呴殰</string>
+ <string name="messagealarm_details_content">鎶ヨ鍐呭</string>
+ <string name="messagealarm_details_device">鎶ヨ璁惧</string>
+ <string name="message_alarm_detailsaffect_region">褰卞搷鑼冨洿</string>
+ <string name="message_alarm_detailspower_station_location">鐢电珯浣嶇疆</string>
+ <string name="message_alarm_details_time">鎶ヨ鏃堕棿</string>
+ <string name="message_alarm_details_back">杩斿洖</string>
+ <string name="message_alarm_details_resolved">宸茶В鍐�</string>
<!--鎴戠殑-->
@@ -100,13 +116,53 @@
<string name="set_data_centre">鏁版嵁涓績</string>
<string name="set_system_rights_managemen">绯荤粺鏉冮檺绠＄悊</string>
<string name="set_3_msg_sharing">绗笁鏂逛俊鎭叡浜竻鍗�</string>
+ <string name="set_account_security">璐﹀彿涓庡畨鍏�</string>
+ <string name="set_temperature_unit">娓╁害鍗曚綅</string>
<string name="set_logout">閫�鍑虹櫥褰�</string>
<string name="set_privacy">闅愮璁剧疆</string>
<string name="set_nickname_modification">鏄电О淇敼</string>
+ <string name="set_user_management">鐢ㄦ埛绠＄悊</string>
+ <string name="set_message_center">娑堟伅涓績</string>
+ <string name="me_personal_data">涓汉璧勬枡</string>
+ <string name="me_personal_data_portrait">澶村儚</string>
+ <string name="me_personal_data_user_name">鐢ㄦ埛鍚�</string>
+ <string name="me_personal_data_role">瑙掕壊</string>
+ <string name="me_personal_data_super_admin">瓒呯骇绠＄悊鍛�</string>
+ <string name="me_personal_data_photograph">鎷嶇収</string>
+ <string name="me_personal_data_select_album">浠庣浉鍐屼腑閫夋嫨</string>
+ <string name="set_email_address">鐢靛瓙閭</string>
+ <string name="set_not_bind">鏈粦瀹�</string>
+ <string name="set_language_choice">璇█閫夋嫨</string>
+ <string name="set_c">鈩�(鎽勬皬搴�)</string>
+ <string name="set_f">鈩�(鍗庢皬搴�)</string>
+ <string name="set_change_bind_phone_number">淇敼鎵嬫満鍙风爜</string>
+ <string name="set_change_bind_mail">淇敼閭鍦板潃</string>
+ <string name="set_bind_phone_succeed">缁戝畾鎵嬫満鍙锋垚鍔�.</string>
+ <string name="set_bind_mail_succeed">缁戝畾閭鎴愬姛.</string>
+
+
+ <!--app鏇存柊-->
+ <string name="app_version_number">鐗堟湰鍙�</string>
+ <string name="app_scan_code_download">鎵爜涓嬭浇鏅烘収鑳芥簮APP</string>
+ <string name="app_version_upgrade">鐗堟湰鏇存柊</string>
+ <string name="app_new_version">宸茬粡鏄渶鏂扮増鏈�</string>
+ <string name="app_service_agreement">鏈嶅姟鍗忚</string>
+ <string name="app_privacy_policy">闅愮鏀跨瓥</string>
+ <string name="app_update_now">绔嬪嵆鏇存柊</string>
+ <string name="app_cancel_update">鍙栨秷鏇存柊</string>
+ <string name="app_discover_new_version">鍙戠幇鏂扮増鏈�</string>
+ <string name="app_be_updating">姝ｅ湪鏇存柊</string>
+ <string name="app_stop_current_download">鏄惁鍋滄褰撳墠涓嬭浇锛�</string>
+ <string name="app_version">鐗堟湰</string>
+ <string name="app_package_size">澶у皬</string>
+ <string name="app_update_content">涓轰簡姝ｅ父鍗囩骇娌充笢APP锛岃鐐瑰嚮璁剧疆鎸夐挳锛屽厑璁稿畨瑁呮湭鐭ユ潵婧愬簲鐢紝鏈姛鑳藉彧闄愮敤浜庢渤涓淎PP鐗堟湰鍗囩骇锛孉ndroid 11鐗堟湰鍙婁互涓婇渶瑕佸湪鎺堟潈涔嬪悗閲嶆柊涓嬭浇瀹夎銆�</string>
+ <string name="app_update_fail">鎺堟潈澶辫触锛屾棤娉曞畨瑁呭簲鐢�</string>
<!--ota-->
<string name="ota_binding_cloud_upgrade_fails">閫嗗彉鍣ㄦ病缁戝畾杩�,鍗囩骇澶辫触.</string>
- <string name="ota_not_cloud_upgrade_fails">閫嗗彉鍣ㄦ病涓婁簯,鍗囩骇澶辫触.</string>
+ <string name="ota_not_cloud_upgrade_fails">閫嗗彉鍣ㄦ病杩炰笂浜�,鍗囩骇澶辫触.</string>
+
+
<!--uin-->
<string name="uni_open_error">椤甸潰鍒濆鍖栦腑 璇风瓑寰�5绉掑啀鐐瑰嚮</string>
@@ -118,6 +174,23 @@
<string name="loading_privacy">闅愮鏉冩斂绛栧強鏈嶅姟鏉℃</string>
<string name="loading_privacy_server">涓轰簡鏇村ソ鐨勪繚闅滄偍鐨勫悎娉曟潈鐩婏紝璇锋偍闃呰骞跺悓鎰忎互涓嬪崗璁�婇殣绉佹潈鏀跨瓥銆嬪拰銆婃湇鍔℃潯娆俱��</string>
<string name="kill_app">鍐嶆寜涓�娆￠��鍑哄簲鐢�</string>
+ <string name="loading_not_supported">鎶辨瓑,鏆備笉鏀寔.</string>
+ <string name="loading_title_tip">鎻愮ず</string>
+ <string name="loading_app_restart">纭鍚嶢pp灏嗕細閲嶆柊鍚姩.</string>
+ <string name="loading_log_out">纭閫�鍑虹櫥褰�?</string>
+
+
+ <!-- 鏉冮檺 -->
+ <string name="camera_album_file_create_fial">鏂囦欢鍒涘缓澶辫触</string>
+ <string name="camera_album_file_save_fial">淇濆瓨璺緞寮傚父锛岃閲嶈瘯</string>
+ <!-- 鏉冮檺 -->
+
+ <!-- 鍥剧墖涓婁紶 -->
+ <string name="camera_album_file_get_fial">鍥剧墖鑾峰彇澶辫触</string>
+ <string name="camera_album_system_fial">绯荤粺澶勭悊鍥剧墖澶辫触锛岃閲嶈瘯</string>
+ <string name="apk_update_content">涓轰簡姝ｅ父鍗囩骇娌充笢APP锛岃鐐瑰嚮璁剧疆鎸夐挳锛屽厑璁稿畨瑁呮湭鐭ユ潵婧愬簲鐢紝鏈姛鑳藉彧闄愮敤浜庢渤涓淎PP鐗堟湰鍗囩骇锛孉ndroid 11鐗堟湰鍙婁互涓婇渶瑕佸湪鎺堟潈涔嬪悗閲嶆柊涓嬭浇瀹夎銆�</string>
+ <string name="apk_update_sure">璁剧疆</string>
+ <string name="permission_open">璇峰埌璁剧疆涓墦寮�鏉冮檺</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 a6856a2..0ac2776 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -12,7 +12,7 @@
<string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
<!--鐧诲綍妯″潡-->
- <string name="home_login_chinese">涓枃锛堢畝浣擄級</string>
+ <string name="home_login_chinese">绠�浣撲腑鏂�</string>
<string name="home_login_hdl_stored_energy">HDL鍏変紡鍌ㄨ兘</string>
<string name="home_login_an_installer">鎴戞槸瀹夎鍟�</string>
<string name="home_login__input_phone_email">璇疯緭鍏ユ墜鏈哄彿/閭鍙�</string>
@@ -61,6 +61,9 @@
<string name="home_login_input_affirm_psw">璇峰啀娆¤緭鍏ユ柊瀵嗙爜</string>
<string name="home_login_input_unlike_psw">鏂板瘑鐮佸拰纭瀵嗙爜涓嶄竴鑷�.</string>
<string name="home_login_change_name_succeed">淇敼澶囨敞鎴愬姛.</string>
+ <string name="verification">楠岃瘉鐮�</string>
+ <string name="home_phone_number">鍖哄彿</string>
+ <string name="home_chinese_mainland">涓浗澶ч檰</string>
<!--鎴戠殑鐢电珯-->
@@ -81,8 +84,21 @@
<string name="device_manual_connection">鎵嬪姩杩炴帴</string>
<string name="device_loading">鍔犺浇涓��</string>
- <!--娑堟伅-->
+ <!--鍛婅娑堟伅-->
<string name="message">娑堟伅</string>
+ <string name="message_all">鍏ㄩ儴</string>
+ <string name="message_nascent">鍙戠敓涓�</string>
+ <string name="message_recover">宸叉仮澶�</string>
+ <string name="message_alarm_info">鎶ヨ璇︽儏</string>
+ <string name="message_alarm">鍛婅</string>
+ <string name="message_alarm_malfunction">鏁呴殰</string>
+ <string name="messagealarm_details_content">鎶ヨ鍐呭</string>
+ <string name="messagealarm_details_device">鎶ヨ璁惧</string>
+ <string name="message_alarm_detailsaffect_region">褰卞搷鑼冨洿</string>
+ <string name="message_alarm_detailspower_station_location">鐢电珯浣嶇疆</string>
+ <string name="message_alarm_details_time">鎶ヨ鏃堕棿</string>
+ <string name="message_alarm_details_back">杩斿洖</string>
+ <string name="message_alarm_details_resolved">宸茶В鍐�</string>
<!--鎴戠殑-->
@@ -100,13 +116,53 @@
<string name="set_data_centre">鏁版嵁涓績</string>
<string name="set_system_rights_managemen">绯荤粺鏉冮檺绠＄悊</string>
<string name="set_3_msg_sharing">绗笁鏂逛俊鎭叡浜竻鍗�</string>
+ <string name="set_account_security">璐﹀彿涓庡畨鍏�</string>
+ <string name="set_temperature_unit">娓╁害鍗曚綅</string>
<string name="set_logout">閫�鍑虹櫥褰�</string>
<string name="set_privacy">闅愮璁剧疆</string>
<string name="set_nickname_modification">鏄电О淇敼</string>
+ <string name="set_user_management">鐢ㄦ埛绠＄悊</string>
+ <string name="set_message_center">娑堟伅涓績</string>
+ <string name="me_personal_data">涓汉璧勬枡</string>
+ <string name="me_personal_data_portrait">澶村儚</string>
+ <string name="me_personal_data_user_name">鐢ㄦ埛鍚�</string>
+ <string name="me_personal_data_role">瑙掕壊</string>
+ <string name="me_personal_data_super_admin">瓒呯骇绠＄悊鍛�</string>
+ <string name="me_personal_data_photograph">鎷嶇収</string>
+ <string name="me_personal_data_select_album">浠庣浉鍐屼腑閫夋嫨</string>
+ <string name="set_email_address">鐢靛瓙閭</string>
+ <string name="set_not_bind">鏈粦瀹�</string>
+ <string name="set_language_choice">璇█閫夋嫨</string>
+ <string name="set_c">鈩�(鎽勬皬搴�)</string>
+ <string name="set_f">鈩�(鍗庢皬搴�)</string>
+ <string name="set_change_bind_phone_number">淇敼鎵嬫満鍙风爜</string>
+ <string name="set_change_bind_mail">淇敼閭鍦板潃</string>
+ <string name="set_bind_phone_succeed">缁戝畾鎵嬫満鍙锋垚鍔�.</string>
+ <string name="set_bind_mail_succeed">缁戝畾閭鎴愬姛.</string>
+
+
+ <!--app鏇存柊-->
+ <string name="app_version_number">鐗堟湰鍙�</string>
+ <string name="app_scan_code_download">鎵爜涓嬭浇鏅烘収鑳芥簮APP</string>
+ <string name="app_version_upgrade">鐗堟湰鏇存柊</string>
+ <string name="app_new_version">宸茬粡鏄渶鏂扮増鏈�</string>
+ <string name="app_service_agreement">鏈嶅姟鍗忚</string>
+ <string name="app_privacy_policy">闅愮鏀跨瓥</string>
+ <string name="app_update_now">绔嬪嵆鏇存柊</string>
+ <string name="app_cancel_update">鍙栨秷鏇存柊</string>
+ <string name="app_discover_new_version">鍙戠幇鏂扮増鏈�</string>
+ <string name="app_be_updating">姝ｅ湪鏇存柊</string>
+ <string name="app_stop_current_download">鏄惁鍋滄褰撳墠涓嬭浇锛�</string>
+ <string name="app_version">鐗堟湰</string>
+ <string name="app_package_size">澶у皬</string>
+ <string name="app_update_content">涓轰簡姝ｅ父鍗囩骇娌充笢APP锛岃鐐瑰嚮璁剧疆鎸夐挳锛屽厑璁稿畨瑁呮湭鐭ユ潵婧愬簲鐢紝鏈姛鑳藉彧闄愮敤浜庢渤涓淎PP鐗堟湰鍗囩骇锛孉ndroid 11鐗堟湰鍙婁互涓婇渶瑕佸湪鎺堟潈涔嬪悗閲嶆柊涓嬭浇瀹夎銆�</string>
+ <string name="app_update_fail">鎺堟潈澶辫触锛屾棤娉曞畨瑁呭簲鐢�</string>
<!--ota-->
<string name="ota_binding_cloud_upgrade_fails">閫嗗彉鍣ㄦ病缁戝畾杩�,鍗囩骇澶辫触.</string>
- <string name="ota_not_cloud_upgrade_fails">閫嗗彉鍣ㄦ病涓婁簯,鍗囩骇澶辫触.</string>
+ <string name="ota_not_cloud_upgrade_fails">閫嗗彉鍣ㄦ病杩炰笂浜�,鍗囩骇澶辫触.</string>
+
+
<!--uin-->
<string name="uni_open_error">椤甸潰鍒濆鍖栦腑 璇风瓑寰�5绉掑啀鐐瑰嚮</string>
@@ -118,6 +174,23 @@
<string name="loading_privacy">闅愮鏉冩斂绛栧強鏈嶅姟鏉℃</string>
<string name="loading_privacy_server">涓轰簡鏇村ソ鐨勪繚闅滄偍鐨勫悎娉曟潈鐩婏紝璇锋偍闃呰骞跺悓鎰忎互涓嬪崗璁�婇殣绉佹潈鏀跨瓥銆嬪拰銆婃湇鍔℃潯娆俱��</string>
<string name="kill_app">鍐嶆寜涓�娆￠��鍑哄簲鐢�</string>
+ <string name="loading_not_supported">鎶辨瓑,鏆備笉鏀寔.</string>
+ <string name="loading_title_tip">鎻愮ず</string>
+ <string name="loading_app_restart">纭鍚嶢pp灏嗕細閲嶆柊鍚姩.</string>
+ <string name="loading_log_out">纭閫�鍑虹櫥褰�?</string>
+
+
+ <!-- 鏉冮檺 -->
+ <string name="camera_album_file_create_fial">鏂囦欢鍒涘缓澶辫触</string>
+ <string name="camera_album_file_save_fial">淇濆瓨璺緞寮傚父锛岃閲嶈瘯</string>
+ <!-- 鏉冮檺 -->
+
+ <!-- 鍥剧墖涓婁紶 -->
+ <string name="camera_album_file_get_fial">鍥剧墖鑾峰彇澶辫触</string>
+ <string name="camera_album_system_fial">绯荤粺澶勭悊鍥剧墖澶辫触锛岃閲嶈瘯</string>
+ <string name="apk_update_content">涓轰簡姝ｅ父鍗囩骇娌充笢APP锛岃鐐瑰嚮璁剧疆鎸夐挳锛屽厑璁稿畨瑁呮湭鐭ユ潵婧愬簲鐢紝鏈姛鑳藉彧闄愮敤浜庢渤涓淎PP鐗堟湰鍗囩骇锛孉ndroid 11鐗堟湰鍙婁互涓婇渶瑕佸湪鎺堟潈涔嬪悗閲嶆柊涓嬭浇瀹夎銆�</string>
+ <string name="apk_update_sure">璁剧疆</string>
+ <string name="permission_open">璇峰埌璁剧疆涓墦寮�鏉冮檺</string>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0