From 01b8b5bde8a58060bdd03b78a32747c5aa551976 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 01 十二月 2021 09:32:54 +0800
Subject: [PATCH] 111
---
HDL-ON_iOS/Resources/zh-Hans.lproj/InfoPlist.strings | 3
DLL/LC/Android/Shared.Droid.LCVideoSDK.dll | 0
HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs | 2
DLL/IOS/EZSDK.IOS.dll | 0
DLL/LC/IOS/Shared.IOS.LCVideoOnSDK.dll | 0
HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard | 77 +++++++++++++++++--
HDL-ON_Android/HDL-ON_Android.csproj | 22 +---
HDL-ON_Android/LeChengVideoActivity.cs | 41 +++++++++-
/dev/null | 0
HDL_ON/Common/HDLCommon.cs | 3
HDL_ON/DAL/Server/HttpUtil.cs | 4
HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs | 18 ++++
HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs | 66 +++++++---------
13 files changed, 163 insertions(+), 73 deletions(-)
diff --git a/DLL/IOS/EZSDK.IOS.dll b/DLL/IOS/EZSDK.IOS.dll
index cb145fc..5d1bcdc 100644
--- a/DLL/IOS/EZSDK.IOS.dll
+++ b/DLL/IOS/EZSDK.IOS.dll
Binary files differ
diff --git a/DLL/LC/Android/Shared.Droid.LCVideoSDK.dll b/DLL/LC/Android/Shared.Droid.LCVideoSDK.dll
new file mode 100644
index 0000000..b67911f
--- /dev/null
+++ b/DLL/LC/Android/Shared.Droid.LCVideoSDK.dll
Binary files differ
diff --git a/DLL/LC/IOS/Shared.IOS.LCVideoOnSDK.dll b/DLL/LC/IOS/Shared.IOS.LCVideoOnSDK.dll
index 7974ad9..8faec09 100644
--- a/DLL/LC/IOS/Shared.IOS.LCVideoOnSDK.dll
+++ b/DLL/LC/IOS/Shared.IOS.LCVideoOnSDK.dll
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 8a796a6..28741b6 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -60,8 +60,7 @@
<MandroidI18n>cjk</MandroidI18n>
<AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent>
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
- <AndroidKeyStore>True</AndroidKeyStore>
- <AndroidSigningKeyStore>/Users/hdl/Desktop/on_plus/on_plus.keystore</AndroidSigningKeyStore>
+ <AndroidSigningKeyStore>/Users/kaede/Desktop/HDL_APP_Project/on_plus.keystore</AndroidSigningKeyStore>
<AndroidSigningStorePass>85521566</AndroidSigningStorePass>
<AndroidSigningKeyPass>85521566</AndroidSigningKeyPass>
<AndroidSigningKeyAlias>on_plus</AndroidSigningKeyAlias>
@@ -162,9 +161,6 @@
<Reference Include="videophone">
<HintPath>..\DLL\FL\Android\videophone.dll</HintPath>
</Reference>
- <Reference Include="LC_SDK">
- <HintPath>..\DLL\LC\Android\LC_SDK.dll</HintPath>
- </Reference>
<Reference Include="Square.OkHttp3">
<HintPath>..\DLL\EZvizMonitor\Square.OkHttp3.dll</HintPath>
</Reference>
@@ -176,6 +172,9 @@
</Reference>
<Reference Include="Shared.Droid.HDLLinphone">
<HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.Droid.LCVideoSDK">
+ <HintPath>..\DLL\LC\Android\Shared.Droid.LCVideoSDK.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -1309,16 +1308,6 @@
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
- <AndroidNativeLibrary Include="libs\armeabi-v7a\libjcore127.so" />
- <AndroidNativeLibrary Include="libs\armeabi-v7a\libconfigsdk.so" />
- <AndroidNativeLibrary Include="libs\armeabi-v7a\libGMCrypto.so" />
- <AndroidNativeLibrary Include="libs\armeabi-v7a\libgnustl_shared.so" />
- <AndroidNativeLibrary Include="libs\armeabi-v7a\libjninetsdk.so" />
- <AndroidNativeLibrary Include="libs\armeabi-v7a\libLCOpenApiClient.so" />
- <AndroidNativeLibrary Include="libs\armeabi-v7a\libLechangeSDK.so" />
- <AndroidNativeLibrary Include="libs\armeabi-v7a\libnetsdk.so" />
- <AndroidNativeLibrary Include="libs\armeabi-v7a\libSmartConfig.so" />
- <AndroidNativeLibrary Include="libs\armeabi-v7a\libSoftAPConfig.so" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Connect.png" />
@@ -1396,6 +1385,9 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorLock.png" />
</ItemGroup>
<ItemGroup />
+ <ItemGroup>
+ <Folder Include="libs\arm64-v8a\" />
+ </ItemGroup>
<Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs b/HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs
index 4f0d886..68073cc 100644
--- a/HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs
+++ b/HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs
@@ -31,6 +31,7 @@
private System.Threading.Timer timer = null;
private int Time = 0;
+ private bool isAnswer;//鏄惁宸茬粡鐐瑰嚮鎺ュ惉杩囦簡
private static LeChengVideoActivity CurtActivity;
@@ -202,6 +203,7 @@
if (v.Equals(answerImg))
{
//鎺ユ敹鏉ョ數
+ isAnswer = true;
CurtActivity.StartTalk();
answerLayout.Visibility = ViewStates.Gone;
PostAnswer();
@@ -209,7 +211,18 @@
else if (v.Equals(hangupImg))
{
CurtActivity.StopTalk();
- PostHangup();
+ //2021-11-30 澧炲姞鎷掔粷鍜屾寕鏂搷浣滃鐞�
+ if (isAnswer)
+ {
+ //濡傛灉鎺ュ惉杩囦簡锛屾墽琛屾寕鏂帴鍙�
+ PostHangup();
+ }
+ else
+ {
+ //娌℃帴鍚洿鎺ユ寕鏂紝鎵ц鎷掓帴鎺ュ彛
+ PostReject();
+ }
+
TimeEnd();
Activity.Finish();
}
@@ -265,7 +278,7 @@
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("callId", CurtActivity.CallId);//鍛煎彨id
- //d.Add("callStatus", "REJECT");//鍙敤鍊�:MISSED,RECEIVED,REJECT
+ d.Add("callStatus", "RECEIVED");//鍙敤鍊�:MISSED,RECEIVED,REJECT
d.Add("callDuration", Time);//閫氳瘽鏃堕暱锛堢锛�
d.Add("interphoneTypeEnum", "IMOUVISIAL");//鍙敤鍊�:FLVI,IMOUVISIAL
string jsonString = HttpUtil.GetSignRequestJson(d);
@@ -291,6 +304,7 @@
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("callId", CurtActivity.CallId);//鍛煎彨id
d.Add("callStatus", "REJECT");//鍙敤鍊�:MISSED,RECEIVED,REJECT
+ d.Add("interphoneTypeEnum", "IMOUVISIAL");//鍙敤鍊�:FLVI,IMOUVISIAL
string jsonString = HttpUtil.GetSignRequestJson(d);
string url = "/home-wisdom/platform/imou/updateCallStatus";
diff --git a/HDL-ON_Android/LeChengVideoActivity.cs b/HDL-ON_Android/LeChengVideoActivity.cs
index 0f426d0..1d26881 100644
--- a/HDL-ON_Android/LeChengVideoActivity.cs
+++ b/HDL-ON_Android/LeChengVideoActivity.cs
@@ -31,7 +31,9 @@
{
private static LeChengVideoActivity CurtActivity;
//
- private string URL = "openapi.easy4ip.com:443";
+ private string URL = "openapi.easy4ip.com:443"; //娴峰锛堟寮忥級
+ private static string URL_LC_CHINA = "openapi.lechange.cn:443"; //涓浗澶ч檰(姝ｅ紡)
+ private static string URL_LC_Overseas = "openapi.easy4ip.com:443"; //涓浗澶ч檰(姝ｅ紡)
public string AccessToken = "";
public string DeviceId = "";
public string Psk = "";
@@ -112,8 +114,7 @@
mPlayWindow = new LCOpenSDK_PlayWindow();
mPlayWindow.InitPlayWindow(this, flWindowContent, 0, true);
- if (Location == 1)
- URL = "openapi.easy4ip.com:443";
+
}
/// <summary>
@@ -121,6 +122,14 @@
/// </summary>
private void InitLCSDK()
{
+
+ if (Location == 1)
+ {
+ URL = URL_LC_Overseas;
+ }else {
+ URL = URL_LC_CHINA;
+ }
+
InitParams initParams = new InitParams(this, URL, AccessToken);
LCOpenSDK_Api.InitOpenApi(initParams);
}
@@ -133,6 +142,8 @@
try
{
LCOpenSDK_ParamReal paramReal = new LCOpenSDK_ParamReal(AccessToken, DeviceId, 0, Psk, PlayToken, 1, false, true);
+ //PlayEventListener listener = new PlayEventListener();//瀹炵幇鎾斁浜嬩欢鐩戝惉鍥炶皟 2021-10-15 鐩墠涓嶈兘鐩戝惉锛岀洃鍚簡浼氱┖寮傚父
+ //mPlayWindow.WindowListener = listener;//瀹炵幇鎾斁浜嬩欢鐩戝惉鍥炶皟
mPlayWindow.PlayRtspReal(paramReal);
}
catch (System.Exception e)
@@ -147,6 +158,7 @@
public void Stop()
{
mPlayWindow.StopRtspReal(true);//鍏抽棴瑙嗛
+ //mPlayWindow.WindowListener = null;
}
/// <summary>
@@ -156,8 +168,14 @@
{
CloseAudio();// 鍏抽棴Audio
LCOpenSDK_Talk.Listener = new AudioTalkerListener();//璁剧疆瀵硅鐩戝惉
+ //2021-10-29 瀵硅璇锋眰绫诲瀷锛宑all鍛煎彨锛屽鏋滀笉浼狅紝榛樿涓簍alk
+ string talkType = "talk";
+ if (Type == 1)//0鐩戞帶锛�1瀵硅
+ {
+ talkType = "call";
+ }
// 瀵硅鍙傛暟
- LCOpenSDK_ParamTalk paramTalk = new LCOpenSDK_ParamTalk(AccessToken, DeviceId, -1, Psk, PlayToken, true);
+ LCOpenSDK_ParamTalk paramTalk = new LCOpenSDK_ParamTalk(AccessToken, DeviceId, -1, Psk, PlayToken, true, talkType);
LCOpenSDK_Talk.PlayTalk(paramTalk);
}
@@ -348,6 +366,7 @@
try
{
+ System.Console.WriteLine("LC OnTalkResult error锛�" + error + " type:" + type);
bool talkResult = false;
if (type == 99 || error.Equals("-1000") || error.Equals("0") || error.Equals("1") || error.Equals("3"))
{
@@ -397,5 +416,19 @@
}
}
+ /// <summary>
+ /// 鎾斁銆侀瑙堢粨鏋滃洖璋�
+ /// resultSource: 0--RTSP 1--HLS 5--DHHTTP 99--OPENAPI
+ /// </summary>
+ class PlayEventListener : LCOpenSDK_EventListener
+ {
+ public override void OnPlayerResult(int index, string code, int resultSource)
+ {
+ base.OnPlayerResult(index, code, resultSource);
+ System.Console.WriteLine("LC OnPlayerResult index锛�" + index + " code:" + code + " resultSource:"+ resultSource);
+ }
+
+
+ }
}
}
diff --git a/HDL-ON_Android/libs/armeabi-v7a/libGMCrypto.so b/HDL-ON_Android/libs/armeabi-v7a/libGMCrypto.so
deleted file mode 100644
index 426d9a0..0000000
--- a/HDL-ON_Android/libs/armeabi-v7a/libGMCrypto.so
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/libs/armeabi-v7a/libLCOpenApiClient.so b/HDL-ON_Android/libs/armeabi-v7a/libLCOpenApiClient.so
deleted file mode 100644
index 1c970f7..0000000
--- a/HDL-ON_Android/libs/armeabi-v7a/libLCOpenApiClient.so
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/libs/armeabi-v7a/libLechangeSDK.so b/HDL-ON_Android/libs/armeabi-v7a/libLechangeSDK.so
deleted file mode 100644
index 29b0cd2..0000000
--- a/HDL-ON_Android/libs/armeabi-v7a/libLechangeSDK.so
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/libs/armeabi-v7a/libSmartConfig.so b/HDL-ON_Android/libs/armeabi-v7a/libSmartConfig.so
deleted file mode 100644
index 4f557b3..0000000
--- a/HDL-ON_Android/libs/armeabi-v7a/libSmartConfig.so
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/libs/armeabi-v7a/libSoftAPConfig.so b/HDL-ON_Android/libs/armeabi-v7a/libSoftAPConfig.so
deleted file mode 100644
index bb7fb84..0000000
--- a/HDL-ON_Android/libs/armeabi-v7a/libSoftAPConfig.so
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/libs/armeabi-v7a/libconfigsdk.so b/HDL-ON_Android/libs/armeabi-v7a/libconfigsdk.so
deleted file mode 100644
index e786702..0000000
--- a/HDL-ON_Android/libs/armeabi-v7a/libconfigsdk.so
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/libs/armeabi-v7a/libgnustl_shared.so b/HDL-ON_Android/libs/armeabi-v7a/libgnustl_shared.so
deleted file mode 100644
index ab79e66..0000000
--- a/HDL-ON_Android/libs/armeabi-v7a/libgnustl_shared.so
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/libs/armeabi-v7a/libjcore127.so b/HDL-ON_Android/libs/armeabi-v7a/libjcore127.so
deleted file mode 100644
index d5fa49f..0000000
--- a/HDL-ON_Android/libs/armeabi-v7a/libjcore127.so
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/libs/armeabi-v7a/libjninetsdk.so b/HDL-ON_Android/libs/armeabi-v7a/libjninetsdk.so
deleted file mode 100644
index ee4b507..0000000
--- a/HDL-ON_Android/libs/armeabi-v7a/libjninetsdk.so
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/libs/armeabi-v7a/libnetsdk.so b/HDL-ON_Android/libs/armeabi-v7a/libnetsdk.so
deleted file mode 100644
index 7c759a1..0000000
--- a/HDL-ON_Android/libs/armeabi-v7a/libnetsdk.so
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard b/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard
index bba85b8..f5af9fc 100644
--- a/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard
+++ b/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="1Qq-y9-5Vr">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="1Qq-y9-5Vr">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
@@ -683,24 +683,83 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Q0X-wy-A5B">
- <rect key="frame" x="47.5" y="362" width="311.5" height="40"/>
+ <rect key="frame" x="47.5" y="362" width="311.5" height="100"/>
<attributedString key="attributedText">
<fragment content="杩斿洖">
<attributes>
- <font key="NSFont" size="14" name=".PingFangSC-Regular"/>
- <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0"/>
+ <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <font key="NSFont" size="14" name="PingFangSC-Regular"/>
+ <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
</attributes>
</fragment>
<fragment content="APP">
<attributes>
- <font key="NSFont" metaFont="system" size="14"/>
- <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0"/>
+ <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <font key="NSFont" size="14" name="HelveticaNeue"/>
+ <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
</attributes>
</fragment>
<fragment content="锛岀瓑寰呬笌璁惧杩炴帴锛屾垚鍔熷悗鑷姩杩涘叆涓嬩竴姝ユ搷浣溿��">
<attributes>
- <font key="NSFont" size="14" name=".PingFangSC-Regular"/>
- <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0"/>
+ <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <font key="NSFont" size="14" name="PingFangSC-Regular"/>
+ <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
+ </attributes>
+ </fragment>
+ <fragment content="鈥�">
+ <attributes>
+ <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <font key="NSFont" size="14" name="HelveticaNeue"/>
+ <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
+ </attributes>
+ </fragment>
+ <fragment content="(娉ㄦ剰锛氬鏋滆澶�">
+ <attributes>
+ <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <font key="NSFont" size="14" name="PingFangSC-Regular"/>
+ <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
+ </attributes>
+ </fragment>
+ <fragment content="WIFI">
+ <attributes>
+ <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <font key="NSFont" size="14" name="HelveticaNeue"/>
+ <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
+ </attributes>
+ </fragment>
+ <fragment content="鍚嶇О涓嶆槸鈥�">
+ <attributes>
+ <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <font key="NSFont" size="14" name="PingFangSC-Regular"/>
+ <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
+ </attributes>
+ </fragment>
+ <fragment content="EZVIZ">
+ <attributes>
+ <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <font key="NSFont" size="14" name="HelveticaNeue"/>
+ <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
+ </attributes>
+ </fragment>
+ <fragment content="鈥濆墠缂�鐨勶紝璇峰鍒跺瘑鐮佸悗鏍规嵁鏂扮殑鍓嶇紑鍚嶅瓧锛屾墜鍔ㄤ慨鏀瑰瘑鐮佺殑鍓嶇紑骞惰繛鎺ュ嵆鍙�備緥濡傗��">
+ <attributes>
+ <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <font key="NSFont" size="14" name="PingFangSC-Regular"/>
+ <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
+ </attributes>
+ </fragment>
+ <fragment content="SoftAP_XXXXXXX">
+ <attributes>
+ <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <font key="NSFont" size="13" name="HelveticaNeue"/>
+ <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
+ </attributes>
+ </fragment>
+ <fragment content="鈥�)">
+ <attributes>
+ <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <font key="NSFont" size="14" name="PingFangSC-Regular"/>
+ <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
</attributes>
</fragment>
</attributedString>
diff --git a/HDL-ON_iOS/Resources/zh-Hans.lproj/InfoPlist.strings b/HDL-ON_iOS/Resources/zh-Hans.lproj/InfoPlist.strings
index e299650..76a7d32 100644
--- a/HDL-ON_iOS/Resources/zh-Hans.lproj/InfoPlist.strings
+++ b/HDL-ON_iOS/Resources/zh-Hans.lproj/InfoPlist.strings
@@ -7,4 +7,5 @@
"NSPhotoLibraryAddUsageDescription"="搴旂敤绋嬪簭甯屾湜璁块棶鎮ㄧ殑鐓х墖搴擄紝鐢ㄤ簬璁剧疆鎴块棿鐨勮儗鏅浘鐗�";
"NSMicrophoneUsageDescription"="搴旂敤绋嬪簭甯屾湜璁块棶鎮ㄧ殑鎵嬫満楹﹀厠椋庯紝鐢ㄤ簬璇煶瀵硅";
"NSBluetoothPeripheralUsageDescription"="姝ゅ簲鐢ㄧ▼搴忎娇鐢ㄨ摑鐗欎笌璁惧閫氫俊锛屾搴旂敤绋嬪簭涓嶆敹闆嗐�佸瓨鍌ㄦ垨璁板綍閫氳繃钃濈墮閫氫俊鐨勪换浣曟暟鎹��";
-"NSBluetoothAlwaysUsageDescription"="姝ゅ簲鐢ㄧ▼搴忎娇鐢ㄨ摑鐗欎笌璁惧閫氫俊锛屾搴旂敤绋嬪簭涓嶆敹闆嗐�佸瓨鍌ㄦ垨璁板綍閫氳繃钃濈墮閫氫俊鐨勪换浣曟暟鎹��";
\ No newline at end of file
+"NSBluetoothAlwaysUsageDescription"="姝ゅ簲鐢ㄧ▼搴忎娇鐢ㄨ摑鐗欎笌璁惧閫氫俊锛屾搴旂敤绋嬪簭涓嶆敹闆嗐�佸瓨鍌ㄦ垨璁板綍閫氳繃钃濈墮閫氫俊鐨勪换浣曟暟鎹��";
+"NSLocalNetworkUsageDescription"="搴旂敤绋嬪簭甯屾湜浣跨敤鏈湴缃戠粶鏉ヨ繛鎺ヤ綘鐨勮澶囥��";
\ No newline at end of file
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index f1763ee..861ee89 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -318,7 +318,8 @@
eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
eSVideoInfo.Lc_Location = OnAppConfig.Instance.RequestHttpsHost.Contains("China") ? 0 : 1;
eSVideoInfo.Lc_PlayToken = json["token"].ToString();
- eSVideoInfo.Lc_Psk = json["cname"].ToString();
+ //eSVideoInfo.Lc_Psk = json["cname"].ToString();
+ eSVideoInfo.Lc_Psk = json["psk"].ToString();//2021-10-15 PSK瀛楁涓嶈兘鍙朿name
}
else if (interphoneTypeEnum == InterphoneType.EZVIZ.ToString())
{
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 315e9a2..6c692b6 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -17,8 +17,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
/// <summary>
/// RegionMark
/// </summary>
diff --git a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
index df8612f..0965c39 100644
--- a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
@@ -57,6 +57,18 @@
}
/// <summary>
+ /// 濡傛灉鍩熷悕鍖呭惈china锛屽垯SDK 浣跨敤涔愭鐨勪腑鍥藉ぇ闄�(姝ｅ紡)鍩熷悕
+ /// </summary>
+ /// <returns></returns>
+ bool GetIsChinaMainland()
+ {
+ ////寮哄埗浣跨敤鍥藉唴
+ //return true;
+
+ return OnAppConfig.Instance.RequestHttpsHost.Contains("china");//濡傛灉鍩熷悕鍖呭惈china锛屽垯SDK 浣跨敤涔愭鐨勪腑鍥藉ぇ闄�(姝ｅ紡)鍩熷悕
+ }
+
+ /// <summary>
/// 鐩戞帶椤甸潰
/// </summary>
/// <param name="mESVideoInfo"></param>
@@ -71,12 +83,12 @@
{
//涔愭鍙瀵硅
//1.鍒濆鍖朙COpenSDK_Api
- LCApiKit.SharedInstance().IsChinaMainland = OnAppConfig.Instance.RequestHttpsHost.Contains("china");//濡傛灉鍩熷悕鍖呭惈china锛屽垯SDK 浣跨敤涔愭鐨勪腑鍥藉ぇ闄�(姝ｅ紡)鍩熷悕
+ LCApiKit.SharedInstance().IsChinaMainland = GetIsChinaMainland();
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);
@@ -108,20 +120,14 @@
if (interphoneType == InterphoneType.IMOUVISIAL.ToString())
{
intent = new Intent(Shared.Application.Activity, typeof(HDL_ON_Android.LeChengVideoActivity));
- intent.PutExtra("ESVideoUUID", mESVideoInfo.ESVideoUUID);
- intent.PutExtra("uuid", mESVideoInfo.uuid);
- intent.PutExtra("DeviceName", mESVideoInfo.DeviceName);
- intent.PutExtra("cmtID", mESVideoInfo.cmtID);
- intent.PutExtra("roomno", mESVideoInfo.roomno);
- intent.PutExtra("unitno", mESVideoInfo.unitno);
- intent.PutExtra("HomeID", PirSend.HomeId);
- intent.PutExtra("callId", mESVideoInfo.callId);
- intent.PutExtra("Type", 0);
-
+
//=========涔愭==========
+ intent.PutExtra("Type", 0);
+ intent.PutExtra("callId", mESVideoInfo.callId);
+ intent.PutExtra("DeviceName", mESVideoInfo.DeviceName);
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", GetIsChinaMainland() ? 0 : 1);//濡傛灉鍩熷悕鍖呭惈china锛屽垯鏄浗鍐呰处鍙�);
intent.PutExtra("PlayToken", mESVideoInfo.Lc_PlayToken);
intent.PutExtra("Psk", mESVideoInfo.Lc_Psk);
@@ -141,12 +147,7 @@
intent.PutExtra("callId", mESVideoInfo.callId);
intent.PutExtra("Type", 0);
- //=========涔愭==========
- 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("PlayToken", mESVideoInfo.Lc_PlayToken);
- intent.PutExtra("Psk", mESVideoInfo.Lc_Psk);
+
Shared.Application.Activity.StartActivity(intent);
}
@@ -179,13 +180,13 @@
{
//涔愭鍙瀵硅
//1.鍒濆鍖朙COpenSDK_Api
- LCApiKit.SharedInstance().IsChinaMainland = OnAppConfig.Instance.RequestHttpsHost.Contains("china");//濡傛灉鍩熷悕鍖呭惈china锛屽垯SDK 浣跨敤涔愭鐨勪腑鍥藉ぇ闄�(姝ｅ紡)鍩熷悕
+ LCApiKit.SharedInstance().IsChinaMainland = GetIsChinaMainland();
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);
@@ -238,20 +239,14 @@
{
//寰呭垹鍑忎笉蹇呰鍙傛暟
intent = new Intent(Shared.Application.Activity, typeof(HDL_ON_Android.LeChengVideoActivity));
- intent.PutExtra("ESVideoUUID", mESVideoInfo.ESVideoUUID);
- intent.PutExtra("uuid", mESVideoInfo.uuid);
- intent.PutExtra("DeviceName", mESVideoInfo.DeviceName);
- intent.PutExtra("cmtID", mESVideoInfo.cmtID);
- intent.PutExtra("roomno", mESVideoInfo.roomno);
- intent.PutExtra("unitno", mESVideoInfo.unitno);
- intent.PutExtra("HomeID", PirSend.HomeId);
- intent.PutExtra("callId", mESVideoInfo.callId);
- intent.PutExtra("Type", 1);
-
+
//=========涔愭==========
+ intent.PutExtra("Type", 1);
+ intent.PutExtra("callId", mESVideoInfo.callId);
+ intent.PutExtra("DeviceName", mESVideoInfo.DeviceName);
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", GetIsChinaMainland() ? 0 : 1);//濡傛灉鍩熷悕鍖呭惈china锛屽垯鏄浗鍐呰处鍙�);
intent.PutExtra("PlayToken", mESVideoInfo.Lc_PlayToken);
intent.PutExtra("Psk", mESVideoInfo.Lc_Psk);
@@ -301,12 +296,7 @@
intent.PutExtra("callId", mESVideoInfo.callId);
intent.PutExtra("Type", 1);
- //=========涔愭==========
- 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("PlayToken", mESVideoInfo.Lc_PlayToken);
- intent.PutExtra("Psk", mESVideoInfo.Lc_Psk);
+
Shared.Application.Activity.StartActivity(intent);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
index 41d5dec..6d0dd75 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
@@ -304,7 +304,7 @@
cmtID = video.flRoomBindVO.flCmtId,
Lc_AccessToken = video.subAccountToken,
Lc_DeviceId = video.deviceId,
- Lc_Psk = video.deviceName,
+ Lc_Psk = video.deviceId,//2021-10-15 PSK瀛楁涓嶈兘鍙杁eviceName
Lc_PlayToken = video.playToken,
deviceSipAccount = video.deviceSipAccount,
HomeId = video.homeId
--
Gitblit v1.8.0