From cf7623fe25a008b4e128c6083e362578e2a1e3b0 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 29 三月 2023 14:29:09 +0800
Subject: [PATCH] 2023年03月29日14:23:28
---
HDL_ON/DAL/Server/NewAPI.cs | 5 +
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs | 50 ++++++++----
HDL_ON/Common/HDLCommon.cs | 81 ++++++++++++-------
HDL_ON/DAL/Server/HttpUtil.cs | 4
DLL/IOS/EZSDK.IOS.dll | 0
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs | 31 ++++++-
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/ObjectClass.cs | 22 +++++
7 files changed, 137 insertions(+), 56 deletions(-)
diff --git a/DLL/IOS/EZSDK.IOS.dll b/DLL/IOS/EZSDK.IOS.dll
index 5d1bcdc..0751c8a 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 6d6b206..d9fe79d 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -398,7 +398,7 @@
return;
}
///瑙嗛闂ㄩ攣
- HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId,expantContent.spk,true);
+ HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId, expantContent.spk, true);
}
catch { }
}
@@ -411,12 +411,12 @@
}
//{"code":0,"data":{"list":[{"createTime":"1625798305115","modifyTime":"1625798305115","region":"100000000000000001","id":"1413326644794294273","alarmId":"20210709103818-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709103818-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:38:17","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{"createTime":"1625798057197","modifyTime":"1625798057197","region":"100000000000000001","id":"1413325604946640898","alarmId":"20210709103413-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709103413-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:34:12","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625797973320","modifyTime":"1625797973320","region":"100000000000000001","id":"1413325253141004289","alarmId":"20210709103236-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709103236-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:32:31","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625797782136","modifyTime":"1625797782136","region":"100000000000000001","id":"1413324451261382658","alarmId":"20210709102937-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709102937-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:29:37","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625797668771","modifyTime":"1625797668771","region":"100000000000000001","id":"1413323975769915394","alarmId":"20210709102743-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709102743-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:27:42","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625797539846","modifyTime":"1625797539846","region":"100000000000000001","id":"1413323435023466498","alarmId":"20210709102534-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709102534-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:25:34","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625797530627","modifyTime":"1625797530627","region":"100000000000000001","id":"1413323396351983618","alarmId":"20210709102525-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709102525-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:25:25","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625796028089","modifyTime":"1625796028089","region":"100000000000000001","id":"1413317094255034369","alarmId":"20210709100024-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709100024-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:00:23","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625795974558","modifyTime":"1625795974558","region":"100000000000000001","id":"1413316869729746946","alarmId":"20210709095931-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709095931-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T09:59:31","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625795966933","modifyTime":"1625795966933","region":"100000000000000001","id":"1413316837748178946","alarmId":"20210709095923-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709095923-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T09:59:22","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"}],"totalCount":"13","totalPage":"2","pageNo":"1","pageSize":"10"},"timestamp":"1625807415164","isSuccess":true}
//{"platform":"1","timestamp":"1625805660249","appKey":"HDL-HOME-APP-TEST","sign":"02e433c40485b30451ebdc5ca3cd959c","deviceSerial":"F41014762","homeId":"1396717478877241345"}
- /// <summary>
- /// 瑙ｆ瀽涓版灄鍙瀵硅鎺ㄩ�佹暟鎹�
- /// </summary>
- /// <param name="jsonStr"></param>
- /// <returns></returns>
- ESVideoInfo GetESOnVideoJson(string jsonStr)
+ /// <summary>
+ /// 瑙ｆ瀽涓版灄鍙瀵硅鎺ㄩ�佹暟鎹�
+ /// </summary>
+ /// <param name="jsonStr"></param>
+ /// <returns></returns>
+ ESVideoInfo GetESOnVideoJson(string jsonStr)
{
try
{
@@ -483,7 +483,7 @@
//5.鍏ㄨ閫氱櫥鍑�
Shared.IOS.HDLFVSDK.Video.Logout();
//6.娓呯┖Siri鍏变韩鏁版嵁淇℃伅
- new Other.SkipControl().SetData(false, "", "", "","");
+ new Other.SkipControl().SetData(false, "", "", "", "");
var sDM = new SiriKit.SceneDateManager();
Console.WriteLine($"IsLogin:{sDM.IsLgoin};accessToken:{sDM.AccessToken};refreshToken:{sDM.RefreshToken};RegionUrl:{sDM.RegionUrl};HomeId:{sDM.HomeId}");
#endif
@@ -575,7 +575,7 @@
//闃叉澶氭寮圭獥澶勭悊
- if (alarmPushConfirmDialog == null)
+ if (alarmPushConfirmDialog == null)
{
alarmPushConfirmDialog = new ConfirmDialog(isAlarm);
alarmPushConfirmDialog.ShowDialog(Language.StringByID(StringId.Tip), jpushMessageInfo.Content, goAction, cancelAction, StringId.Cancel, StringId.LookOver);
@@ -588,9 +588,9 @@
}
-#endregion
+ #endregion
-#region 鈻� 甯哥敤鏂规硶_______________________
+ #region 鈻� 甯哥敤鏂规硶_______________________
/// <summary>
/// 璁剧疆涓嬪垝绾挎寜閽姸鎬�
/// 缁熶竴灏佽璁剧疆鏂规硶
@@ -665,9 +665,9 @@
Control.Ins.SearchLoaclGateway();
}
}
-#endregion
+ #endregion
-#region 璺宠浆鎵撳紑钀ょ煶浜戞柟娉�
+ #region 璺宠浆鎵撳紑钀ょ煶浜戞柟娉�
/// <summary>
/// 鑾峰彇瀛愯处鍙穞oken骞惰烦杞澶囧垪琛ㄩ〉闈�
@@ -683,6 +683,7 @@
{
try
{
+ var list = UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockLockModelsList();
//鍏堣幏鍙栬悿鐭充簯瀛愯处鍙穞oken
var result = new HttpServerRequest().EZGetChildToken();
if (result.Code == StateCode.SUCCESS)
@@ -694,7 +695,9 @@
{
if (!string.IsNullOrEmpty(ezChildAccessToken))
{
+
#if __IOS__
+
//iOS
//鍒濆鍖栬悿鐭充簯SDK锛屼腑鏂囧浗鍐卥ey銆佽嫳鏂囨捣澶杒ey 寮�鍙戣�呰处鍙蜂娇鐢ㄥ簲鐢ㄥ寘鍚嶇敵璇风殑APPKEY锛屼笉鍚屽寘鍚嶅簲鐢ㄩ渶閰嶇疆涓嶅悓鐨凙PPKEY
EZSDK.IOS.EZSDK.SharedInstance().InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b");
@@ -703,12 +706,25 @@
EZSDK.IOS.EZSDK.SharedInstance().SetRequestHttpsHostAndPlatform(OnAppConfig.Instance.RequestHttpsHost, 1, DB_ResidenceData.Instance.CurrentRegion.id);
//2.璁剧疆钀ょ煶瀛愯处鍙风殑AccessToken鍒癝DK
EZSDK.IOS.EZSDK.SharedInstance().SetEZAccessToken(ezChildAccessToken);
- ////3.鎵撳紑鎽勫儚澶磋澶囧垪琛ㄩ〉闈�
- EZSDK.IOS.EZSDK.SharedInstance().Go2EZvizMonitor();
+
+ //////3.鎵撳紑鎽勫儚澶磋澶囧垪琛ㄩ〉闈�
+ //EZSDK.IOS.EZSDK.SharedInstance().Go2EZvizMonitor();
//EZSDK.IOS.EZDeviceInfo info = new EZSDK.IOS.EZDeviceInfo();
//info.de
//EZSDK.IOS.EZSDK.Play(info);
+
+ //2023骞�03鏈�29鏃�13:08:35 淇敼
+ Foundation.NSObject[] nSObject = new Foundation.NSObject[list.Count];
+ for (int i = 0; i < list.Count; i++)
+ {
+ string strValue = list[i];
+ nSObject[i] = new Foundation.NSString(strValue);
+ }
+ EZSDK.IOS.EZSDK.SharedInstance().ToEZDeviceListViewWithFilterTypes(nSObject);
+
+
+
#else
//Android
//1.璁剧疆鎵�闇�娌充笢鐨則oken銆佸煙鍚嶅湴鍧�
@@ -720,21 +736,24 @@
{
((BaseActivity)Shared.Application.Activity).SetPermission(result =>
{
- if(result)
- {
- Android.Content.Intent intent = new Android.Content.Intent();
- var bundle = new Android.OS.Bundle();
- //浼犻�抧ame鍙傛暟涓簍inyphp
- bundle.PutString("EzChildAccessToken", ezChildAccessToken);
- bundle.PutString("HdlToken", UserInfo.Current.LoginTokenString);
- bundle.PutString("Url", OnAppConfig.Instance.RequestHttpsHost);
- bundle.PutString("EzvizAppKey", "1aa98a90489b4838b966b57018b4b04b");
- bundle.PutInt("Platform", 1);
- bundle.PutString("HomeId", DB_ResidenceData.Instance.CurrentRegion.id);
- intent.PutExtras(bundle);
- intent.SetComponent(new Android.Content.ComponentName(Shared.Application.Activity, "com.videogo.MainActivity"));
- Shared.Application.Activity.StartActivity(intent);
- }
+ //2023骞�03鏈�29鏃�13:08:35 淇敼
+ Com.Videogo.Hdl.HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, "1aa98a90489b4838b966b57018b4b04b", 1, DB_ResidenceData.Instance.CurrentRegion.id);
+ Com.Videogo.Hdl.HDLEzvizSdk.Instance.JumpToCameraListActivity(Shared.Application.Activity, list);
+ //if (result)
+ //{
+ // Android.Content.Intent intent = new Android.Content.Intent();
+ // var bundle = new Android.OS.Bundle();
+ // //浼犻�抧ame鍙傛暟涓簍inyphp
+ // bundle.PutString("EzChildAccessToken", ezChildAccessToken);
+ // bundle.PutString("HdlToken", UserInfo.Current.LoginTokenString);
+ // bundle.PutString("Url", OnAppConfig.Instance.RequestHttpsHost);
+ // bundle.PutString("EzvizAppKey", "1aa98a90489b4838b966b57018b4b04b");
+ // bundle.PutInt("Platform", 1);
+ // bundle.PutString("HomeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ // intent.PutExtras(bundle);
+ // intent.SetComponent(new Android.Content.ComponentName(Shared.Application.Activity, "com.videogo.MainActivity"));
+ // Shared.Application.Activity.StartActivity(intent);
+ //}
}, "android.permission.RECORD_AUDIO");
}
@@ -769,6 +788,6 @@
{ IsBackground = true }.Start();
}
-#endregion
+ #endregion
}
}
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/DAL/Server/NewAPI.cs b/HDL_ON/DAL/Server/NewAPI.cs
index fbebd0f..a3d1566 100644
--- a/HDL_ON/DAL/Server/NewAPI.cs
+++ b/HDL_ON/DAL/Server/NewAPI.cs
@@ -494,6 +494,11 @@
/// 杩滅▼寮�閿侊紙钀ょ煶瑙嗛闂ㄩ攣锛�
/// </summary>
public const string Api_Post_OpenDoor = "/home-wisdom/platform/yingshi/lock/remote/open/door";
+ /// <summary>
+ /// 闂ㄩ攣鍨嬪彿鍒楄〃锛堣悿鐭宠棰戦棬閿侊級
+ /// </summary>
+ public const string Api_Post_Lock_Models = "/home-wisdom/platform/yingshi/lock/models";
+
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
index c012769..5847867 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -49,14 +49,13 @@
this.InitializationAndroidData((isBools) =>
{
- if (!isBools)
+
+ this.MainThread(() =>
{
- this.MainThread(() =>
+ if (!isBools)
{
this.ShowTip("鍏堣幏鍙栬悿鐭充簯瀛愯处鍙穞oken澶辫触銆�");
-
- });
- }
+ }
#if __IOS__
#else
@@ -81,6 +80,10 @@
}));
#endif
+
+ });
+
+
});
@@ -175,7 +178,7 @@
}
#if __IOS__
#else
- HDLEzvizSdk.Instance.JumpTempPasswordActivity(Application.Activity, deviceId);
+ HDLEzvizSdk.Instance.JumpTempPasswordActivity(Application.Activity, deviceId);
#endif
});
@@ -253,21 +256,15 @@
#endregion
/// <summary>
- /// 钀ょ煶瑙嗛闂ㄩ攣鐨勫浘鏍�
- /// <param name="comerom">鏉ヨ嚜閭ｉ噷</param>
+ /// 鑾峰彇闂ㄩ攣鍨嬪彿鍒楄〃
/// </summary>
- public string GetVideoDoorLockIcon(Comerom comerom)
+ /// <returns>杩斿洖缁撴灉涓嶄細涓簄ull</returns>
+ public List<string> GetVideoDoorLockLockModelsList()
{
- if (comerom == Comerom.collect)
- {
- return "FunctionIcon/DoorLock/VideoDoorLockOpen.png";
- }
- else
- {
- return "FunctionIcon/DoorLock/VideoDoorlockClose.png";
- }
-
+ return VideDoorLockSend.Current.GetVideoDoorLockLockModelsList();
}
+
+
#region --------- 鍔熻兘鏂囦欢淇濆瓨锛屽垹闄� --------
/// <summary>
/// 淇濆瓨鏈湴鏂囦欢
@@ -294,6 +291,23 @@
}
#endregion
/// <summary>
+ /// 钀ょ煶瑙嗛闂ㄩ攣鐨勫浘鏍�
+ /// <param name="comerom">鏉ヨ嚜閭ｉ噷</param>
+ /// </summary>
+ public string GetVideoDoorLockIcon(Comerom comerom)
+ {
+ if (comerom == Comerom.collect)
+ {
+ return "FunctionIcon/DoorLock/VideoDoorLockOpen.png";
+ }
+ else
+ {
+ return "FunctionIcon/DoorLock/VideoDoorlockClose.png";
+ }
+
+ }
+
+ /// <summary>
/// 鑾峰彇Loading瀵硅薄
/// </summary>
/// <returns></returns>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/ObjectClass.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/ObjectClass.cs
index 5aa77bb..f893ff1 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/ObjectClass.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/ObjectClass.cs
@@ -1,4 +1,7 @@
锘縰sing System;
+using System.Collections.Generic;
+using HDL_ON.Entity;
+
namespace HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock
{
public class ObjectClass
@@ -53,6 +56,25 @@
}
/// <summary>
+ /// 鑾峰彇闂ㄩ攣鍒楄〃
+ /// </summary>
+ public class DoorLockList
+ {
+ /// <summary>
+ /// 闂ㄩ攣璁惧鍒楄〃
+ /// </summary>
+ public List<Function> list = new List<Function>();
+ }
+ /// <summary>
+ /// 闂ㄩ攣鍨嬪彿鍒楄〃
+ /// </summary>
+ public class LockModels {
+ /// <summary>
+ /// 鍨嬪彿鍒楄〃
+ /// </summary>
+ public List<string> lockModels = new List<string>();
+ }
+ /// <summary>
/// 鎺ㄩ�佸唴瀹瑰璞�
/// </summary>
public class ExpantContent
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs
index fe1a0f0..021f52d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs
@@ -153,18 +153,39 @@
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>();
}
- var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Function>>(responsePackNew.Data.ToString());
- if (list == null)
+ var doorLockList = Newtonsoft.Json.JsonConvert.DeserializeObject<DoorLockList>(responsePackNew.Data.ToString());
+ if (doorLockList == null)
{
- return new List<Function>();
+ return new DoorLockList().list;
}
- return list;
+ return doorLockList.list;
}
+
+ /// <summary>
+ /// 鑾峰彇闂ㄩ攣鍨嬪彿鍒楄〃(钀ょ煶瑙嗛闂ㄩ攣)
+ /// </summary>
+ /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
+ /// <returns>杩斿洖缁撴灉涓嶄細涓簄ull</returns>
+ public List<string> GetVideoDoorLockLockModelsList(TipType tipType = TipType.flicker)
+ {
+ var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(new object { }, NewAPI.Api_Post_Lock_Models, "鑾峰彇钀ょ煶闂ㄩ攣鍨嬪彿鍒楄〃");
+ if (!this.DataChecking(responsePackNew, tipType))
+ {
+ return new List<string>();
+ }
+ var lockModels = Newtonsoft.Json.JsonConvert.DeserializeObject<LockModels>(responsePackNew.Data.ToString());
+ if (lockModels == null)
+ {
+ return new LockModels().lockModels;
+ }
+ return lockModels.lockModels;
+ }
+
/// <summary>
/// 鍏堣幏鍙栬悿鐭充簯瀛愯处鍙穞oken
/// </summary>
--
Gitblit v1.8.0