From 629b99799dd12e12c4df94481ec6e877efae7edb Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 04 八月 2021 10:58:36 +0800
Subject: [PATCH] Merge branch 'wxr7-ez' into wxr7
---
HDL-ON_iOS/Info.plist | 4 +-
HDL-ON_iOS/Resources/Language.ini | 12 +++---
HDL-ON_Android/Assets/Language.ini | 12 +++---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 36 +++++++++++-------
4 files changed, 36 insertions(+), 28 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 5e34c85..3faa41f 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,22 +1,30 @@
-锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_iOS/Resources/Language.ini">
+锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget." />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/MainPage.cs">
<Files>
- <File FileName="HDL-ON_Android/Assets/Language.ini" Line="1599" Column="10" />
- <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="2138" Column="1" />
+ <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="2050" Column="6" />
+ <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="33" Column="23" />
+ <File FileName="HDL_ON/Entity/Enumerative/Command.cs" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Packet.cs" />
+ <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI1-Login/RegisterPage.cs" />
+ <File FileName="HDL_ON/UI/UI1-Login/RegisterPageBLL.cs" />
+ <File FileName="HDL_ON/Common/Utlis.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaAirCleanerPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs" />
+ <File FileName="HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs" Line="492" Column="50" />
+ <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="302" Column="78" />
+ <File FileName="HDL_ON/Common/R.cs" Line="1618" Column="39" />
+ <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="1236" Column="74" />
+ <File FileName="HDL-ON_Android/Assets/Language.ini" Line="2138" Column="1" />
+ <File FileName="HDL-ON_iOS/Info.plist" />
+ <File FileName="HDL_ON/UI/MainPage.cs" Line="28" Column="55" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
- <Node name="HDL-ON_Android" expanded="True">
- <Node name="Assets" expanded="True" />
- </Node>
- <Node name="HDL-ON_iOS" expanded="True">
- <Node name="Resources" expanded="True">
- <Node name="Language.ini" selected="True" />
- </Node>
- </Node>
+ <Node name="HDL-ON_iOS" expanded="True" />
</Node>
</State>
</Pad>
@@ -28,7 +36,7 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index ba81005..4cb8f50 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -984,10 +984,10 @@
9010=New password
9011=Enter new password again
9012=Agree
-9013=User agreement
-9014=Privacy agreement
+9013=Service Agreement
+9014=User information protection regulations
9015=and
-9016=Please read and agree on User Agreement and Privacy Agreement.
+9016=Please read and agree on User Service Agreement and User information protection regulations.
9017=Are you sure to log out?
9018=Please select country/region.
9019=Update now
@@ -2044,10 +2044,10 @@
9010=鏂板瘑鐮�
9011=鍐嶆杈撳叆鏂板瘑鐮�
9012=鍚屾剰
-9013=鐢ㄦ埛鍗忚
-9014=闅愮鏀跨瓥
+9013=鏈嶅姟鍗忚
+9014=鐢ㄦ埛淇℃伅淇濇姢瑙勫畾
9015=鍜�
-9016=璇峰厛闃呰骞跺悓鎰忋�婄敤鎴峰崗璁�嬪拰銆婇殣绉佹斂绛栥��
+9016=璇峰厛闃呰骞跺悓鎰忋�婃湇鍔″崗璁�嬪拰銆婄敤鎴蜂俊鎭繚鎶よ瀹氥��
9017=纭閫�鍑虹櫥褰曪紵
9018=璇烽�夋嫨鍥藉/鍖哄煙
9019=绔嬪嵆鏇存柊
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index 2a75a3c..230005a 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -100,9 +100,9 @@
<key>UIStatusBarStyle</key>
<string>UIStatusBarStyleLightContent</string>
<key>CFBundleShortVersionString</key>
- <string>1.2.202107211</string>
+ <string>1.2.202108041</string>
<key>CFBundleVersion</key>
- <string>1.2.07211</string>
+ <string>1.2.08041</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Use geographic location to provide services such as weather</string>
<key>NSAppleMusicUsageDescription</key>
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index ba81005..4cb8f50 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -984,10 +984,10 @@
9010=New password
9011=Enter new password again
9012=Agree
-9013=User agreement
-9014=Privacy agreement
+9013=Service Agreement
+9014=User information protection regulations
9015=and
-9016=Please read and agree on User Agreement and Privacy Agreement.
+9016=Please read and agree on User Service Agreement and User information protection regulations.
9017=Are you sure to log out?
9018=Please select country/region.
9019=Update now
@@ -2044,10 +2044,10 @@
9010=鏂板瘑鐮�
9011=鍐嶆杈撳叆鏂板瘑鐮�
9012=鍚屾剰
-9013=鐢ㄦ埛鍗忚
-9014=闅愮鏀跨瓥
+9013=鏈嶅姟鍗忚
+9014=鐢ㄦ埛淇℃伅淇濇姢瑙勫畾
9015=鍜�
-9016=璇峰厛闃呰骞跺悓鎰忋�婄敤鎴峰崗璁�嬪拰銆婇殣绉佹斂绛栥��
+9016=璇峰厛闃呰骞跺悓鎰忋�婃湇鍔″崗璁�嬪拰銆婄敤鎴蜂俊鎭繚鎶よ瀹氥��
9017=纭閫�鍑虹櫥褰曪紵
9018=璇烽�夋嫨鍥藉/鍖哄煙
9019=绔嬪嵆鏇存柊
--
Gitblit v1.8.0