From de344cadaa299a585d20488c4ce393f7ec797461 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:05:13 +0800
Subject: [PATCH] 2021-02-05 10:04:48
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 77 +++++++++++++-------------------------
1 files changed, 26 insertions(+), 51 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 5dbcb92..12637fb 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,62 +1,35 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpUtil.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs" Line="157" Column="59" />
- <File FileName="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" Line="14" Column="78" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs" Line="205" Column="39" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" Line="344" Column="37" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs" Line="30" Column="22" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs" Line="105" Column="56" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" Line="371" Column="1" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs" Line="105" Column="56" />
+ <File FileName="HDL-ON_iOS/Other/ESVideo.cs" Line="4" Column="17" />
+ <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" />
+ <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" Line="899" Column="25" />
+ <File FileName="../ESVideoPhoneSDKProject/xamarin/Shared.IOS.ESVideoPhoneSDK/ApiDefinition.cs" />
+ <File FileName="../ESVideoPhoneSDKProject/xamarin/Shared.IOS.ESVideoPhoneSDK/Properties/AssemblyInfo.cs" />
+ <File FileName="HDL-ON_iOS/AppDelegate.cs" />
+ <File FileName="HDL-ON_iOS/ViewController.cs" Line="20" Column="42" />
+ <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="545" Column="37" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
- <Node name="HDL_ON" expanded="True">
- <Node name="Common" expanded="True" />
- <Node name="DAL" expanded="True">
- <Node name="DriverLayer" expanded="True" />
- </Node>
- <Node name="Entity" expanded="True">
- <Node name="Function" expanded="True" />
- </Node>
- <Node name="UI" expanded="True">
- <Node name="UI0-Public" expanded="True" />
- <Node name="UI2" expanded="True">
- <Node name="2-Classification" expanded="True" />
- <Node name="3-Intelligence" expanded="True">
- <Node name="Scene" expanded="True" />
- </Node>
- <Node name="FuntionControlView" expanded="True">
- <Node name="AC" expanded="True" />
- <Node name="Curtain" expanded="True">
- <Node name="RollingShutterPageBLL.cs" selected="True" />
- </Node>
- <Node name="EnvironmentalScience" expanded="True" />
- <Node name="Light" expanded="True" />
- </Node>
- </Node>
- </Node>
- </Node>
- <Node name="HDL-ON_Android" expanded="True">
- <Node name="Assets" expanded="True">
- <Node name="Phone" expanded="True">
- <Node name="Public" expanded="True" />
- </Node>
- </Node>
- </Node>
+<<<<<<< HEAD
<Node name="HDL-ON_iOS" expanded="True">
- <Node name="Other" expanded="True" />
- <Node name="Resources" expanded="True">
- <Node name="Phone" expanded="True">
- <Node name="FunctionIcon" expanded="True">
- <Node name="Light" expanded="True" />
- </Node>
- <Node name="LoginIcon" expanded="True" />
+ <Node name="References" expanded="True">
+ <Node name="EZSDK.IOS" selected="True" />
+=======
+ <Node name="HDL_ON" expanded="True">
+ <Node name="DAL" expanded="True">
+ <Node name="Server" expanded="True">
+ <Node name="HttpUtil.cs" selected="True" />
</Node>
+ </Node>
+ <Node name="Entity" expanded="True" />
+ <Node name="UI" expanded="True">
+ <Node name="UI1-Login" expanded="True" />
+>>>>>>> parent of bbb4e590... 2021-02-05 1.鍘绘帀娴嬭瘯浠ｇ爜
</Node>
</Node>
</Node>
@@ -69,9 +42,11 @@
<String>Shared.IOS.TBL/Shared.IOS.TBL.csproj</String>
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
+ <String>../Xamarin鎺т欢搴�/EZOpenSDK/EZSDK.IOS/EZSDK.IOS/EZSDK.IOS.csproj</String>
+ <String>../ESVideoPhoneSDKProject/xamarin/Shared.IOS.ESVideoPhoneSDK/Shared.IOS.ESVideoPhoneSDK.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
--
Gitblit v1.8.0