From b8bdf52ccc38e3c6b0a95c2b60f59fc99dc546fd Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期四, 22 四月 2021 09:25:06 +0800
Subject: [PATCH] 2021-4-22 对接乐橙可视对讲
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 54 ++++++++++++++++++++++++++++--------------------------
1 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 12637fb..6006d8a 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,36 +1,31 @@
-锘�<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.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.26569F89-0BA9-4C06-81F2-764A3AF2E1B7" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_Android/LeChengVideoActivity.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_Android/LeChengVideoActivity.cs" Line="213" Column="70" />
+ <File FileName="HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs" />
+ <File FileName="HDL_ON/UI/MainPage.cs" />
+ <File FileName="HDL-ON_Android/LeChengVideo/Form/MonitorFragment.cs" />
+ <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" />
+ <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" />
</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 name="Server" expanded="True" />
</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 name="UI" expanded="True" />
+ </Node>
+ <Node name="HDL-ON_Android" expanded="True">
+ <Node name="LeChengVideo" expanded="True">
+ <Node name="Form" expanded="True" />
</Node>
+ <Node name="Properties" expanded="True" />
+ <Node name="LeChengVideoActivity.cs" selected="True" />
</Node>
</Node>
</State>
@@ -42,13 +37,20 @@
<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.Android_Accelerated_Oreo" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore />
+ <BreakpointStore>
+ <Breakpoint file="/Users/liaoshaosheng/Documents/GitHub/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" line="34" column="1" />
+ <Breakpoint file="/Users/liaoshaosheng/Documents/GitHub/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" line="313" column="1" />
+ <Breakpoint file="/Users/liaoshaosheng/Documents/GitHub/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Scene/CatchSceneCatchFunctionListPage.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Scene/CatchSceneCatchFunctionListPage.cs" line="210" column="1" />
+ <Breakpoint file="/Users/liaoshaosheng/Documents/GitHub/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" line="180" column="1" />
+ <Breakpoint file="/Users/liaoshaosheng/Documents/GitHub/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" line="159" column="1" />
+ <Breakpoint file="/Users/liaoshaosheng/Documents/GitHub/HDL_APP_Project/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs" relfile="HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs" line="366" column="1" />
+ <Breakpoint file="/Users/liaoshaosheng/Documents/GitHub/HDL_APP_Project/HDL_ON/UI/UI1-Login/LoginPageBLL.cs" relfile="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" line="98" column="1" />
+ <Breakpoint file="/Users/liaoshaosheng/Documents/GitHub/HDL_APP_Project/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs" relfile="HDL_ON/UI/UI1-Login/RegisterPageBLL.cs" line="411" column="1" />
+ </BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
--
Gitblit v1.8.0