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
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 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>
--
Gitblit v1.8.0