From 1a8ba64b9cca5aaa98c4f84602f0fb78d3b6b6b4 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 25 十二月 2024 13:27:02 +0800
Subject: [PATCH] 2024年12月25日13:26:59
---
app/src/main/java/com/hdl/photovoltaic/widget/FlashingBoxDialog.java | 2
app/src/main/res/layout/activity_contact_us.xml | 4
app/src/main/res/layout/dialog_static_list.xml | 50 +++-----
app/src/main/res/values/strings.xml | 82 ++++++------
app/src/main/res/drawable/code_box.png | 0
app/src/main/res/layout/dialog_flashing_icon_box.xml | 6
app/src/main/java/com/hdl/photovoltaic/widget/FlashingIconBoxDialog.java | 4
app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 5
app/src/main/res/layout/dialog_confirm_input.xml | 1
app/src/main/res/values-zh/strings.xml | 84 +++++++-------
app/src/main/java/com/hdl/photovoltaic/ui/me/ContactUsActivity.java | 11 +
app/src/main/java/com/hdl/photovoltaic/widget/ListStaticDialog.java | 4
app/src/main/res/layout/dialog_flashing_box.xml | 21 +--
app/src/main/res/layout/view_camera_album.xml | 76 +++++-------
14 files changed, 170 insertions(+), 180 deletions(-)
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 557dc4c..fafae6b 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
@@ -41,6 +41,7 @@
import com.hdl.photovoltaic.ui.home.aachart.BasicChartComposer;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.TimeUtils;
+import com.hdl.photovoltaic.widget.FlashingBoxDialog;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import org.greenrobot.eventbus.EventBus;
@@ -312,7 +313,9 @@
Calendar calendar = TimeUtils.stringToCalendar(currDate, timeDateFormat);
String time = TimeUtils.addDayMonthYearToDate(calendar, 1, timeDateFormat, timeType);
if (TimeUtils.stringDateToTimestamp(time, timeDateFormat) > TimeUtils.getCurrentTimestamp()) {
- HdlThreadLogic.toast(_mActivity, getString(R.string.the_query_date_is_exceeded));
+ FlashingBoxDialog flashingBoxDialog = new FlashingBoxDialog(_mActivity, 1500);
+ flashingBoxDialog.setContent(getString(R.string.the_query_date_is_exceeded));
+ flashingBoxDialog.show();
return;
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/ContactUsActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/ContactUsActivity.java
index f79d032..e42e757 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/ContactUsActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/ContactUsActivity.java
@@ -14,6 +14,7 @@
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.ui.bean.ContactBean;
+import com.hdl.photovoltaic.widget.FlashingBoxDialog;
/**
* 鑱旂郴鎴戜滑鐨勭晫闈�
@@ -85,7 +86,10 @@
// 灏嗗壀璐存暟鎹璞″鍒跺埌鍓创鏉�
clipboard.setPrimaryClip(clip);
// 鍙互娣诲姞涓�涓猅oast鎴栬�呭叾浠栨彁绀烘潵鍛婄煡鐢ㄦ埛澶嶅埗鎴愬姛
- HdlThreadLogic.toast(_mActivity, getString(R.string.successful_replication));
+// HdlThreadLogic.toast(_mActivity, getString(R.string.successful_replication));
+ FlashingBoxDialog flashingBoxDialog = new FlashingBoxDialog(_mActivity, 1500);
+ flashingBoxDialog.setContent(getString(R.string.successful_replication));
+ flashingBoxDialog.show();
}
// return true; // 杩斿洖true琛ㄧず宸插鐞嗛暱鎸変簨浠�
@@ -105,7 +109,10 @@
// 灏嗗壀璐存暟鎹璞″鍒跺埌鍓创鏉�
clipboard.setPrimaryClip(clip);
// 鍙互娣诲姞涓�涓猅oast鎴栬�呭叾浠栨彁绀烘潵鍛婄煡鐢ㄦ埛澶嶅埗鎴愬姛
- HdlThreadLogic.toast(_mActivity, getString(R.string.successful_replication));
+// HdlThreadLogic.toast(_mActivity, getString(R.string.successful_replication));
+ FlashingBoxDialog flashingBoxDialog = new FlashingBoxDialog(_mActivity, 1500);
+ flashingBoxDialog.setContent(getString(R.string.successful_replication));
+ flashingBoxDialog.show();
}
// return true; // 杩斿洖true琛ㄧず宸插鐞嗛暱鎸変簨浠�
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/FlashingBoxDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/FlashingBoxDialog.java
index 5be247c..4083a68 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/FlashingBoxDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/FlashingBoxDialog.java
@@ -29,7 +29,7 @@
private int mMillisecond = 1500;
public FlashingBoxDialog(@NonNull Context context) {
- super(context, R.style.Custom_Dialog);
+ super(context, R.style.Custom_List_Dialog);
}
/**
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/FlashingIconBoxDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/FlashingIconBoxDialog.java
index 30b5bb0..b8e8d37 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/FlashingIconBoxDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/FlashingIconBoxDialog.java
@@ -32,7 +32,7 @@
private int mMillisecond = 1500;
public FlashingIconBoxDialog(@NonNull Context context) {
- super(context, R.style.Custom_Dialog);
+ super(context, R.style.Custom_List_Dialog);
}
/**
@@ -66,7 +66,7 @@
/**
* 璁剧疆鍥炬爣
*
- * @param drawable 鎴愬姛鎴栬�呭け璐ュ浘鏍�
+ * @param drawable 鎴愬姛鎴栬�呭け璐�,鎻愮ず鍥炬爣
*/
public void setImage(Drawable drawable) {
this.mDrawable = drawable;
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/ListStaticDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/ListStaticDialog.java
index ad80009..4e5c2af 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ListStaticDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ListStaticDialog.java
@@ -29,7 +29,7 @@
private Context mContext;
public ListStaticDialog(@NonNull Context context) {
- super(context, R.style.Custom_Dialog);
+ super(context, R.style.DefaultFilteringDialog);
mContext = context;
}
@@ -40,7 +40,7 @@
if (window != null) {
window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
WindowManager.LayoutParams layoutParams = window.getAttributes();
- layoutParams.gravity = Gravity.BOTTOM;
+ layoutParams.gravity = Gravity.BOTTOM|Gravity.START|Gravity.END;
window.setAttributes(layoutParams);
}
viewBinding = DialogStaticListBinding.inflate(getLayoutInflater());
diff --git a/app/src/main/res/drawable/code_box.png b/app/src/main/res/drawable/code_box.png
index 2df6186..3d8ccf8 100644
--- a/app/src/main/res/drawable/code_box.png
+++ b/app/src/main/res/drawable/code_box.png
Binary files differ
diff --git a/app/src/main/res/layout/activity_contact_us.xml b/app/src/main/res/layout/activity_contact_us.xml
index bf2473c..e2cdd8c 100644
--- a/app/src/main/res/layout/activity_contact_us.xml
+++ b/app/src/main/res/layout/activity_contact_us.xml
@@ -74,7 +74,7 @@
android:layout_marginStart="@dimen/dp_16"
android:text="@string/email_address"
android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_16" />
+ android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/email_address_content_tv"
@@ -84,7 +84,7 @@
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_16"
android:textColor="@color/text_66FFFFFF"
- android:textSize="@dimen/text_16" />
+ android:textSize="@dimen/text_14" />
</RelativeLayout>
diff --git a/app/src/main/res/layout/dialog_confirm_input.xml b/app/src/main/res/layout/dialog_confirm_input.xml
index 3ce6136..ef8edab 100644
--- a/app/src/main/res/layout/dialog_confirm_input.xml
+++ b/app/src/main/res/layout/dialog_confirm_input.xml
@@ -57,6 +57,7 @@
android:paddingEnd="@dimen/dp_16"
android:textColor="@color/text_E6FFFFFF"
android:textColorHint="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_flashing_box.xml b/app/src/main/res/layout/dialog_flashing_box.xml
index d6429f7..df51b53 100644
--- a/app/src/main/res/layout/dialog_flashing_box.xml
+++ b/app/src/main/res/layout/dialog_flashing_box.xml
@@ -1,33 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:gravity="center">
<LinearLayout
android:id="@+id/tip_parent_cl"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_100"
android:layout_marginEnd="@dimen/dp_100"
android:background="@drawable/dialog_flashing_box"
android:gravity="center"
- android:paddingTop="@dimen/dp_16"
- android:paddingBottom="@dimen/dp_16"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent">
+ android:paddingTop="@dimen/dp_8"
+ android:paddingBottom="@dimen/dp_8">
<TextView
android:id="@+id/tip_content_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
- android:paddingStart="@dimen/dp_4"
- android:paddingEnd="@dimen/dp_4"
+ android:paddingStart="@dimen/dp_10"
+ android:paddingEnd="@dimen/dp_10"
android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14" />
</LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_flashing_icon_box.xml b/app/src/main/res/layout/dialog_flashing_icon_box.xml
index 51f21b8..e0e634a 100644
--- a/app/src/main/res/layout/dialog_flashing_icon_box.xml
+++ b/app/src/main/res/layout/dialog_flashing_icon_box.xml
@@ -32,8 +32,10 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:gravity="center"
- android:paddingStart="@dimen/dp_4"
- android:paddingEnd="@dimen/dp_4"
+ android:paddingStart="@dimen/dp_8"
+ android:paddingTop="@dimen/dp_2"
+ android:paddingEnd="@dimen/dp_8"
+ android:paddingBottom="@dimen/dp_2"
android:textColor="@color/text_FFFFFFFF"
android:textSize="@dimen/text_14" />
diff --git a/app/src/main/res/layout/dialog_static_list.xml b/app/src/main/res/layout/dialog_static_list.xml
index e827916..140e028 100644
--- a/app/src/main/res/layout/dialog_static_list.xml
+++ b/app/src/main/res/layout/dialog_static_list.xml
@@ -1,25 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_200"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginEnd="@dimen/dp_20"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent">
+ android:layout_height="wrap_content"
+ android:background="@color/text_FF222222"
+ android:orientation="vertical">
<LinearLayout
android:id="@+id/hdl_china_ll"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
- android:background="@color/text_FF222222"
android:gravity="center"
- android:orientation="horizontal"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent">
+ android:orientation="horizontal">
<TextView
android:id="@+id/hdl_china_tv"
@@ -27,7 +20,7 @@
android:layout_height="wrap_content"
android:text="HDL China"
android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_18" />
+ android:textSize="@dimen/text_14" />
</LinearLayout>
<View
@@ -35,9 +28,6 @@
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/text_1AFFFFFF"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/hdl_china_ll"
/>
@@ -46,12 +36,8 @@
android:id="@+id/hdl_bahrain_ll"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
- android:background="@color/text_FF222222"
android:gravity="center"
- android:orientation="horizontal"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/line_v">
+ android:orientation="horizontal">
<TextView
android:id="@+id/hdl_bahrain_tv"
@@ -59,32 +45,34 @@
android:layout_height="wrap_content"
android:text="HDL Bahrain"
android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_18"
+ android:textSize="@dimen/text_14"
/>
</LinearLayout>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="20dp"
+ android:background="@color/text_FF000000"
+
+ />
<LinearLayout
android:id="@+id/hdl_cancel_ll"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
- android:layout_marginTop="@dimen/dp_20"
- android:background="@color/text_FF222222"
android:gravity="center"
- android:orientation="horizontal"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/hdl_bahrain_ll">
+ android:orientation="horizontal">
<TextView
android:id="@+id/hdl_cancel_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/loading_cancel"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_18"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_14"
/>
</LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/view_camera_album.xml b/app/src/main/res/layout/view_camera_album.xml
index 52b093e..ee6b9f0 100644
--- a/app/src/main/res/layout/view_camera_album.xml
+++ b/app/src/main/res/layout/view_camera_album.xml
@@ -1,54 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/ll_Pop"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/text_FF222222"
android:orientation="vertical">
- <LinearLayout
- android:id="@+id/ll_Pop"
+ <TextView
+ android:id="@+id/tv_Camera"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:layout_height="@dimen/dp_54"
+ android:gravity="center"
+ android:text="@string/me_personal_data_photograph"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="14sp" />
- <TextView
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_0_5"
+ android:background="@color/text_1AFFFFFF" />
- android:id="@+id/tv_Camera"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_54"
- android:background="@color/text_FF1C1C1E"
- android:gravity="center"
- android:text="@string/me_personal_data_photograph"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="16sp" />
+ <TextView
+ android:id="@+id/tv_Album"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_54"
+ android:gravity="center"
+ android:text="@string/me_personal_data_select_album"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="14sp" />
- <View
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_0_5"
- android:background="@color/text_1AFFFFFF" />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_20"
+ android:background="@color/text_FF000000" />
- <TextView
- android:id="@+id/tv_Album"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_54"
- android:background="@color/text_FF1C1C1E"
- android:gravity="center"
- android:text="@string/me_personal_data_select_album"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="16sp" />
+ <TextView
+ android:id="@+id/tv_Cancel"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_54"
+ android:gravity="center"
+ android:text="@string/loading_cancel"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="14sp" />
- <View
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_8" />
-
- <TextView
- android:id="@+id/tv_Cancel"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_54"
- android:background="@color/text_FF1C1C1E"
- android:gravity="center"
- android:text="@string/loading_cancel"
- android:textColor="@color/text_66FFFFFF"
- android:textSize="16sp" />
-
- </LinearLayout>
</LinearLayout>
\ 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 6cf37d2..c9fc7f7 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -26,12 +26,12 @@
<string name="home_login_be_logging_in">鐧诲綍涓��</string>
<string name="home_login_power_station">浣撻獙鐢电珯</string>
<string name="home_login_consent_service_agreement">鍚屾剰銆婄敤鎴峰崗璁�嬪拰銆婇殣绉佸崗璁��</string>
- <string name="home_login_error_account_null">璐﹀彿涓嶈兘涓虹┖.</string>
- <string name="home_login_error_password_null">瀵嗙爜涓嶈兘涓虹┖.</string>
- <string name="home_login_error_account_or_password">璐﹀彿鎴栬�呭瘑鐮佷笉瀵�,璇烽噸鏂拌緭鍏�.</string>
- <string name="home_login_error_6_16_str">瀵嗙爜涓嶇鍚堟渶浣庡畨鍏ㄨ姹�,鏈�灏�6鈥�16涓瓧绗�.</string>
- <string name="home_login_error_password_6">瀵嗙爜涓嶈兘灏忎簬6涓瓧绗�.</string>
- <string name="home_login_error_password_16">瀵嗙爜涓嶈兘澶т簬16涓瓧绗�.</string>
+ <string name="home_login_error_account_null">璐﹀彿涓嶈兘涓虹┖銆�</string>
+ <string name="home_login_error_password_null">瀵嗙爜涓嶈兘涓虹┖銆�</string>
+ <string name="home_login_error_account_or_password">璐﹀彿鎴栬�呭瘑鐮佷笉瀵癸紝璇烽噸鏂拌緭鍏ャ��</string>
+ <string name="home_login_error_6_16_str">瀵嗙爜涓嶇鍚堟渶浣庡畨鍏ㄨ姹傦紝鏈�灏�6鈥�16涓瓧绗︺��</string>
+ <string name="home_login_error_password_6">瀵嗙爜涓嶈兘灏忎簬6涓瓧绗︺��</string>
+ <string name="home_login_error_password_16">瀵嗙爜涓嶈兘澶т簬16涓瓧绗︺��</string>
<string name="home_login_input_6_16">璇疯緭鍏�6鈥�16浣嶇殑瀵嗙爜</string>
<string name="home_login_confirm_psw">璇峰啀娆＄‘璁ゅ瘑鐮�</string>
<string name="home_login_phone">鎵嬫満鍙�</string>
@@ -41,10 +41,10 @@
<string name="home_login_verification_code">鑾峰彇楠岃瘉鐮�</string>
<string name="home_login_input_verification_code">璇疯緭鍏ラ獙璇佺爜</string>
<string name="home_login_confirm_reset">纭閲嶇疆</string>
- <string name="home_login_null_verification_code">楠岃瘉鐮佷笉鑳戒负绌�.</string>
- <string name="home_login_phone_null">鎵嬫満鍙蜂笉鑳戒负绌�.</string>
- <string name="home_login_mail_null">閭涓嶈兘涓虹┖.</string>
- <string name="home_login_psw_unlikeliness">涓ゆ杈撳叆瀵嗙爜涓嶄竴鏍�.</string>
+ <string name="home_login_null_verification_code">楠岃瘉鐮佷笉鑳戒负绌恒��</string>
+ <string name="home_login_phone_null">鎵嬫満鍙蜂笉鑳戒负绌恒��</string>
+ <string name="home_login_mail_null">閭涓嶈兘涓虹┖銆�</string>
+ <string name="home_login_psw_unlikeliness">涓ゆ杈撳叆瀵嗙爜涓嶄竴鏍枫��</string>
<string name="home_login_psw_verification_repeater">鍚庨噸鍙�</string>
<string name="home_login_verification_regain">閲嶆柊鑾峰彇</string>
<string name="home_login_pws_reset_succeeded">瀵嗙爜閲嶇疆鎴愬姛</string>
@@ -59,14 +59,14 @@
<string name="home_login_input_old_pws">璇疯緭鍏ュ師瀵嗙爜</string>
<string name="home_login_input_new_pws">璇疯緭鍏ユ柊瀵嗙爜</string>
<string name="home_login_input_affirm_psw">璇峰啀娆¤緭鍏ユ柊瀵嗙爜</string>
- <string name="home_login_input_unlike_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="home_password_changed_successfully_log_in">瀵嗙爜淇敼鎴愬姛,灏嗛噸鏂扮櫥褰�.</string>
- <string name="home_old_password_not_new_password">鍘熷瘑鐮佸拰鏂板瘑鐮佷笉鑳戒竴鏍�.</string>
- <string name="home_account_registered_successfully">娉ㄥ唽鎴愬姛.</string>
+ <string name="home_chinese_mainland">涓浗</string>
+ <string name="home_password_changed_successfully_log_in">瀵嗙爜淇敼鎴愬姛锛屽皢閲嶆柊鐧诲綍銆�</string>
+ <string name="home_old_password_not_new_password">鍘熷瘑鐮佸拰鏂板瘑鐮佷笉鑳戒竴鏍枫��</string>
+ <string name="home_account_registered_successfully">娉ㄥ唽鎴愬姛銆�</string>
<!--鎴戠殑鐢电珯-->
@@ -152,7 +152,7 @@
<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_service_agreement">鐢ㄦ埛鍗忚</string>
<string name="app_privacy_policy">闅愮鏀跨瓥</string>
<string name="app_update_now">绔嬪嵆鏇存柊</string>
<string name="app_cancel_update">鍙栨秷鏇存柊</string>
@@ -161,12 +161,12 @@
<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>
+ <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_binding_cloud_upgrade_fails">閫嗗彉鍣ㄦ病缁戝畾杩囷紝鍗囩骇澶辫触銆�</string>
+ <string name="ota_not_cloud_upgrade_fails">閫嗗彉鍣ㄦ病杩炰笂浜戯紝鍗囩骇澶辫触銆�</string>
<!--uin-->
@@ -178,22 +178,22 @@
<string name="loading_agree">鍚屾剰骞剁櫥褰�</string>
<string name="loading_on_agree">涓嶅悓鎰�</string>
<string name="loading_privacy">闅愮鏉冩斂绛栧強鏈嶅姟鏉℃</string>
- <string name="loading_privacy_server">涓轰簡鏇村ソ鐨勪繚闅滄偍鐨勫悎娉曟潈鐩婏紝璇锋偍闃呰骞跺悓鎰忎互涓嬪崗璁�婄敤鎴峰崗璁�嬪拰銆婇殣绉佸崗璁��.</string>
+ <string name="loading_privacy_server">涓轰簡鏇村ソ鐨勪繚闅滄偍鐨勫悎娉曟潈鐩婏紝璇锋偍闃呰骞跺悓鎰忎互涓嬪崗璁�婄敤鎴峰崗璁�嬪拰銆婇殣绉佸崗璁�嬨��</string>
<string name="kill_app">鍐嶆寜涓�娆￠��鍑哄簲鐢�</string>
- <string name="loading_not_supported">鎶辨瓑,鏆備笉鏀寔</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="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_save_fial">淇濆瓨璺緞寮傚父锛岃閲嶈瘯銆�</string>
<!-- 鏉冮檺 -->
<!-- 鍥剧墖涓婁紶 -->
<string name="camera_album_file_get_fial">鍥剧墖鑾峰彇澶辫触</string>
- <string name="camera_album_system_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>
@@ -204,9 +204,9 @@
<string name="event">浜嬩欢</string>
<string name="The_gateway_cannot_be_found_locally">鏈湴鎵句笉鍒扮綉鍏�</string>
<string name="welcome_to_the_smart_energy_app">娆㈣繋鎵撳紑鏅烘収鑳芥簮APP</string>
- <string name="no_permissions_unable_to_receive_push">閫氱煡鏉冮檺娌″紑鍚�,灏嗘棤娉曟敹鍒版帹閫佷俊鎭�</string>
+ <string name="no_permissions_unable_to_receive_push">閫氱煡鏉冮檺娌″紑鍚紝灏嗘棤娉曟敹鍒版帹閫佷俊鎭��</string>
<string name="go_to_settings">鍓嶅線璁剧疆</string>
- <string name="system_positioning_switch">闇�瑕佹墦寮�绯荤粺瀹氫綅寮�鍏�,鍚﹀垯鍙栨硶鑾峰彇浣嶇疆淇℃伅</string>
+ <string name="system_positioning_switch">闇�瑕佹墦寮�绯荤粺瀹氫綅寮�鍏筹紝鍚﹀垯鍙栨硶鑾峰彇浣嶇疆淇℃伅銆�</string>
<!--寮傚父-->
@@ -219,10 +219,10 @@
<string name="exception_the_upgrade_file_is_downloaded">鍗囩骇鏂囦欢涓嬭浇瀹屾垚</string>
<string name="exception_no_location_information_permission">娌℃湁浣嶇疆淇℃伅鏉冮檺</string>
<string name="exception_the_location_function_is_not_enabled">娌″紑鍚畾浣嶅姛鑳�</string>
- <string name="exception_unable_location_move10_meters_later">鏃犳硶鑾峰彇浣嶇疆,璇风Щ鍔ㄦ墜鏈�10绫冲悗,鍐嶉噸鏂拌幏鍙�</string>
+ <string name="exception_unable_location_move10_meters_later">鏃犳硶鑾峰彇浣嶇疆锛岃绉诲姩鎵嬫満10绫冲悗锛屽啀閲嶆柊鑾峰彇銆�</string>
<string name="succeed">鎴愬姛</string>
- <string name="delete_power_station">鏄惁瑕佸垹闄�%s鐢电珯?</string>
+ <string name="delete_power_station">鏄惁瑕佸垹闄�%s鐢电珯锛�</string>
<string name="power_station_selection">鐢电珯閫夋嫨</string>
<string name="alarm_all_device">鍏ㄩ儴璁惧</string>
<string name="alarm_all_device_inverter">閫嗗彉鍣�</string>
@@ -241,22 +241,22 @@
<string name="alarm_device">璁惧鎶ヨ</string>
<string name="alarm_record">鎶ヨ璁板綍</string>
<string name="power_station_editing">鐢电珯缂栬緫</string>
- <string name="switch_power_station">鏄惁瑕佸垏鎹�%s鐢电珯?</string>
- <string name="deleting_please_wait">鍒犻櫎涓�,璇风◢绛夆��</string>
+ <string name="switch_power_station">鏄惁瑕佸垏鎹�%s鐢电珯锛�</string>
+ <string name="deleting_please_wait">鍒犻櫎涓紝璇风◢绛夆��</string>
<string name="already_the_first_one">宸茬粡鏄涓�涓簡</string>
- <string name="restarting_please_wait">閲嶅惎涓�,璇风瓑寰呪��</string>
- <string name="port_conflict">搴旂敤鍐茬獊锛岄渶瑕佸叧闂璷npro鎴栬�呭叾瀹冪増鏈殑璋冭瘯杞欢鐒跺悗鍐嶉噸鏂板惎鍔ㄨ繖涓蒋浠惰瘯璇�</string>
+ <string name="restarting_please_wait">閲嶅惎涓紝璇风瓑寰呪��</string>
+ <string name="port_conflict">搴旂敤鍐茬獊锛岄渶瑕佸叧闂璷npro鎴栬�呭叾瀹冪増鏈殑璋冭瘯杞欢鐒跺悗鍐嶉噸鏂板惎鍔ㄨ繖涓蒋浠惰瘯璇曘��</string>
- <string name="cancel_download_successfully">鍙栨秷涓嬭浇鎴愬姛.</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="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="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>
@@ -265,7 +265,7 @@
<string name="hour">鏃�</string>
<string name="minutc">鍒�</string>
<string name="seconds">绉�</string>
- <string name="the_query_date_is_exceeded">瓒呭嚭鏌ヨ鏃ユ湡.</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>
@@ -277,7 +277,7 @@
<string name="station_name">鐢电珯鍚嶇О</string>
<string name="search">鎼滅储</string>
<string name="history_search">鍘嗗彶鎼滅储</string>
- <string name="search_content_null">鎼滅储鍐呭涓嶈兘涓虹┖.</string>
+ <string name="search_content_null">鎼滅储鍐呭涓嶈兘涓虹┖</string>
<string name="no_equipment">鏆傛棤璁惧!</string>
<string name="filtering">绛涢��</string>
<string name="reset">閲嶇疆</string>
@@ -292,7 +292,7 @@
<string name="email_address">閭鍦板潃</string>
<string name="successful_replication">宸插鍒跺埌鍓垏鏉�</string>
<string name="to_be_added">寰呮帴鍏�</string>
- <string name="saving_standard_coal">鏍囧噯鐓�</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>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6cf37d2..237adaf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,12 +26,12 @@
<string name="home_login_be_logging_in">鐧诲綍涓��</string>
<string name="home_login_power_station">浣撻獙鐢电珯</string>
<string name="home_login_consent_service_agreement">鍚屾剰銆婄敤鎴峰崗璁�嬪拰銆婇殣绉佸崗璁��</string>
- <string name="home_login_error_account_null">璐﹀彿涓嶈兘涓虹┖.</string>
- <string name="home_login_error_password_null">瀵嗙爜涓嶈兘涓虹┖.</string>
- <string name="home_login_error_account_or_password">璐﹀彿鎴栬�呭瘑鐮佷笉瀵�,璇烽噸鏂拌緭鍏�.</string>
- <string name="home_login_error_6_16_str">瀵嗙爜涓嶇鍚堟渶浣庡畨鍏ㄨ姹�,鏈�灏�6鈥�16涓瓧绗�.</string>
- <string name="home_login_error_password_6">瀵嗙爜涓嶈兘灏忎簬6涓瓧绗�.</string>
- <string name="home_login_error_password_16">瀵嗙爜涓嶈兘澶т簬16涓瓧绗�.</string>
+ <string name="home_login_error_account_null">璐﹀彿涓嶈兘涓虹┖銆�</string>
+ <string name="home_login_error_password_null">瀵嗙爜涓嶈兘涓虹┖銆�</string>
+ <string name="home_login_error_account_or_password">璐﹀彿鎴栬�呭瘑鐮佷笉瀵癸紝璇烽噸鏂拌緭鍏ャ��</string>
+ <string name="home_login_error_6_16_str">瀵嗙爜涓嶇鍚堟渶浣庡畨鍏ㄨ姹傦紝鏈�灏�6鈥�16涓瓧绗︺��</string>
+ <string name="home_login_error_password_6">瀵嗙爜涓嶈兘灏忎簬6涓瓧绗︺��</string>
+ <string name="home_login_error_password_16">瀵嗙爜涓嶈兘澶т簬16涓瓧绗︺��</string>
<string name="home_login_input_6_16">璇疯緭鍏�6鈥�16浣嶇殑瀵嗙爜</string>
<string name="home_login_confirm_psw">璇峰啀娆＄‘璁ゅ瘑鐮�</string>
<string name="home_login_phone">鎵嬫満鍙�</string>
@@ -41,10 +41,10 @@
<string name="home_login_verification_code">鑾峰彇楠岃瘉鐮�</string>
<string name="home_login_input_verification_code">璇疯緭鍏ラ獙璇佺爜</string>
<string name="home_login_confirm_reset">纭閲嶇疆</string>
- <string name="home_login_null_verification_code">楠岃瘉鐮佷笉鑳戒负绌�.</string>
- <string name="home_login_phone_null">鎵嬫満鍙蜂笉鑳戒负绌�.</string>
- <string name="home_login_mail_null">閭涓嶈兘涓虹┖.</string>
- <string name="home_login_psw_unlikeliness">涓ゆ杈撳叆瀵嗙爜涓嶄竴鏍�.</string>
+ <string name="home_login_null_verification_code">楠岃瘉鐮佷笉鑳戒负绌恒��</string>
+ <string name="home_login_phone_null">鎵嬫満鍙蜂笉鑳戒负绌恒��</string>
+ <string name="home_login_mail_null">閭涓嶈兘涓虹┖銆�</string>
+ <string name="home_login_psw_unlikeliness">涓ゆ杈撳叆瀵嗙爜涓嶄竴鏍枫��</string>
<string name="home_login_psw_verification_repeater">鍚庨噸鍙�</string>
<string name="home_login_verification_regain">閲嶆柊鑾峰彇</string>
<string name="home_login_pws_reset_succeeded">瀵嗙爜閲嶇疆鎴愬姛</string>
@@ -59,14 +59,14 @@
<string name="home_login_input_old_pws">璇疯緭鍏ュ師瀵嗙爜</string>
<string name="home_login_input_new_pws">璇疯緭鍏ユ柊瀵嗙爜</string>
<string name="home_login_input_affirm_psw">璇峰啀娆¤緭鍏ユ柊瀵嗙爜</string>
- <string name="home_login_input_unlike_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="home_password_changed_successfully_log_in">瀵嗙爜淇敼鎴愬姛,灏嗛噸鏂扮櫥褰�.</string>
- <string name="home_old_password_not_new_password">鍘熷瘑鐮佸拰鏂板瘑鐮佷笉鑳戒竴鏍�.</string>
- <string name="home_account_registered_successfully">娉ㄥ唽鎴愬姛.</string>
+ <string name="home_password_changed_successfully_log_in">瀵嗙爜淇敼鎴愬姛锛屽皢閲嶆柊鐧诲綍銆�</string>
+ <string name="home_old_password_not_new_password">鍘熷瘑鐮佸拰鏂板瘑鐮佷笉鑳戒竴鏍枫��</string>
+ <string name="home_account_registered_successfully">娉ㄥ唽鎴愬姛銆�</string>
<!--鎴戠殑鐢电珯-->
@@ -152,7 +152,7 @@
<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_service_agreement">鐢ㄦ埛鍗忚</string>
<string name="app_privacy_policy">闅愮鏀跨瓥</string>
<string name="app_update_now">绔嬪嵆鏇存柊</string>
<string name="app_cancel_update">鍙栨秷鏇存柊</string>
@@ -161,12 +161,12 @@
<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>
+ <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_binding_cloud_upgrade_fails">閫嗗彉鍣ㄦ病缁戝畾杩囷紝鍗囩骇澶辫触銆�</string>
+ <string name="ota_not_cloud_upgrade_fails">閫嗗彉鍣ㄦ病杩炰笂浜戯紝鍗囩骇澶辫触銆�</string>
<!--uin-->
@@ -178,22 +178,22 @@
<string name="loading_agree">鍚屾剰骞剁櫥褰�</string>
<string name="loading_on_agree">涓嶅悓鎰�</string>
<string name="loading_privacy">闅愮鏉冩斂绛栧強鏈嶅姟鏉℃</string>
- <string name="loading_privacy_server">涓轰簡鏇村ソ鐨勪繚闅滄偍鐨勫悎娉曟潈鐩婏紝璇锋偍闃呰骞跺悓鎰忎互涓嬪崗璁�婄敤鎴峰崗璁�嬪拰銆婇殣绉佸崗璁��.</string>
+ <string name="loading_privacy_server">涓轰簡鏇村ソ鐨勪繚闅滄偍鐨勫悎娉曟潈鐩婏紝璇锋偍闃呰骞跺悓鎰忎互涓嬪崗璁�婄敤鎴峰崗璁�嬪拰銆婇殣绉佸崗璁�嬨��</string>
<string name="kill_app">鍐嶆寜涓�娆￠��鍑哄簲鐢�</string>
- <string name="loading_not_supported">鎶辨瓑,鏆備笉鏀寔</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="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_save_fial">淇濆瓨璺緞寮傚父锛岃閲嶈瘯銆�</string>
<!-- 鏉冮檺 -->
<!-- 鍥剧墖涓婁紶 -->
<string name="camera_album_file_get_fial">鍥剧墖鑾峰彇澶辫触</string>
- <string name="camera_album_system_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>
@@ -204,9 +204,9 @@
<string name="event">浜嬩欢</string>
<string name="The_gateway_cannot_be_found_locally">鏈湴鎵句笉鍒扮綉鍏�</string>
<string name="welcome_to_the_smart_energy_app">娆㈣繋鎵撳紑鏅烘収鑳芥簮APP</string>
- <string name="no_permissions_unable_to_receive_push">閫氱煡鏉冮檺娌″紑鍚�,灏嗘棤娉曟敹鍒版帹閫佷俊鎭�</string>
+ <string name="no_permissions_unable_to_receive_push">閫氱煡鏉冮檺娌″紑鍚紝灏嗘棤娉曟敹鍒版帹閫佷俊鎭��</string>
<string name="go_to_settings">鍓嶅線璁剧疆</string>
- <string name="system_positioning_switch">闇�瑕佹墦寮�绯荤粺瀹氫綅寮�鍏�,鍚﹀垯鍙栨硶鑾峰彇浣嶇疆淇℃伅</string>
+ <string name="system_positioning_switch">闇�瑕佹墦寮�绯荤粺瀹氫綅寮�鍏筹紝鍚﹀垯鍙栨硶鑾峰彇浣嶇疆淇℃伅銆�</string>
<!--寮傚父-->
@@ -219,10 +219,10 @@
<string name="exception_the_upgrade_file_is_downloaded">鍗囩骇鏂囦欢涓嬭浇瀹屾垚</string>
<string name="exception_no_location_information_permission">娌℃湁浣嶇疆淇℃伅鏉冮檺</string>
<string name="exception_the_location_function_is_not_enabled">娌″紑鍚畾浣嶅姛鑳�</string>
- <string name="exception_unable_location_move10_meters_later">鏃犳硶鑾峰彇浣嶇疆,璇风Щ鍔ㄦ墜鏈�10绫冲悗,鍐嶉噸鏂拌幏鍙�</string>
+ <string name="exception_unable_location_move10_meters_later">鏃犳硶鑾峰彇浣嶇疆锛岃绉诲姩鎵嬫満10绫冲悗锛屽啀閲嶆柊鑾峰彇銆�</string>
<string name="succeed">鎴愬姛</string>
- <string name="delete_power_station">鏄惁瑕佸垹闄�%s鐢电珯?</string>
+ <string name="delete_power_station">鏄惁瑕佸垹闄�%s鐢电珯锛�</string>
<string name="power_station_selection">鐢电珯閫夋嫨</string>
<string name="alarm_all_device">鍏ㄩ儴璁惧</string>
<string name="alarm_all_device_inverter">閫嗗彉鍣�</string>
@@ -241,22 +241,22 @@
<string name="alarm_device">璁惧鎶ヨ</string>
<string name="alarm_record">鎶ヨ璁板綍</string>
<string name="power_station_editing">鐢电珯缂栬緫</string>
- <string name="switch_power_station">鏄惁瑕佸垏鎹�%s鐢电珯?</string>
- <string name="deleting_please_wait">鍒犻櫎涓�,璇风◢绛夆��</string>
+ <string name="switch_power_station">鏄惁瑕佸垏鎹�%s鐢电珯锛�</string>
+ <string name="deleting_please_wait">鍒犻櫎涓紝璇风◢绛夆��</string>
<string name="already_the_first_one">宸茬粡鏄涓�涓簡</string>
- <string name="restarting_please_wait">閲嶅惎涓�,璇风瓑寰呪��</string>
- <string name="port_conflict">搴旂敤鍐茬獊锛岄渶瑕佸叧闂璷npro鎴栬�呭叾瀹冪増鏈殑璋冭瘯杞欢鐒跺悗鍐嶉噸鏂板惎鍔ㄨ繖涓蒋浠惰瘯璇�</string>
+ <string name="restarting_please_wait">閲嶅惎涓紝璇风瓑寰呪��</string>
+ <string name="port_conflict">搴旂敤鍐茬獊锛岄渶瑕佸叧闂璷npro鎴栬�呭叾瀹冪増鏈殑璋冭瘯杞欢鐒跺悗鍐嶉噸鏂板惎鍔ㄨ繖涓蒋浠惰瘯璇曘��</string>
- <string name="cancel_download_successfully">鍙栨秷涓嬭浇鎴愬姛.</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="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="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>
@@ -265,7 +265,7 @@
<string name="hour">鏃�</string>
<string name="minutc">鍒�</string>
<string name="seconds">绉�</string>
- <string name="the_query_date_is_exceeded">瓒呭嚭鏌ヨ鏃ユ湡.</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>
@@ -277,7 +277,7 @@
<string name="station_name">鐢电珯鍚嶇О</string>
<string name="search">鎼滅储</string>
<string name="history_search">鍘嗗彶鎼滅储</string>
- <string name="search_content_null">鎼滅储鍐呭涓嶈兘涓虹┖.</string>
+ <string name="search_content_null">鎼滅储鍐呭涓嶈兘涓虹┖</string>
<string name="no_equipment">鏆傛棤璁惧!</string>
<string name="filtering">绛涢��</string>
<string name="reset">閲嶇疆</string>
@@ -292,7 +292,7 @@
<string name="email_address">閭鍦板潃</string>
<string name="successful_replication">宸插鍒跺埌鍓垏鏉�</string>
<string name="to_be_added">寰呮帴鍏�</string>
- <string name="saving_standard_coal">鏍囧噯鐓�</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>
--
Gitblit v1.8.0