From d5a7e0f0199959eac3a3a148624dfc58dbbe7a47 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期三, 29 三月 2023 14:08:36 +0800
Subject: [PATCH] 1.更新EZSDK.IOS.dll 2.集成萤石相关方法 3.删除不必要的测试代码
---
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs | 68 +++++++++++-----
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs | 79 ++++++++-----------
HDL_ON/Common/HDLCommon.cs | 6 +
HDL_ON/DAL/Server/HttpUtil.cs | 4
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs | 24 ++----
DLL/IOS/EZSDK.IOS.dll | 0
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs | 2
7 files changed, 93 insertions(+), 90 deletions(-)
diff --git a/DLL/IOS/EZSDK.IOS.dll b/DLL/IOS/EZSDK.IOS.dll
index b16101e..7a1071e 100644
--- a/DLL/IOS/EZSDK.IOS.dll
+++ b/DLL/IOS/EZSDK.IOS.dll
Binary files differ
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 0f918ef..baff440 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -7,7 +7,7 @@
using HDL_ON.Entity;
using System.Threading;
using HDL_ON.DriverLayer;
-
+using Foundation;
namespace HDL_ON
{
/// <summary>
@@ -706,9 +706,11 @@
Console.WriteLine("loginToken锛�" + UserInfo.Current.LoginTokenString);
Console.WriteLine("refreshToken锛�" + UserInfo.Current.RefreshToken);
-
////3.鎵撳紑鎽勫儚澶磋澶囧垪琛ㄩ〉闈�
EZSDK.IOS.EZSDK.SharedInstance().Go2EZvizMonitor();
+ //NSObject[] types = new NSObject[1];
+ //types[0] = new NSString("DL30V");
+ //EZSDK.IOS.EZSDK.SharedInstance().ToEZDeviceListViewWithFilterTypes(types);
//EZSDK.IOS.EZDeviceInfo info = new EZSDK.IOS.EZDeviceInfo();
//info.de
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 511a91e..bf39c96 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/UI/UI2/4-PersonalCenter/PersonalDataPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
index aeb7f0f..eb2e32c 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
@@ -824,14 +824,10 @@
//璺宠浆鏈嶅姟鍣ㄤ俊鎭�
Action selectAction = () =>
{
- //var myServerInfoPage = new MyServerInfoPage();
- //MainPage.BasePageView.AddChidren(myServerInfoPage);
- //myServerInfoPage.LoadPage();
- //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-#if __IOS__
- //钀ょ煶涓存椂瀵嗙爜
- EZSDK.IOS.EZSDK.SharedInstance().ToTemPassView("1638782606240137218");
-#endif
+ var myServerInfoPage = new MyServerInfoPage();
+ MainPage.BasePageView.AddChidren(myServerInfoPage);
+ myServerInfoPage.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
myServerInfoCellView.GoAction = selectAction;
@@ -849,14 +845,10 @@
//娉ㄩ攢璐﹀彿鐣岄潰
Action logOffAction = () =>
{
- //var myServerInfoPage = new CancelAccountPage();
- //MainPage.BasePageView.AddChidren(myServerInfoPage);
- //myServerInfoPage.LoadPage();
- //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-#if __IOS__
- //钀ょ煶鍘嗗彶璁板綍
- EZSDK.IOS.EZSDK.SharedInstance().ToDeviceMsgListView("1638782606240137218");
-#endif
+ var myServerInfoPage = new CancelAccountPage();
+ MainPage.BasePageView.AddChidren(myServerInfoPage);
+ myServerInfoPage.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
logOffView.GoAction = logOffAction;
logOffView.BtnTilte.Text = Language.StringByID(StringId.CancelAccount);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
index 840f117..26b7215 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
@@ -439,15 +439,11 @@
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- ////鎴戠殑浜岀淮鐮�
- //var aep = new MyQRCodePage();
- //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
+ //鎴戠殑浜岀淮鐮�
+ var aep = new MyQRCodePage();
+ MainPage.BasePageView.AddChidren(aep);
+ aep.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
_QRcodeView.MouseUpEventHandler = eventHandler;
btnQRcode.MouseUpEventHandler = eventHandler;
@@ -499,34 +495,27 @@
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- //Action<string> action = (phone) =>
- //{
- // btnUserPhoneInfo.Text = GetBindAccountText(phone);
+ Action<string> action = (phone) =>
+ {
+ 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 __IOS__
- //钀ょ煶璺宠浆璁惧鍒楄〃
- NSObject[] types = new NSObject[1];
- types[0] = new NSString("DL30V");
- EZSDK.IOS.EZSDK.SharedInstance().ToEZDeviceListViewWithFilterTypes(types);
-#endif
-
+ 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;
+ }
};
btnUserPhoneInfo.MouseUpEventHandler = eventHandler;
@@ -560,19 +549,15 @@
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- ////var page = new ResetPasswordOptionPage();
- ////MainPage.BasePageView.AddChidren(page);
- ////page.LoadPage();
- ////MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ //var page = new ResetPasswordOptionPage();
+ //MainPage.BasePageView.AddChidren(page);
+ //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;
-#if __IOS__
- //钀ょ煶娣诲姞璁惧
- EZSDK.IOS.EZSDK.SharedInstance().AddEzvizMonitorWithDeviceType("security.door.ezviz");
-#endif
+ var vcp = new ResetPasswordPage();
+ MainPage.BasePageView.AddChidren(vcp);
+ vcp.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
btnResetPasswordRight.MouseUpEventHandler = eventHandler;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
index 3347bb4..261d0d6 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -39,7 +39,7 @@
}
- #region --------- 璺宠浆鍒癆ndroid閭ｈ竟鐨勬柟娉�(钀ょ煶瑙嗛闂ㄩ攣) --------
+ #region --------- 璺宠浆鍒癆ndroid锛宨os閭ｈ竟鐨勬柟娉�(钀ょ煶瑙嗛闂ㄩ攣) --------
/// <summary>
/// android,ios婧愮敓娣诲姞璁惧鍒颁簯绔垚鍔熷悗鍥炶皟鏂规硶
/// 鍐嶈鍙栦簯绔殑涓婅悿鐭宠澶囧垪琛�
@@ -59,6 +59,21 @@
});
}
#if __IOS__
+ //璺宠浆娣诲姞钀ょ煶璁惧
+ ezsdkDelegate = new IosIHdlInterface();
+ ezsdkDelegate.mAction += (serials) => {
+ var list = VideDoorLockSend.Current.GetVideoDoorLockDeviceList(SPK.VideoDoorLock);
+ if (list.Count > 0)
+ {
+ var function = list.Find((o) => o.sid == serials);
+ if (function != null)
+ {
+ this.SaveFunctionFile(function);
+ }
+ }
+ };
+ EZSDK.IOS.EZSDK.SharedInstance().Delegate= ezsdkDelegate;
+ EZSDK.IOS.EZSDK.SharedInstance().AddEzvizMonitorWithDeviceType(spk);
#else
HDLEzvizSdk.Instance.JumpToEZScanActivity(Application.Activity,spk);
@@ -116,7 +131,8 @@
{
dialog.Close();
#if __IOS__
-
+ //鎵撳紑钀ょ煶瑙嗛鐣岄潰
+ EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(deviceSerial, deviceId, spk);
#else
HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity,deviceId,deviceSerial,spk);
#endif
@@ -128,6 +144,9 @@
else
{
#if __IOS__
+ //鎵撳紑钀ょ煶瑙嗛鐣岄潰
+ EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(deviceSerial, deviceId, spk);
+
#else
HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity,deviceId,deviceSerial,spk);
#endif
@@ -148,6 +167,8 @@
{
#if __IOS__
+ //鎵撳紑钀ょ煶鍘嗗彶璁板綍鐣岄潰
+ EZSDK.IOS.EZSDK.SharedInstance().ToDeviceMsgListView(deviceId);
#else
HDLEzvizSdk.Instance.JumpLockHistoryActivity(Application.Activity, deviceId);
#endif
@@ -172,6 +193,8 @@
});
}
#if __IOS__
+ //鎵撳紑钀ょ煶涓存椂瀵嗙爜鐣岄潰
+ EZSDK.IOS.EZSDK.SharedInstance().ToTemPassView(deviceId);
#else
HDLEzvizSdk.Instance.JumpTempPasswordActivity(Application.Activity, deviceId);
#endif
@@ -447,26 +470,27 @@
}
#if __IOS__
- ///// <summary>
- ///// 涓撻棬瀹氫箟缁橧os鍥炶皟鐢ㄧ潃,娌℃湁鐗规畩鍚箟
- ///// </summary>
- //public class IosIHdlInterface : Shared.IOS.HDLLinphoneSDK.HDLLinphoneCallDelegate
- //{
- // Action<bool, string> mAction;
- // public IosIHdlInterface(Action<bool, string> action)
- // {
- // mAction = action;
- // }
- // /// <summary>
- // ///
- // /// </summary>
- // /// <param name="p0">true鏄叆缃戞垚鍔�(婧愮敓鍥炶皟杩斿洖)</param>
- // /// <param name="p1">璁惧鐨勫簭鍒楀寲(婧愮敓鍥炶皟杩斿洖)</param>
- // public void AddCallback(bool p0, string p1)
- // {
- // mAction?.Invoke(p0, p1);
- // }
- //}
+ IosIHdlInterface ezsdkDelegate;
+ /// <summary>
+ /// 涓撻棬瀹氫箟缁橧os鍥炶皟鐢ㄧ潃,娌℃湁鐗规畩鍚箟
+ /// </summary>
+ public class IosIHdlInterface : EZSDK.IOS.EZSDKDelegate
+ {
+ public Action<string> mAction;
+ public IosIHdlInterface()
+ {
+
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="p0">true鏄叆缃戞垚鍔�(婧愮敓鍥炶皟杩斿洖)</param>
+ /// <param name="p1">璁惧鐨勫簭鍒楀寲(婧愮敓鍥炶皟杩斿洖)</param>
+ public override void AddDeviceSuccessed(string deviceSerial)
+ {
+ mAction?.Invoke(deviceSerial);
+ }
+ }
#else
/// <summary>
/// 涓撻棬瀹氫箟缁欏畨鍗撳洖璋冪敤鐫�,娌℃湁鐗规畩鍚箟
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs
index fe1a0f0..2893dee 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs
@@ -153,7 +153,7 @@
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("spk", spk);
- var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d, NewAPI.Api_Post_UserList, "鑾峰彇钀ょ煶闂ㄩ攣璁惧鍒楄〃");
+ var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d, NewAPI.Api_Post_GetDevcieList, "鑾峰彇钀ょ煶闂ㄩ攣璁惧鍒楄〃");
if (!this.DataChecking(responsePackNew, tipType))
{
return new List<Function>();
--
Gitblit v1.8.0