DLL/IOS/EZSDK.IOS.dllBinary files differ
DLL/LC/Android/Shared.Droid.LCVideoSDK.dllBinary files differ
DLL/LC/IOS/Shared.IOS.LCVideoOnSDK.dllBinary files differ
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. 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"; 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 对讲请求类型，call呼叫，如果不传，默认为talk 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); } } } } HDL-ON_Android/libs/armeabi-v7a/libGMCrypto.soBinary files differ
HDL-ON_Android/libs/armeabi-v7a/libLCOpenApiClient.soBinary files differ
HDL-ON_Android/libs/armeabi-v7a/libLechangeSDK.soBinary files differ
HDL-ON_Android/libs/armeabi-v7a/libSmartConfig.soBinary files differ
HDL-ON_Android/libs/armeabi-v7a/libSoftAPConfig.soBinary files differ
HDL-ON_Android/libs/armeabi-v7a/libconfigsdk.soBinary files differ
HDL-ON_Android/libs/armeabi-v7a/libgnustl_shared.soBinary files differ
HDL-ON_Android/libs/armeabi-v7a/libjcore127.soBinary files differ
HDL-ON_Android/libs/armeabi-v7a/libjninetsdk.soBinary files differ
HDL-ON_Android/libs/armeabi-v7a/libnetsdk.soBinary files differ
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> HDL-ON_iOS/Resources/zh-Hans.lproj/InfoPlist.strings
@@ -7,4 +7,5 @@ "NSPhotoLibraryAddUsageDescription"="应用程序希望访问您的照片库，用于设置房间的背景图片"; "NSMicrophoneUsageDescription"="应用程序希望访问您的手机麦克风，用于语音对讲"; "NSBluetoothPeripheralUsageDescription"="此应用程序使用蓝牙与设备通信，此应用程序不收集、存储或记录通过蓝牙通信的任何数据。"; "NSBluetoothAlwaysUsageDescription"="此应用程序使用蓝牙与设备通信，此应用程序不收集、存储或记录通过蓝牙通信的任何数据。"; "NSBluetoothAlwaysUsageDescription"="此应用程序使用蓝牙与设备通信，此应用程序不收集、存储或记录通过蓝牙通信的任何数据。"; "NSLocalNetworkUsageDescription"="应用程序希望使用本地网络来连接你的设备。"; 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字段不能取cname } else if (interphoneTypeEnum == InterphoneType.EZVIZ.ToString()) { 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> 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.初始化LCOpenSDK_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.初始化LCOpenSDK_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); 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字段不能取deviceName Lc_PlayToken = video.playToken, deviceSipAccount = video.deviceSipAccount, HomeId = video.homeId
