From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs | 69 +++++++++++++++++-----------------
1 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs
index d893657..9572805 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs
@@ -6,7 +6,6 @@
using Newtonsoft.Json.Linq;
using Shared;
using Shared.Common;
-using Shared.Common.ResponseEntity;
using Shared.Phone.UserCenter;
namespace ZigBee.Device
@@ -34,7 +33,7 @@
public string currentUserDisplayMethod = string.Empty;//褰撳墠鐢ㄦ埛鏄剧ず鏂瑰紡
//鏈湴鎵�鏈夎处鎴峰垪琛�
- public List<Shared.Phone.UserCenter.MemberInfoRes> localAllAccountList = new List<Shared.Phone.UserCenter.MemberInfoRes> { };
+ public List<Shared.Phone.MemberInfoRes> localAllAccountList = new List<Shared.Phone.MemberInfoRes> { };
/// <summary>
/// 鏄惁甯稿紑妯″紡
@@ -476,15 +475,16 @@
return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<GetDoorLockTempPasswordDataRes>>)(async () =>
{
GetDoorLockTempPasswordDataRes listInfo = null;
- var revertObj = await SendDoorLockToServer(RequestName, getDoorLockTempPasswordData);
- if (revertObj != null && revertObj.ResponseData != null)
- {
- var result = revertObj.ResponseData.ToString();
- if (result != null)
- {
- listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<GetDoorLockTempPasswordDataRes>(result);
- }
- }
+ //鈽嗐優銉笺偗鈽�
+ //var revertObj = await SendDoorLockToServer(RequestName, getDoorLockTempPasswordData);
+ //if (revertObj != null && revertObj.ResponseData != null)
+ //{
+ // var result = revertObj.ResponseData.ToString();
+ // if (result != null)
+ // {
+ // listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<GetDoorLockTempPasswordDataRes>(result);
+ // }
+ //}
return listInfo;
}));
}
@@ -597,15 +597,16 @@
return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<GetDoorLockDataRes>>)(async () =>
{
GetDoorLockDataRes listInfo = null;
- var revertObj = await SendDoorLockToServer(RequestName, getDoorLockData);
- if (revertObj != null && revertObj.ResponseData != null)
- {
- var result = revertObj.ResponseData.ToString();
- if (result != null)
- {
- listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<GetDoorLockDataRes>(result);
- }
- }
+ //鈽嗐優銉笺偗鈽�
+ //var revertObj = await SendDoorLockToServer(RequestName, getDoorLockData);
+ //if (revertObj != null && revertObj.ResponseData != null)
+ //{
+ // var result = revertObj.ResponseData.ToString();
+ // if (result != null)
+ // {
+ // listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<GetDoorLockDataRes>(result);
+ // }
+ //}
return listInfo;
}));
}
@@ -617,7 +618,7 @@
/// <returns>鑾峰彇浠庢帴鍙ｉ偅閲屽彇鍒扮殑ResponsePack</returns>
/// <param name="RequestName">璁块棶鍦板潃</param>
/// <param name="obj">涓�涓被</param>
- public static async Task<ResponsePack> SendDoorLockToServer(string RequestName, object obj)
+ public static async Task<Shared.Phone.ResponsePack> SendDoorLockToServer(string RequestName, object obj)
{
try
{
@@ -625,21 +626,21 @@
var requestJson = JsonConvert.SerializeObject(obj);
var byteData = System.Text.Encoding.UTF8.GetBytes(requestJson);
byte[] result1 = null;
- //璁块棶鎺ュ彛
- if (UserCenterResourse.UserInfo.AuthorityNo == 1)
+ //璁块棶鎺ュ彛 //鈽嗐優銉笺偗鈽�
+ if (Shared.Phone.HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1)
{
- result1 = await CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync(RequestName, byteData);
+ //result1 = CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync(RequestName, byteData);
}
else
{
- result1 = await CommonPage.Instance.RequestZigbeeHttpsByAdmin(RequestName, byteData);
+ //result1 = CommonPage.Instance.RequestZigbeeHttpsByAdmin(RequestName, byteData);
}
if (result1 != null)
{
var result2 = Encoding.UTF8.GetString(result1);
if (result2 != null)
{
- var result = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.ResponsePack>(result2);
+ var result = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Phone.ResponsePack>(result2);
return result;
}
}
@@ -655,15 +656,13 @@
/// <summary>
/// 鑾峰彇瀛愯处鎴蜂俊鎭�
/// </summary>
- static List<Shared.Phone.UserCenter.MemberInfoRes> DoorLockAccountList = new List<Shared.Phone.UserCenter.MemberInfoRes> { };
- public static async System.Threading.Tasks.Task<List<Shared.Phone.UserCenter.MemberInfoRes>> GetSubAccountByDistributedMark()
+ static List<Shared.Phone.MemberInfoRes> DoorLockAccountList = new List<Shared.Phone.MemberInfoRes> { };
+ public static async System.Threading.Tasks.Task<List<Shared.Phone.MemberInfoRes>> GetSubAccountByDistributedMark()
{
DoorLockAccountList.Clear();
- return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<List<Shared.Phone.UserCenter.MemberInfoRes>>>)(async () =>
+ return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<List<Shared.Phone.MemberInfoRes>>>)(async () =>
{
- var pra = new Shared.Phone.UserCenter.MemberListInfoPra();
- string result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
- var listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Shared.Phone.UserCenter.MemberInfoRes>>(result);
+ var listInfo = Shared.Phone.HdlMemberLogic.Current.GetMemberListInfo();
return listInfo;
}));
}
@@ -930,9 +929,9 @@
/// Unlock鍛戒护锛歟rror,invalid schedule浜嬩欢
/// </summary>
UnlockInvalidScheduleEvent = 6,
- }
+ }
#endregion
-
+
#region 闂ㄩ攣缂栫▼浜嬩欢閫氱煡
/// <summary>
/// 闂ㄩ攣缂栫▼浜嬩欢閫氱煡
@@ -1114,7 +1113,7 @@
result = new DefaultControlResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
- {
+ {
if (clientDataPassthroughResponseData?.PassData != null)
{
var data = clientDataPassthroughResponseData.PassData;
--
Gitblit v1.8.0