From da1805017b9a58f88298776370fa5ac1ecdc6d86 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 18 五月 2021 13:19:48 +0800
Subject: [PATCH] 2021-05-18 1.开锁接口增加cllId
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 51 ++++++++++++---------------------------------------
HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs | 4 +++-
2 files changed, 15 insertions(+), 40 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 7103055..d824b75 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,53 +1,29 @@
锘�<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">
+ <MonoDevelop.Ide.Workbench ActiveDocument="../../../../../../Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/src/Xamarin.iOS/ObjCRuntime/Runtime.cs">
<Files>
- <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="HDL_ON/DAL/Server/HttpUtil.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/DAL/Server/NewApiRes.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/DAL/Server/HttpServerRequestBase.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="130" Column="56" />
+ <File FileName="HDL_ON/DAL/Server/IMessageCommon.cs" Line="343" Column="36" />
+ <File FileName="HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs" Line="94" Column="37" />
<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 name="ThirdPartySdk" expanded="True">
+ <Node name="ESOnVideo.cs" selected="True" />
</Node>
</Node>
- </Node>
- <Node name="HDL-ON_Android" expanded="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 name="Entity" expanded="True" />
+ <Node name="UI" expanded="True" />
</Node>
<Node name="Shared.IOS.LCVideoOnSDK" expanded="True">
<Node name="NativeReferenceFolder" expanded="True" />
@@ -69,9 +45,6 @@
<BreakpointStore>
<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>
diff --git a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
index 812f119..5122a1e 100644
--- a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
@@ -141,7 +141,8 @@
//涔愭鍙瀵硅
//1.鍒濆鍖朙COpenSDK_Api
LCApiKit.SharedInstance().InitSDKOpenApi(mESVideoInfo.Lc_AccessToken);
- LCApiKit.SharedInstance().CurrentDevicePlayToken = mESVideoInfo.Lc_PlayToken;
+ //2021-05-18 鐩墠鎺ㄩ�佺殑PlayToken;鏈夐棶棰樹細瀵艰嚧SDK宕╂簝锛屾殏鏃朵笉浼�
+ //LCApiKit.SharedInstance().CurrentDevicePlayToken = mESVideoInfo.Lc_PlayToken;
LCApiKit.SharedInstance().CurrentDeviceId = mESVideoInfo.Lc_DeviceId;
LCApiKit.SharedInstance().CurrentDeviceName = mESVideoInfo.DeviceName;
LCApiKit.SharedInstance().CurrentPsk = mESVideoInfo.Lc_DeviceId;
@@ -394,6 +395,7 @@
{
Dictionary<string, object> dic = new Dictionary<string, object>();
dic.Add("deviceId", esVideoInfo.Lc_DeviceId);//璁惧id
+ dic.Add("callId", esVideoInfo.callId);
var requestJson = HttpUtil.GetSignRequestJson(dic);
var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_VideoDevice_OpenDoorbell, requestJson);
if (revertObj.Code == StateCode.SUCCESS)
--
Gitblit v1.8.0