From a399dc449dc962c088c2cacbc4c32d503ced816f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 04 十二月 2024 18:58:41 +0800
Subject: [PATCH] 2024年12月04日18:58:39
---
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java | 8 +-
app/src/main/res/values/strings.xml | 4
app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java | 4
app/src/main/AndroidManifest.xml | 4
app/src/main/res/drawable/desktop_logo.png | 0
app/src/main/res/layout/dialog_agree_onagree.xml | 32 +++++-----
aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java | 32 ++++++++++
app/src/main/res/layout/dialog_confirm_cancel.xml | 2
app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 2
app/src/main/res/values-zh/strings.xml | 4
app/src/main/res/layout/activity_home_login.xml | 2
app/src/main/res/values-en/strings.xml | 36 ++++++------
aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAChartModel.java | 2
13 files changed, 80 insertions(+), 52 deletions(-)
diff --git a/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAChartModel.java b/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAChartModel.java
index 79330b5..e0f7914 100644
--- a/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAChartModel.java
+++ b/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAChartModel.java
@@ -335,7 +335,7 @@
yAxisLabelsEnabled = true;
yAxisGridLineWidth = 1f;
legendEnabled = true;
- backgroundColor = "#FF333738";
+ backgroundColor = "#333738";
borderRadius = 0f;//鏌辩姸鍥鹃暱鏉″浘澶撮儴鍦嗚鍗婂緞(鍙敤浜庤缃ご閮ㄧ殑褰㈢姸,浠呭鏉″舰鍥�,鏌辩姸鍥炬湁鏁�,璁剧疆涓�1000鏃�,鏌卞舰鍥炬垨鑰呮潯褰㈠浘澶撮儴涓烘褰�)
markerRadius = 6f;//鎶樼嚎杩炴帴鐐圭殑鍗婂緞闀垮害,濡傛灉鍊艰缃负0,杩欐牱灏辩浉褰撲簬涓嶆樉绀轰簡
}
diff --git a/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java b/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java
index da13449..61c7c07 100644
--- a/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java
+++ b/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java
@@ -552,6 +552,36 @@
* SegmentFault : https://segmentfault.com/u/huanghunbieguan
* <p>
* -------------------------------------------------------------------------------
+ * <p>
+ * -------------------------------------------------------------------------------
+ * <p>
+ * 馃寱 馃寲 馃寳 馃寴 鉂�鉂�鉂� WARM TIPS!!! 鉂�鉂�鉂� 馃寫 馃寬 馃寭 馃寯
+ * <p>
+ * Please contact me on GitHub,if there are any problems encountered in use.
+ * GitHub Issues : https://github.com/AAChartModel/AAChartCore/issues
+ * -------------------------------------------------------------------------------
+ * And if you want to contribute for this project, please contact me as well
+ * GitHub : https://github.com/AAChartModel
+ * StackOverflow : https://stackoverflow.com/users/7842508/codeforu
+ * JianShu : http://www.jianshu.com/u/f1e6753d4254
+ * SegmentFault : https://segmentfault.com/u/huanghunbieguan
+ * <p>
+ * -------------------------------------------------------------------------------
+ * <p>
+ * -------------------------------------------------------------------------------
+ * <p>
+ * 馃寱 馃寲 馃寳 馃寴 鉂�鉂�鉂� WARM TIPS!!! 鉂�鉂�鉂� 馃寫 馃寬 馃寭 馃寯
+ * <p>
+ * Please contact me on GitHub,if there are any problems encountered in use.
+ * GitHub Issues : https://github.com/AAChartModel/AAChartCore/issues
+ * -------------------------------------------------------------------------------
+ * And if you want to contribute for this project, please contact me as well
+ * GitHub : https://github.com/AAChartModel
+ * StackOverflow : https://stackoverflow.com/users/7842508/codeforu
+ * JianShu : http://www.jianshu.com/u/f1e6753d4254
+ * SegmentFault : https://segmentfault.com/u/huanghunbieguan
+ * <p>
+ * -------------------------------------------------------------------------------
*/
/**
@@ -634,7 +664,7 @@
.enabled(true) //鍚敤娴姩鎻愮ず妗�
// .shared(true) //澶氱粍鏁版嵁鍏变韩涓�涓诞鍔ㄦ彁绀烘
.backgroundColor(AAColor.rgbaColor(85, 88, 89, 1f))
- .borderRadius(8)
+ .borderRadius(16)
.borderWidth(0)
.valueDecimals(2)
.style(aaStyle)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3d4a321..e5e8931 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -70,10 +70,10 @@
<application
android:name=".HDLApp"
android:allowBackup="true"
- android:icon="@drawable/logo"
+ android:icon="@drawable/desktop_logo"
android:label="@string/app_name"
android:requestLegacyExternalStorage="true"
- android:roundIcon="@drawable/logo"
+ android:roundIcon="@drawable/desktop_logo"
android:supportsRtl="true"
android:theme="@style/Theme.PhotovoltaicDebug">
<activity
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
index 33a4d7b..e6f13a0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -123,7 +123,7 @@
//璁剧疆瀛椾綋棰滆壊
ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
// 鍘绘帀涓嬪垝绾�
- ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
+ ds.setUnderlineText(true);
}
@@ -143,7 +143,7 @@
//璁剧疆瀛椾綋棰滆壊
ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
// 鍘绘帀涓嬪垝绾�
- ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
+ ds.setUnderlineText(true);
}
@@ -538,7 +538,7 @@
//璁剧疆瀛椾綋棰滆壊
ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
// 鍘绘帀涓嬪垝绾�
- ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
+ ds.setUnderlineText(true);
}
@@ -561,7 +561,7 @@
//璁剧疆瀛椾綋棰滆壊
ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
// 鍘绘帀涓嬪垝绾�
- ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
+ ds.setUnderlineText(true);
}
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 28f214f..a55ade6 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
@@ -420,7 +420,7 @@
if(needDelay) {
viewBinding.autoSizeMyAAChart.setX(10000);//鐩存帴鎵撳紑鏈夐棯灞忥紝鍦ㄤ笉鏄剧ず鐨勫湴鏂瑰厛鏄剧ず锛屽啀绉诲姩鍒版甯哥殑浣嶇疆銆俆ODO 鍚庣画鎵惧埌鏍规簮闂鍚庡幓鎺夎繖涓敤娉�
aaChartView.aa_drawChartWithChartOptions(aaChartModel.aa_toAAOptions());
- mHandler.sendEmptyMessageDelayed(100,800);
+ mHandler.sendEmptyMessageDelayed(100,1000);
}
else{
aaChartView.aa_drawChartWithChartOptions(aaChartModel.aa_toAAOptions());
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java b/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java
index d69826d..973ca78 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java
@@ -25,7 +25,7 @@
.backgroundColor("#EDEFF2")
// .backgroundColor("#4b2b7f")
.dataLabelsEnabled(false)
- .yAxisGridLineWidth(0.5)
+// .yAxisGridLineWidth(0.5)
.touchEventEnabled(true);
}
@@ -55,7 +55,7 @@
// .data(new Object[]{3.9, 4.2, 5.7, 8.5, 11.9, 15.2, 17.0, 16.6, 14.2, 10.3, 6.6, 4.8});
return configureBasicOptions()
- .backgroundColor("#EDEFF2")
+ .backgroundColor("#333738")
.legendEnabled(false)
.markerRadius(0)
// .markerSymbol(AAChartSymbolType.Circle)
diff --git a/app/src/main/res/drawable/desktop_logo.png b/app/src/main/res/drawable/desktop_logo.png
new file mode 100644
index 0000000..4b75b5f
--- /dev/null
+++ b/app/src/main/res/drawable/desktop_logo.png
Binary files differ
diff --git a/app/src/main/res/layout/activity_home_login.xml b/app/src/main/res/layout/activity_home_login.xml
index 671c39f..034432c 100644
--- a/app/src/main/res/layout/activity_home_login.xml
+++ b/app/src/main/res/layout/activity_home_login.xml
@@ -260,7 +260,7 @@
android:gravity="center"
android:text="@string/home_login_logoin"
android:textColor="@color/text_66FFFFFF"
- android:textSize="18sp"
+ android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v"
app:layout_constraintStart_toStartOf="@+id/home_login_line2_v"
app:layout_constraintTop_toBottomOf="@+id/home_login_forget_password_tv" />
diff --git a/app/src/main/res/layout/dialog_agree_onagree.xml b/app/src/main/res/layout/dialog_agree_onagree.xml
index 9d853d9..6982ba8 100644
--- a/app/src/main/res/layout/dialog_agree_onagree.xml
+++ b/app/src/main/res/layout/dialog_agree_onagree.xml
@@ -12,7 +12,7 @@
android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_48"
android:layout_marginBottom="@dimen/dp_20"
- android:background="@drawable/loading_confirmation_bj"
+ android:background="@drawable/bj_ff333738"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -23,7 +23,7 @@
android:layout_width="0dp"
android:layout_height="@dimen/dp_25"
android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_24"
+ android:layout_marginTop="@dimen/dp_25"
android:layout_marginEnd="@dimen/dp_20"
android:gravity="center"
android:textColor="@color/text_030D1C"
@@ -37,7 +37,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_43"
+ android:layout_marginTop="@dimen/dp_25"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_34"
android:singleLine="false"
@@ -55,22 +55,20 @@
android:id="@+id/dialog_confirm_bottom_line_ly"
android:layout_width="0dp"
android:layout_height="@dimen/dp_52"
+ android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
+ android:layout_marginEnd="@dimen/dp_16"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loading_confirmation_content_tv">
- <View
- android:layout_width="@dimen/dp_16"
- android:layout_height="match_parent" />
-
-
<LinearLayout
android:id="@+id/dialog_cancel_ly"
- android:layout_width="@dimen/dp_120"
+ android:layout_width="0dp"
android:layout_height="match_parent"
- android:background="@drawable/fillet_line_00000000">
+ android:layout_weight="1"
+ android:background="@drawable/bj_ff555859_no">
<TextView
android:id="@+id/dialog_cancel_tv"
@@ -78,8 +76,8 @@
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/loading_on_agree"
- android:textColor="@color/text_FF245EC3"
- android:textSize="@dimen/text_18" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
</LinearLayout>
@@ -90,19 +88,19 @@
<LinearLayout
android:id="@+id/dialog_confirm_ly"
- android:layout_width="@dimen/dp_120"
+ android:layout_width="0dp"
android:layout_height="match_parent"
- android:background="@drawable/fillet_line_00000000">
+ android:layout_weight="1"
+ android:background="@drawable/bj_ff555859">
<TextView
android:id="@+id/dialog_confirm_tv"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/checked"
android:gravity="center"
android:text="@string/loading_agree"
- android:textColor="@color/text_FFFFFFFF"
- android:textSize="@dimen/text_18" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
</LinearLayout>
</LinearLayout>
<!--搴曢儴闂磋窛-->
diff --git a/app/src/main/res/layout/dialog_confirm_cancel.xml b/app/src/main/res/layout/dialog_confirm_cancel.xml
index 4f89afe..3684bfa 100644
--- a/app/src/main/res/layout/dialog_confirm_cancel.xml
+++ b/app/src/main/res/layout/dialog_confirm_cancel.xml
@@ -37,7 +37,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_43"
+ android:layout_marginTop="@dimen/dp_25"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_25"
android:gravity="center"
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 6e688a2..273e3b2 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -15,31 +15,31 @@
<string name="home_login_chinese">绠�浣撲腑鏂�</string>
<string name="home_login_hdl_stored_energy">HDL Solar Energy</string>
<string name="home_login_an_installer">I am an installer</string>
- <string name="home_login_input_phone_email">Please enter your mobile number/email address</string>
- <string name="home_login_input_phone">Please enter your mobile number</string>
+ <string name="home_login_input_phone_email"> Enter your mobile number/email address</string>
+ <string name="home_login_input_phone"> Enter your mobile number</string>
<string name="home_login_email_address">Email address</string>
- <string name="home_login_input_psw">Please enter your password</string>
+ <string name="home_login_input_psw"> Enter your password</string>
<string name="home_login_register"> Register</string>
<string name="home_login_forget_password">Forgot password</string>
<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">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_consent_service_agreement">I agree to the 銆奣erms of Service銆� and 銆奝rivacy Policy銆�</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>
+ <string name="home_login_error_password_null"> Cannot be empty.</string>
<string name="home_login_error_account_or_password">Incorrect account or password, please re-enter.</string>
- <string name="home_login_error_6_16_str">Password does not meet minimum security requirements, must be 6-16 characters.</string>
- <string name="home_login_error_password_6">Password cannot be less than 6 characters.</string>
- <string name="home_login_error_password_16">Password cannot be more than 16 characters.</string>
- <string name="home_login_input_6_16">Please enter a 6-16 character password</string>
- <string name="home_login_confirm_psw">Please confirm your password again</string>
+ <string name="home_login_error_6_16_str"> Does not meet minimum security requirements, must be 6-16 characters.</string>
+ <string name="home_login_error_password_6"> Cannot be less than 6 characters.</string>
+ <string name="home_login_error_password_16"> Cannot be more than 16 characters.</string>
+ <string name="home_login_input_6_16"> Enter a 6-16 character password</string>
+ <string name="home_login_confirm_psw"> Confirm your password again</string>
<string name="home_login_phone">Phone number</string>
<string name="home_login_email">Email</string>
- <string name="home_login_input_mail">Please enter your email address</string>
- <string name="home_login_national_region">Please select country/region</string>
+ <string name="home_login_input_mail"> Enter your email address</string>
+ <string name="home_login_national_region"> Select country/region</string>
<string name="home_login_verification_code">Get verification code</string>
- <string name="home_login_input_verification_code">Please enter verification code</string>
+ <string name="home_login_input_verification_code"> Enter verification code</string>
<string name="home_login_confirm_reset">Confirm reset</string>
<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>
@@ -55,10 +55,10 @@
<string name="home_login_new_pws">New password</string>
<string name="home_login_affirm_psw">Confirm password</string>
<string name="home_login_affirm">Confirm</string>
- <string name="home_login_least6">Password must be at least 6 characters</string>
- <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_least6"> Must be at least 6 characters</string>
+ <string name="home_login_input_old_pws"> Enter your current password</string>
+ <string name="home_login_input_new_pws"> Enter your new password</string>
+ <string name="home_login_input_affirm_psw"> Enter your new password again</string>
<string name="home_login_input_unlike_psw">New password and confirm password are different</string>
<string name="home_login_change_name_succeed">successfully updated</string>
<string name="verification">Verification code</string>
@@ -66,7 +66,7 @@
<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>
- <string name="home_account_registered_successfully">registered successfully.</string>
+ <string name="home_account_registered_successfully">Registered successfully.</string>
<!--鎴戠殑鐢电珯-->
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 329bd70..7b36d32 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -25,7 +25,7 @@
<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>
+ <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>
@@ -178,7 +178,7 @@
<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_title_tip">鎻愮ず</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 329bd70..0352fe3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -25,7 +25,7 @@
<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>
+ <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>
@@ -178,7 +178,7 @@
<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_title_tip">鎻愮ず</string>
--
Gitblit v1.8.0