From b8c9d61850c5876631275335243c1d207ee01b33 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 29 十月 2021 09:53:57 +0800
Subject: [PATCH] 2021-10-29 1.用虚拟机重新生成萤石和乐橙dll库。2.乐橙更新新SDK，适配单元机呼叫问题。
---
HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
index eeb03b1..c0d9f52 100644
--- a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
@@ -71,11 +71,12 @@
{
//涔愭鍙瀵硅
//1.鍒濆鍖朙COpenSDK_Api
+ LCApiKit.SharedInstance().IsChinaMainland = OnAppConfig.Instance.RequestHttpsHost.Contains("china");//濡傛灉鍩熷悕鍖呭惈china锛屽垯SDK 浣跨敤涔愭鐨勪腑鍥藉ぇ闄�(姝ｅ紡)鍩熷悕
LCApiKit.SharedInstance().InitSDKOpenApi(mESVideoInfo.Lc_AccessToken);
LCApiKit.SharedInstance().CurrentDevicePlayToken = mESVideoInfo.Lc_PlayToken;
LCApiKit.SharedInstance().CurrentDeviceId = mESVideoInfo.Lc_DeviceId;
LCApiKit.SharedInstance().CurrentDeviceName = mESVideoInfo.DeviceName;
- LCApiKit.SharedInstance().CurrentPsk = mESVideoInfo.Lc_DeviceId;
+ LCApiKit.SharedInstance().CurrentPsk = mESVideoInfo.Lc_Psk;
//2.璋冩暣鐩戣椤甸潰
LCOnMonitorViewController vc = new LCOnMonitorViewController();
mOnLCCallDelegate = new OnLCCallDelegate(this);
@@ -120,7 +121,7 @@
//=========涔愭==========
intent.PutExtra("AccessToken", mESVideoInfo.Lc_AccessToken);
intent.PutExtra("DeviceId", mESVideoInfo.Lc_DeviceId);
- intent.PutExtra("Location", OnAppConfig.Instance.RequestHttpsHost.Contains("China") ? 0 : 1);//濡傛灉鍩熷悕鍖呭惈china锛屽垯鏄浗鍐呰处鍙�);
+ intent.PutExtra("Location", OnAppConfig.Instance.RequestHttpsHost.Contains("china") ? 0 : 1);//濡傛灉鍩熷悕鍖呭惈china锛屽垯鏄浗鍐呰处鍙�);
intent.PutExtra("PlayToken", mESVideoInfo.Lc_PlayToken);
intent.PutExtra("Psk", mESVideoInfo.Lc_Psk);
@@ -143,7 +144,7 @@
//=========涔愭==========
intent.PutExtra("AccessToken", mESVideoInfo.Lc_AccessToken);
intent.PutExtra("DeviceId", mESVideoInfo.Lc_DeviceId);
- intent.PutExtra("Location", OnAppConfig.Instance.RequestHttpsHost.Contains("China") ? 0 : 1);//濡傛灉鍩熷悕鍖呭惈china锛屽垯鏄浗鍐呰处鍙�);
+ intent.PutExtra("Location", OnAppConfig.Instance.RequestHttpsHost.Contains("china") ? 0 : 1);//濡傛灉鍩熷悕鍖呭惈china锛屽垯鏄浗鍐呰处鍙�);
intent.PutExtra("PlayToken", mESVideoInfo.Lc_PlayToken);
intent.PutExtra("Psk", mESVideoInfo.Lc_Psk);
@@ -178,12 +179,13 @@
{
//涔愭鍙瀵硅
//1.鍒濆鍖朙COpenSDK_Api
+ LCApiKit.SharedInstance().IsChinaMainland = OnAppConfig.Instance.RequestHttpsHost.Contains("china");//濡傛灉鍩熷悕鍖呭惈china锛屽垯SDK 浣跨敤涔愭鐨勪腑鍥藉ぇ闄�(姝ｅ紡)鍩熷悕
LCApiKit.SharedInstance().InitSDKOpenApi(mESVideoInfo.Lc_AccessToken);
//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;
+ LCApiKit.SharedInstance().CurrentPsk = mESVideoInfo.Lc_Psk;
//2.璺宠浆涔愭鍛煎彨椤甸潰
LCOnIntercomViewController vc = new LCOnIntercomViewController();
mOnLCCallDelegate = new OnLCCallDelegate(this);
@@ -249,7 +251,7 @@
//=========涔愭==========
intent.PutExtra("AccessToken", mESVideoInfo.Lc_AccessToken);
intent.PutExtra("DeviceId", mESVideoInfo.Lc_DeviceId);
- intent.PutExtra("Location", OnAppConfig.Instance.RequestHttpsHost.Contains("China") ? 0 : 1);//濡傛灉鍩熷悕鍖呭惈china锛屽垯鏄浗鍐呰处鍙�);
+ intent.PutExtra("Location", OnAppConfig.Instance.RequestHttpsHost.Contains("china") ? 0 : 1);//濡傛灉鍩熷悕鍖呭惈china锛屽垯鏄浗鍐呰处鍙�);
intent.PutExtra("PlayToken", mESVideoInfo.Lc_PlayToken);
intent.PutExtra("Psk", mESVideoInfo.Lc_Psk);
@@ -302,7 +304,7 @@
//=========涔愭==========
intent.PutExtra("AccessToken", mESVideoInfo.Lc_AccessToken);
intent.PutExtra("DeviceId", mESVideoInfo.Lc_DeviceId);
- intent.PutExtra("Location", OnAppConfig.Instance.RequestHttpsHost.Contains("China") ? 0 : 1);//濡傛灉鍩熷悕鍖呭惈china锛屽垯鏄浗鍐呰处鍙�);
+ intent.PutExtra("Location", OnAppConfig.Instance.RequestHttpsHost.Contains("china") ? 0 : 1);//濡傛灉鍩熷悕鍖呭惈china锛屽垯鏄浗鍐呰处鍙�);
intent.PutExtra("PlayToken", mESVideoInfo.Lc_PlayToken);
intent.PutExtra("Psk", mESVideoInfo.Lc_Psk);
--
Gitblit v1.8.0