| HDL-ON_Android/Resources/Resource.designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Entity/Function/Function.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
HDL-ON_Android/Resources/Resource.designer.cs
Diff too large HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -15,7 +15,7 @@ #else using Foundation; using UIKit; //using Shared.IOS.HDLLinphoneSDK; using Shared.IOS.HDLLinphoneSDK; #endif namespace Shared @@ -766,57 +766,57 @@ { [Weak] HDLLinphone hdlLinphone; // public OnHDLLinphoneCallDelegate(HDLLinphone mHDLLinphone) // { // this.hdlLinphone = mHDLLinphone; // } public OnHDLLinphoneCallDelegate(HDLLinphone mHDLLinphone) { this.hdlLinphone = mHDLLinphone; } // /// <summary> // /// 接听 // /// </summary> // public override void OnAnswerAction() // { // hdlLinphone.HDLUpdateCallStatus(CallStatusType.RECEIVED, InterphoneType.HDL); // } /// <summary> /// 接听 /// </summary> public override void OnAnswerAction() { hdlLinphone.HDLUpdateCallStatus(CallStatusType.RECEIVED, InterphoneType.HDL); } // /// <summary> // /// 挂断 // /// </summary> // /// <param name="callDuration"></param> // public override void OnHangUpAction(int callDuration) // { // hdlLinphone.HDLUpdateCallStatus(CallStatusType.RECEIVED, InterphoneType.HDL, callDuration); // } /// <summary> /// 挂断 /// </summary> /// <param name="callDuration"></param> public override void OnHangUpAction(int callDuration) { hdlLinphone.HDLUpdateCallStatus(CallStatusType.RECEIVED, InterphoneType.HDL, callDuration); } // /// <summary> // /// 拒接 // /// </summary> // public override void OnRejectCallAction() // { // hdlLinphone.HDLUpdateCallStatus(CallStatusType.REJECT, InterphoneType.HDL); // } /// <summary> /// 拒接 /// </summary> public override void OnRejectCallAction() { hdlLinphone.HDLUpdateCallStatus(CallStatusType.REJECT, InterphoneType.HDL); } /// <summary> /// 截图成功 /// </summary> /// <param name="image"></param> //public override void OnScreenshotSuccessfulAction(UIImage image) //{ ////NSData imageData = UIImagePNGRepresentation(image); UIImage //NSData imageData = image.AsPNG(); //byte[] dataBytes = new byte[imageData.Length]; //System.Runtime.InteropServices.Marshal.Copy(imageData.Bytes, dataBytes, 0, Convert.ToInt32(imageData.Length)); ////image.g ////hdlLinphone.ScreenshotSuccessfulAction(dataBytes); //} /// <param name = "image" ></ param > public void OnScreenshotSuccessfulAction(UIImage image) { //NSData imageData = UIImagePNGRepresentation(image); UIImage NSData imageData = image.AsPNG(); byte[] dataBytes = new byte[imageData.Length]; System.Runtime.InteropServices.Marshal.Copy(imageData.Bytes, dataBytes, 0, Convert.ToInt32(imageData.Length)); //image.g //hdlLinphone.ScreenshotSuccessfulAction(dataBytes); } // /// <summary> // /// 开锁成功 // /// </summary> // public override void OnUnlockAction() // { // hdlLinphone.HDLUnlockAction(); // } /// <summary> /// 开锁成功 /// </summary> public override void OnUnlockAction() { hdlLinphone.HDLUnlockAction(); } /// <summary> /// 来电中... @@ -828,7 +828,7 @@ //} } #endregion #endif HDL_ON/Entity/Function/Function.cs
@@ -1374,10 +1374,7 @@ /// 门锁 /// </summary> public const string DoorLock = "security.door"; /// <summary> /// 萤石视屏门锁 /// </summary> public const string VideoDoorLock = "security.door.ezviz"; /// <summary> /// 门锁spk列表 /// </summary> HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
@@ -828,9 +828,10 @@ //MainPage.BasePageView.AddChidren(myServerInfoPage); //myServerInfoPage.LoadPage(); //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; #if __IOS__ //萤石临时密码 EZSDK.IOS.EZSDK.SharedInstance().ToTemPassView("1638782606240137218"); #endif }; myServerInfoCellView.GoAction = selectAction; @@ -852,9 +853,10 @@ //MainPage.BasePageView.AddChidren(myServerInfoPage); //myServerInfoPage.LoadPage(); //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; #if __IOS__ //萤石历史记录 EZSDK.IOS.EZSDK.SharedInstance().ToDeviceMsgListView("1638782606240137218"); #endif }; logOffView.GoAction = logOffAction; logOffView.BtnTilte.Text = Language.StringByID(StringId.CancelAccount); HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
@@ -444,9 +444,10 @@ //MainPage.BasePageView.AddChidren(aep); //aep.LoadPage(); //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; #if __IOS__ //萤石跳转视频页 EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial("J92513662", "1638782606240137218", "security.door.ezviz"); #endif }; _QRcodeView.MouseUpEventHandler = eventHandler; btnQRcode.MouseUpEventHandler = eventHandler; @@ -502,28 +503,29 @@ //{ // btnUserPhoneInfo.Text = GetBindAccountText(phone); //}; //}; //if (CheckIfUnbound(btnUserPhoneInfo.Text)) //{ // //未绑定,跳转新绑定页面 // var aep = new NewBindAccountPage(); // MainPage.BasePageView.AddChidren(aep); // aep.LoadPage(action, true); // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; //} //else //{ // var aep = new AccountBindInfoPage(); // MainPage.BasePageView.AddChidren(aep); // aep.LoadPage(action, 2, StringId.PhoneInfo); // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; //} //if (CheckIfUnbound(btnUserPhoneInfo.Text)) //{ // //未绑定,跳转新绑定页面 // var aep = new NewBindAccountPage(); // MainPage.BasePageView.AddChidren(aep); // aep.LoadPage(action, true); // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; //} //else //{ // var aep = new AccountBindInfoPage(); // MainPage.BasePageView.AddChidren(aep); // aep.LoadPage(action, 2, StringId.PhoneInfo); // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; //} #if __IOS__ //萤石跳转设备列表 NSObject[] types = new NSObject[1]; types[0] = new NSString("DL30V"); EZSDK.IOS.EZSDK.SharedInstance().ToEZDeviceListViewWithFilterTypes(types); #endif }; @@ -563,13 +565,14 @@ ////page.LoadPage(); ////MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; //var vcp = new ResetPasswordPage(); //MainPage.BasePageView.AddChidren(vcp); //vcp.LoadPage(); //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; //var vcp = new ResetPasswordPage(); //MainPage.BasePageView.AddChidren(vcp); //vcp.LoadPage(); //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; #if __IOS__ //萤石添加设备 EZSDK.IOS.EZSDK.SharedInstance().AddEzvizMonitorWithDeviceType("security.door.ezviz"); #endif }; btnResetPasswordRight.MouseUpEventHandler = eventHandler; HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -41,8 +41,9 @@ #region --------- 跳转到Android那边的方法(萤石视频门锁) -------- /// <summary> /// 读取云端的上设备列表(android源生添加设备到云端成功后) /// <paramref name="devSerial"/>设备序列号</param> /// android,ios源生添加设备到云端成功后回调方法 /// 再读取云端的上萤石设备列表 /// <paramref name="spk"/>spk</param> /// </summary> public void SkipAddDeviceActivity(string spk) { @@ -244,7 +245,12 @@ /// <param name="home">对象</param> public void ChangeCurrHome(RegionInfoRes home) { if (DB_ResidenceData.Instance.CurrentRegion.id == home.id || string.IsNullOrEmpty(home.id)) return; #if __IOS__ #else HDLEzvizSdk.Instance.SetHomeId(home.id); #endif } #endregion @@ -446,7 +452,6 @@ ///// </summary> //public class IosIHdlInterface : Shared.IOS.HDLLinphoneSDK.HDLLinphoneCallDelegate //{ // Action<bool, string> mAction; // public IosIHdlInterface(Action<bool, string> action) // { @@ -461,8 +466,6 @@ // { // mAction?.Invoke(p0, p1); // } //} #else /// <summary>
