.vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DLL/IOS/EZSDK.IOS.dll | 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/Common/ApiUtlis.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/Common/HDLCommon.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/DAL/Server/HttpServerRequest.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/DAL/Server/HttpUtil.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/DAL/Server/NewAPI.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,41 +1,31 @@ <Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/MiniRemoteControl/AddMiniRemoteControlDirection4Page.cs"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.08FD445C-3EE8-4ED2-BF28-B42ADD0DA92C" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs"> <Files> <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="226" Column="54" /> <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="276" Column="72" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" Line="26" Column="62" /> <File FileName="HDL_ON/Entity/Enumerative/Command.cs" Line="1406" Column="38" /> <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" Line="818" Column="84" /> <File FileName="HDL_ON/DAL/DriverLayer/Packet.cs" Line="197" Column="51" /> <File FileName="HDL_ON/Entity/Function/Light.cs" Line="51" Column="7" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/MiniRemoteControl/AddMiniRemoteControlDirection4Page.cs" Line="544" Column="35" /> <File FileName="HDL_ON/Common/HDLCommon.cs" Line="298" Column="43" /> <File FileName="HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs" Line="63" Column="39" /> <File FileName="HDL_ON/DAL/Server/NewApiRes.cs" Line="1424" Column="23" /> <File FileName="HDL-ON_Android/Assets/Language.ini" Line="1722" Column="5" /> <File FileName="HDL_ON/Common/R.cs" Line="1242" Column="37" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs" Line="310" Column="86" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/ObjectClass.cs" Line="141" Column="23" /> </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="DriverLayer" expanded="True" /> <Node name="Server" expanded="True" /> <Node name="Common" expanded="True"> <Node name="HDLCommon.cs" selected="True" /> </Node> <Node name="Entity" expanded="True"> <Node name="Enumerative" expanded="True" /> <Node name="Function" expanded="True" /> </Node> <Node name="UI" expanded="True"> <Node name="UI1-Login" expanded="True" /> <Node name="UI2" expanded="True"> <Node name="4-PersonalCenter" expanded="True"> <Node name="AddDevice" expanded="True"> <Node name="MiniRemoteControl" expanded="True"> <Node name="AddMiniRemoteControlDirection4Page.cs" selected="True" /> </Node> </Node> </Node> <Node name="FuntionControlView" expanded="True" /> </Node> <Node name="HDL-ON_Android" expanded="True"> <Node name="Assets" expanded="True" /> </Node> <Node name="HDL-ON_iOS" expanded="True"> <Node name="Resources" expanded="True"> <Node name="EZ" expanded="True"> <Node name="Base.lproj" expanded="True" /> </Node> </Node> </Node> @@ -50,10 +40,10 @@ <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String> <String>Shared.IOS/Shared.IOS.csproj</String> </DisabledProjects> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" /> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" line="42" column="1" /> <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" line="42" column="1" /> </BreakpointStore> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> DLL/IOS/EZSDK.IOS.dllBinary files differ
HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard
@@ -2,7 +2,6 @@ <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"> <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -686,9 +685,21 @@ <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"/> <attributedString key="attributedText"> <fragment content="返回demo,等待与设备连接,成功后自动进入下一步操作。"> <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"/> </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"/> </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"/> </attributes> </fragment> @@ -914,7 +925,7 @@ </scenes> <inferredMetricsTieBreakers> <segue reference="9TP-S2-hhI"/> <segue reference="MFl-yy-ZsP"/> <segue reference="9Lc-Kx-oZS"/> <segue reference="ikM-Zn-H8f"/> </inferredMetricsTieBreakers> <resources> HDL_ON/Common/ApiUtlis.cs
@@ -271,7 +271,7 @@ foreach (var video in FunctionList.List.videoIntercom) { if (video.interphoneType == "IMOUVISIAL") if (video.interphoneType == InterphoneType.IMOUVISIAL.ToString()) { UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken = video.subAccountToken; } HDL_ON/Common/HDLCommon.cs
@@ -273,7 +273,7 @@ if (jpushMessageInfo.messageType.Contains(PushMessageType.Alarm.ToString())) { //报警推送弹窗提示 ShowAlarmPushMessage(jpushMessageInfo,true); ShowAlarmPushMessage(jpushMessageInfo, true); } else if (jpushMessageInfo.messageType.Contains(PushMessageType.FLCall.ToString())) { @@ -303,28 +303,44 @@ if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return; //字段兼容问题,只能直接取值了 var json= Newtonsoft.Json.Linq.JObject.Parse(jpushMessageInfo.expantContent); var json = Newtonsoft.Json.Linq.JObject.Parse(jpushMessageInfo.expantContent); //视对讲厂家类型 string interphoneTypeEnum = json["interphoneTypeEnum"].ToString(); if (string.IsNullOrEmpty(interphoneTypeEnum)) return; ESVideoInfo eSVideoInfo = new ESVideoInfo();// GetESOnVideoJson(jpushMessageInfo.expantContent); eSVideoInfo.callId = json["callId"].ToString(); //eSVideoInfo.Lc_AccessToken = UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken;//json["subAccountToken"].ToString();// eSVideoInfo.Lc_AccessToken = json["subAccountToken"].ToString();//2021-05-13 目前云端还没拿到Lc_AccessToken,目前没办法正常使用 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(); if (interphoneTypeEnum == InterphoneType.IMOUVISIAL.ToString()) { eSVideoInfo.callId = json["callId"].ToString(); //eSVideoInfo.Lc_AccessToken = UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken;//json["subAccountToken"].ToString();// eSVideoInfo.Lc_AccessToken = json["subAccountToken"].ToString();//2021-05-13 目前云端还没拿到Lc_AccessToken,目前没办法正常使用 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(); } else if (interphoneTypeEnum == InterphoneType.EZVIZ.ToString()) { eSVideoInfo.Lc_AccessToken = json["subToken"].ToString();//"子账号token eSVideoInfo.DeviceSerial = json["devSerial"].ToString();//设备序列号 eSVideoInfo.HomeId = jpushMessageInfo.HomeId; } if (eSVideoInfo == null) return; ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, "IMOUVISIAL"); ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, interphoneTypeEnum); } else if(jpushMessageInfo.messageType.Contains(PushMessageType.Prompt.ToString())) else if (jpushMessageInfo.messageType.Contains(PushMessageType.Prompt.ToString())) { ShowAlarmPushMessage(jpushMessageInfo, false); } } } catch(Exception EX) catch (Exception EX) { Utlis.WriteLine("catch: " + EX.ToString()); } @@ -436,7 +452,7 @@ /// </summary> /// <param name="jpushMessageInfo"></param> /// <param name="isAlarm">是否是报警信息,(加载的弹窗颜色不一样)</param> public void ShowAlarmPushMessage(JPushMessageInfo jpushMessageInfo,bool isAlarm) public void ShowAlarmPushMessage(JPushMessageInfo jpushMessageInfo, bool isAlarm) { //没登录不处理 if (UserInfo.Current == null || !UserInfo.Current.IsLogin || MainPage.BasePageView == null) @@ -600,10 +616,12 @@ var result = new HttpServerRequest().EZGetChildToken(); if (result.Code == StateCode.SUCCESS) { var ezChildAccessToken = Newtonsoft.Json.JsonConvert.DeserializeObject<EZChildAccessToken>(result.Data.ToString()); var ezChildAccessToken = result.Data.ToString(); //var ezChildAccessToken = Newtonsoft.Json.JsonConvert.DeserializeObject<EZChildAccessToken>(result.Data.ToString()); Application.RunOnMainThread(() => { if (!string.IsNullOrEmpty(ezChildAccessToken.accessToken)) if (!string.IsNullOrEmpty(ezChildAccessToken)) { #if __IOS__ //iOS @@ -611,12 +629,15 @@ EZSDK.IOS.EZSDK.InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b"); //1.设置所需河东的AccessToken和RefreshToken、域名地址 EZSDK.IOS.EZSDK.SetHDlAccessToken(UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken); EZSDK.IOS.EZSDK.SetRequestHttpsHost(OnAppConfig.Instance.RequestHttpsHost); EZSDK.IOS.EZSDK.SetRequestHttpsHostAndPlatform(OnAppConfig.Instance.RequestHttpsHost, 1, DB_ResidenceData.Instance.CurrentRegion.id); //2.设置萤石子账号的AccessToken到SDK EZSDK.IOS.EZSDK.SetEZAccessToken(ezChildAccessToken.accessToken); //3.打开摄像头设备列表页面 EZSDK.IOS.EZSDK.SetEZAccessToken(ezChildAccessToken); ////3.打开摄像头设备列表页面 EZSDK.IOS.EZSDK.Go2EZvizMonitor(); //EZSDK.IOS.EZDeviceInfo info = new EZSDK.IOS.EZDeviceInfo(); //info.de //EZSDK.IOS.EZSDK.Play(info); #else //Android //1.设置所需河东的token、域名地址 HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -2469,10 +2469,13 @@ #region ■ 萤石云SDK相关接口_________________________ /// <summary> /// 河东获取萤石云子账号token的接口 /// 2021-07-07 新方案接口调整对接 /// </summary> public ResponsePackNew EZGetChildToken() { Dictionary<string, object> d = new Dictionary<string, object>(); d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); d.Add("platform", "1"); var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_EZ_GetChildToken, requestJson); } HDL_ON/DAL/Server/HttpUtil.cs
@@ -18,8 +18,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/Server/NewAPI.cs
@@ -599,7 +599,7 @@ /// <summary> /// 河东获取萤石云子账号token的接口 /// </summary> public const string API_POST_EZ_GetChildToken = "/home-wisdom/platform/childToken"; public const string API_POST_EZ_GetChildToken = "/home-wisdom/platform/yingshi/child/token"; #endregion HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
@@ -4,6 +4,7 @@ using System.Threading; using System.Collections.Generic; using HDL_ON.UI.UI2.PersonalCenter.PirDevice; using HDL_ON.Entity; #if __IOS__ using Shared.IOS.ESVideoOnSDK; @@ -66,7 +67,7 @@ int.TryParse(mESVideoInfo.roomno, out roomID); #if __IOS__ if (interphoneType == "IMOUVISIAL") if (interphoneType == InterphoneType.IMOUVISIAL.ToString()) { //乐橙可视对讲 //1.初始化LCOpenSDK_Api @@ -95,7 +96,7 @@ } #else Intent intent = null; if (interphoneType == "IMOUVISIAL") if (interphoneType == InterphoneType.IMOUVISIAL.ToString()) { intent = new Intent(Shared.Application.Activity, typeof(HDL_ON_Android.LeChengVideoActivity)); } @@ -136,7 +137,7 @@ int roomID = 0; int.TryParse(mESVideoInfo.roomno, out roomID); #if __IOS__ if (interphoneType == "IMOUVISIAL") if (interphoneType == InterphoneType.IMOUVISIAL.ToString()) { //乐橙可视对讲 //1.初始化LCOpenSDK_Api @@ -152,6 +153,21 @@ vc.MLCCallDelegate = mOnLCCallDelegate; //vc.MLCCallDelegate = new OnLCCallDelegate(this); Shared.Application.currentVC.NavigationController.PushViewController(vc, true); } else if (interphoneType == InterphoneType.EZVIZ.ToString()) { //萤石猫眼呼叫 //初始化萤石云SDK,中文国内key、英文海外key 开发者账号使用应用包名申请的APPKEY,不同包名应用需配置不同的APPKEY EZSDK.IOS.EZSDK.InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b"); //1.设置所需河东的AccessToken和RefreshToken、域名地址 EZSDK.IOS.EZSDK.SetHDlAccessToken(UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken); EZSDK.IOS.EZSDK.SetRequestHttpsHostAndPlatform(OnAppConfig.Instance.RequestHttpsHost, 1, mESVideoInfo.HomeId); //2.设置萤石子账号的AccessToken到SDK EZSDK.IOS.EZSDK.SetEZAccessToken(mESVideoInfo.Lc_AccessToken); //3.打开视频播放页面 EZSDK.IOS.EZSDK.PlayWithDeviceSerial(mESVideoInfo.DeviceSerial); } else { @@ -170,9 +186,12 @@ #region Intent intent = null; if (interphoneType == "IMOUVISIAL") if (interphoneType == InterphoneType.IMOUVISIAL.ToString()) { intent = new Intent(Shared.Application.Activity, typeof(HDL_ON_Android.LeChengVideoActivity)); } else if (interphoneType == InterphoneType.EZVIZ.ToString()) { //萤石猫眼呼叫处理 } else { @@ -598,31 +617,33 @@ } #endregion #endif /// <summary> /// 测试方法 /// </summary> /// <param name="isMonitor"></param> public void Test(bool isMonitor = true) { ESVideoInfo eSVideoInfo = new ESVideoInfo() { DeviceName = "室外机88", ESVideoUUID = "JJY000019VPLLF", ///// <summary> ///// 测试方法 ///// </summary> ///// <param name="isMonitor"></param> //public void Test(bool isMonitor = true) //{ // ESVideoInfo eSVideoInfo = new ESVideoInfo() // { // DeviceName = "室外机88", // ESVideoUUID = "JJY000019VPLLF", }; if (isMonitor) { ShowESVideoMonitor(eSVideoInfo, ""); } else { eSVideoInfo.callId = "88888"; ShowESvideoVideoIntercom(eSVideoInfo, ""); } // }; // if (isMonitor) // { // ShowESVideoMonitor(eSVideoInfo, ""); // } // else // { // eSVideoInfo.callId = "88888"; // ShowESvideoVideoIntercom(eSVideoInfo, ""); // } } //} } /// <summary> @@ -667,9 +688,9 @@ //========================大华========================== /// <summary> /// 账号accessToken /// 萤石子账号Token也共用这个字段 /// </summary> public string Lc_AccessToken = string.Empty; @@ -692,6 +713,17 @@ /// 账号标记:0国内,1国外;国内国外访问都地址不一样 /// </summary> public int Lc_Location = 0; //========================萤石云猫眼========================== /// <summary> /// 住宅Id /// </summary> public string HomeId = string.Empty; /// <summary> /// 设备序列号 /// </summary> public string DeviceSerial = string.Empty; } @@ -728,5 +760,11 @@ /// 大华可视对讲平台 /// </summary> IMOUVISIAL, /// <summary> /// 萤石猫眼呼叫 /// </summary> EZVIZ, } }