From f1a544260cba180bf555c7437c627de38d2b8dfe Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 24 八月 2021 16:57:19 +0800
Subject: [PATCH] 2021-08-24 1.修改大华SDK根据账号注册域名自动切换国内和海外域名
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 25 ++++++++++++-------------
HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs | 10 ++++++----
2 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index ff33ecf..509d35e 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,27 +1,26 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Common/ApiUtlis.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs">
<Files>
- <File FileName="HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs" Line="195" Column="44" />
- <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="287" Column="45" />
+ <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="284" Column="20" />
+ <File FileName="HDL_ON/Common/HDLCommon.cs" Line="14" Column="18" />
+ <File FileName="HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs" Line="79" Column="27" />
</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="Utlis" expanded="True" />
- <Node name="ApiUtlis.cs" selected="True" />
- </Node>
+ <Node name="Common" expanded="True" />
<Node name="DAL" expanded="True">
- <Node name="ThirdPartySdk" expanded="True" />
+ <Node name="ThirdPartySdk" expanded="True">
+ <Node name="ESOnVideo.cs" selected="True" />
+ </Node>
</Node>
- <Node name="UI" expanded="True">
- <Node name="UI1-Login" expanded="True" />
- <Node name="UI2" expanded="True" />
- </Node>
+ <Node name="Entity" expanded="True" />
</Node>
+ <Node name="HDL-ON_iOS" expanded="True" />
</Node>
</State>
</Pad>
@@ -34,7 +33,7 @@
<String>Shared.IOS/Shared.IOS.csproj</String>
<String>../Linphone/HDLLinphoneSDK_IOS/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
diff --git a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
index eeb03b1..df8612f 100644
--- a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
@@ -71,6 +71,7 @@
{
//涔愭鍙瀵硅
//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;
@@ -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,6 +179,7 @@
{
//涔愭鍙瀵硅
//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;
@@ -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