From 42fad29b1e280b512452f5552d1e9ce98474252e Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 17 五月 2021 09:40:14 +0800
Subject: [PATCH] 2021-05-17 1.在阿廖分支基础上增加iOS乐橙可视对讲功能，目前呼叫还有一点问题，偶尔会闪退，目前还没定位到原因
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 64 ++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 11 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index a26b12d..7103055 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,18 +1,56 @@
-锘�<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">
+锘�<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/UI/UI2/FuntionControlView/Video/ObjectClass.cs">
<Files>
- <File FileName="HDL-ON_Android/Resources/values/strings.xml" Line="21" Column="1" />
- <File FileName="HDL-ON_Android/Resources/values-zh/strings.xml" Line="21" Column="39" />
- <File FileName="HDL-ON_Android/LeChengVideoActivity.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/Common/HDLCommon.cs" Line="318" Column="1" />
+ <File FileName="HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs" Line="62" Column="27" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" Line="1" Column="1" />
+ <File FileName="../../../../../../Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/src/Xamarin.iOS/ObjCRuntime/Runtime.cs" Line="407" Column="1" />
+ <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="220" Column="68" />
+ <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="114" Column="39" />
+ <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="585" Column="53" />
+ <File FileName="HDL_ON/DAL/Server/NewApiRes.cs" Line="77" Column="33" />
+ <File FileName="HDL_ON/Common/Constant.cs" Line="270" Column="23" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs" Line="14" Column="21" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" Line="30" Column="47" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs" Line="74" Column="39" />
+ <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="296" Column="128" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/ObjectClass.cs" Line="129" Column="38" />
</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="Server" expanded="True" />
+ <Node name="ThirdPartySdk" expanded="True" />
+ </Node>
+ <Node name="UI" expanded="True">
+ <Node name="UI2" 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 name="ObjectClass.cs" selected="True" />
+ </Node>
+ </Node>
+ </Node>
+ </Node>
+ </Node>
<Node name="HDL-ON_Android" expanded="True">
- <Node name="LeChengVideo" expanded="True" />
- <Node name="LeChengVideoActivity.cs" selected="True" />
+ <Node name="LeChengVideo" expanded="True">
+ <Node name="Form" expanded="True" />
+ </Node>
+ </Node>
+ <Node name="HDL-ON_iOS" expanded="True">
+ <Node name="Other" expanded="True" />
+ <Node name="Resources" expanded="True" />
+ </Node>
+ <Node name="Shared.IOS.LCVideoOnSDK" expanded="True">
+ <Node name="NativeReferenceFolder" expanded="True" />
</Node>
</Node>
</State>
@@ -26,11 +64,15 @@
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.2ffc9a07" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<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/jlchen/JLChen/ProjectsCode/HDLGit/ON+/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/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" line="313" column="1" />
+ <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs" relfile="HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs" line="83" column="1" />
+ <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/Common/HDLCommon.cs" relfile="HDL_ON/Common/HDLCommon.cs" line="318" column="1" />
+ <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" line="31" column="1" />
+ <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" line="180" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
--
Gitblit v1.8.0