From 89e5ee13906a80f5357e078301169fabbf9103c6 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 01 四月 2021 10:28:23 +0800
Subject: [PATCH] 2021-4-1-5
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 53 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 12637fb..7073b85 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,35 +1,44 @@
-锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpUtil.cs">
+锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpServerRequest.cs">
<Files>
- <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" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs" Line="19" Column="106" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" Line="33" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs" Line="22" Column="77" />
+ <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="512" Column="1" />
+ <File FileName="HDL_ON/Entity/Enumerative/MyEnum.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="541" Column="46" />
+ <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="2249" Column="2" />
+ <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="281" Column="60" />
+ <File FileName="HDL_ON/Entity/FunctionList.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/DAL/FileUtils.cs" Line="1" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
-<<<<<<< HEAD
- <Node name="HDL-ON_iOS" expanded="True">
- <Node name="References" expanded="True">
- <Node name="EZSDK.IOS" selected="True" />
-=======
<Node name="HDL_ON" expanded="True">
+ <Node name="Common" expanded="True" />
<Node name="DAL" expanded="True">
<Node name="Server" expanded="True">
- <Node name="HttpUtil.cs" selected="True" />
+ <Node name="HttpServerRequest.cs" selected="True" />
</Node>
+ <Node name="ThirdPartySdk" expanded="True" />
</Node>
- <Node name="Entity" expanded="True" />
+ <Node name="Entity" expanded="True">
+ <Node name="Enumerative" expanded="True" />
+ </Node>
<Node name="UI" expanded="True">
- <Node name="UI1-Login" expanded="True" />
->>>>>>> parent of bbb4e590... 2021-02-05 1.鍘绘帀娴嬭瘯浠ｇ爜
+ <Node name="UI2" expanded="True">
+ <Node name="2-Classification" expanded="True" />
+ <Node name="4-PersonalCenter" expanded="True">
+ <Node name="PirDevice" expanded="True" />
+ </Node>
+ <Node name="FuntionControlView" expanded="True">
+ <Node name="Video" expanded="True" />
+ </Node>
+ </Node>
</Node>
</Node>
</Node>
@@ -42,10 +51,8 @@
<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.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
--
Gitblit v1.8.0