From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 88 ++++++++++++++++++++++---------------------
1 files changed, 45 insertions(+), 43 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index e092601..2e07547 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -825,14 +825,14 @@
var AllUserIfon = await ReadUserListIfon(doorlockMac);
var currUserIfon = new MembershipIfon();
currUserIfon.CloudAccountId = Config.Instance.Guid;
- if (string.IsNullOrEmpty(HdlUserCenterResourse.UserInfo.NickName))
+ if (string.IsNullOrEmpty(UserCenter.UserCenterResourse.UserInfo.UserName))
{
///濡傛灉鏄电О涓虹┖锛屾鏃讹紝鐧婚檰璐﹀彿涓洪粯璁ゆ樀绉帮紱
- currUserIfon.UserName = HdlUserCenterResourse.UserInfo.Account;
+ currUserIfon.UserName = UserCenter.UserCenterResourse.UserInfo.Account;
}
else
{
- currUserIfon.UserName = HdlUserCenterResourse.UserInfo.NickName;
+ currUserIfon.UserName = UserCenter.UserCenterResourse.UserInfo.UserName;
}
foreach (var o in AllUserIfon)
{
@@ -860,15 +860,22 @@
userlist.Add(currUserIfon);
}
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 3)
+ if (UserCenter.UserCenterResourse.UserInfo.AuthorityNo != 3)
{
- List<MemberInfoRes> listInfo = null;
+ var pra = new UserCenter.MemberListInfoPra();
+ string result = "";
if (AllUserIfon.Count != 0)
{
//鏈嶅姟杩斿洖鏉ユ病鏈夐棬閿佹垚鍛樹俊鎭紝娌℃湁蹇呰鍐嶅幓璇锋眰鎴愬憳鍒楄〃锛�
//鍘熷洜锛氳妭绾︽椂闂达紝浣撻獙鏁堟灉濂斤紱
- listInfo = HdlMemberLogic.Current.GetMemberListInfo();
+ result = UserCenter.UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
}
+ if (string.IsNullOrEmpty(result))
+ {
+ //闃叉涓虹┖鎶涘紓甯革紱
+ return userlist;
+ }
+ var listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<UserCenter.MemberInfoRes>>(result);
if (listInfo == null)
{
//闃叉涓虹┖鎶涘紓甯革紱
@@ -878,20 +885,19 @@
{
var userIfon = new MembershipIfon();
- //鈽嗐優銉笺偗鈽�
- //var user = listInfo[i];
- //userIfon.CloudAccountId = user.SubAccountDistributedMark;
- //if (string.IsNullOrEmpty(user.UserName))
- //{
- // ///濡傛灉鏄电О涓虹┖锛屾鏃讹紝鐧婚檰璐﹀彿涓洪粯璁ゆ樀绉帮紱
- // userIfon.UserName = user.Account;
+ var user = listInfo[i];
+ userIfon.CloudAccountId = user.SubAccountDistributedMark;
+ if (string.IsNullOrEmpty(user.UserName))
+ {
+ ///濡傛灉鏄电О涓虹┖锛屾鏃讹紝鐧婚檰璐﹀彿涓洪粯璁ゆ樀绉帮紱
+ userIfon.UserName = user.Account;
- //}
- //else
- //{
- // userIfon.UserName = user.UserName;
+ }
+ else
+ {
+ userIfon.UserName = user.UserName;
- //}
+ }
for (int j = 0; j < AllUserIfon.Count; j++)
{
if (AllUserIfon[j].IsFreezeUser || string.IsNullOrEmpty(AllUserIfon[j].UserId))
@@ -903,27 +909,25 @@
{
userIfon.DoorLockMacPort = AllUserIfon[j].DoorLockMacPort;
}
- //鈽嗐優銉笺偗鈽�
///鏌ユ壘鎴愬憳浠ュ強鎴愬憳闂ㄩ攣瑙﹀彂婧�(1鎸夐敭/3鍗�/15鎸囩汗)
- //if (user.SubAccountDistributedMark == AllUserIfon[j].CloudAccountId)
- //{
- // UnlockingMode unlockingMode = new UnlockingMode();
- // unlockingMode.OpenMode = AllUserIfon[j].OpenMode;
- // unlockingMode.UserId = AllUserIfon[j].UserId;
- // unlockingMode.ModeName = AllUserIfon[j].ModeName;
- // userIfon.UserIdMode.Add(unlockingMode);
- //}
+ if (user.SubAccountDistributedMark == AllUserIfon[j].CloudAccountId)
+ {
+ UnlockingMode unlockingMode = new UnlockingMode();
+ unlockingMode.OpenMode = AllUserIfon[j].OpenMode;
+ unlockingMode.UserId = AllUserIfon[j].UserId;
+ unlockingMode.ModeName = AllUserIfon[j].ModeName;
+ userIfon.UserIdMode.Add(unlockingMode);
+ }
}
if (userIfon.UserIdMode.Count != 0)
{
- //鈽嗐優銉笺偗鈽�
///杩囨护鎺夐噸澶嶆暟鎹紱
- //var str = userlist.Find((c) => { return c.CloudAccountId == user.SubAccountDistributedMark; });
- //if (str == null)
- //{
- // userlist.Add(userIfon);
- //}
+ var str = userlist.Find((c) => { return c.CloudAccountId == user.SubAccountDistributedMark; });
+ if (str == null)
+ {
+ userlist.Add(userIfon);
+ }
}
}
@@ -965,7 +969,7 @@
public static async System.Threading.Tasks.Task<string> ReadUserList(string doorlockMac)
{
string s = null;
- var str = await WebClientAsync(0, HdlHttpLogic.Current.RequestHttpsHost + "/App/GetHomePager");//涓嶅悓鍖哄煙鍩熷悕鍓嶇紑涓嶄竴鏍�
+ var str = await WebClientAsync(0, CommonPage.RequestHttpsHost + "/App/GetHomePager");//涓嶅悓鍖哄煙鍩熷悕鍓嶇紑涓嶄竴鏍�
var jObject = JObject.Parse(str);
if (jObject == null || jObject["StateCode"].ToString() != "Success")
@@ -990,12 +994,12 @@
residential.MainUserDistributedMark = data["MainUserDistributedMark"].ToString();
residential.IsOtherAccountCtrl = true;
residential.doorlockmac = doorlockMac;
- residential.Url = HdlHttpLogic.Current.RequestHttpsHost + "/App/GetSharedHomeApiControl";
+ residential.Url = CommonPage.RequestHttpsHost + "/App/GetSharedHomeApiControl";
s = await ReadUserDoorLock(residential);
}
else
{
- residential.Url = HdlHttpLogic.Current.RequestHttpsHost + "/DoorLock/GetDoorLockPager";
+ residential.Url = CommonPage.RequestHttpsHost + "/DoorLock/GetDoorLockPager";
residential.Token = Config.Instance.Token;
residential.Id = Config.Instance.HomeId;
residential.IsOtherAccountCtrl = false;
@@ -1134,7 +1138,7 @@
/// <summary>
/// 褰撳墠鐢ㄦ埛鐨勪俊鎭�
/// </summary>
- public static MemberInfoRes UserMemberInfoRes = null;
+ public static UserCenter.MemberInfoRes UserMemberInfoRes = null;
#endregion
/// <summary>
@@ -1185,19 +1189,17 @@
{
var getUrl = "";
var jObject = new JObject();
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1)
+ if (UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 1)
{
- //鈽嗐優銉笺偗鈽�
- //getUrl = HdlHttpLogic.Current.RequestHttpsHost + url;//璇锋眰鍦板潃锛�
+ getUrl = CommonPage.RequestHttpsHost + url;//璇锋眰鍦板潃锛�
jObject.Add("IsOtherAccountCtrl", false);
jObject.Add("LoginAccessToken", Config.Instance.Token);
}
else
{
- //鈽嗐優銉笺偗鈽�
- //getUrl = Config.Instance.AdminRequestBaseUrl + url;//璇锋眰鍦板潃锛�
+ getUrl = Config.Instance.AdminRequestBaseUrl + url;//璇锋眰鍦板潃锛�
jObject.Add("IsOtherAccountCtrl", true);
- //jObject.Add("LoginAccessToken", Config.Instance.AdminRequestToken);
+ jObject.Add("LoginAccessToken", Config.Instance.AdminRequestToken);
}
switch (command)
{
--
Gitblit v1.8.0