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 |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 51c2ab9..12637fb 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,13 +1,35 @@
 锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
-  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.08FD445C-3EE8-4ED2-BF28-B42ADD0DA92C" />
-  <MonoDevelop.Ide.Workbench>
+  <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_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">
+<<<<<<< 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="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.鍘绘帀娴嬭瘯浠g爜
               </Node>
             </Node>
           </Node>
@@ -23,7 +45,7 @@
     <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" />
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
   <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
     <BreakpointStore />

--
Gitblit v1.8.0