From 9c6bd67d66859e48f0e794cd2746aef9310ce71d Mon Sep 17 00:00:00 2001 From: WJC <wjc@hdlchina.com.cn> Date: 星期五, 13 十二月 2019 18:01:37 +0800 Subject: [PATCH] 2019-12-13-2 --- ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 50 insertions(+), 6 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs index 79b47b9..21c171d 100644 --- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs @@ -467,6 +467,7 @@ { ["Type"] = int.Parse(dictionary["Type"]), ["Account"] = dictionary["Account"], + ["UserId"] = dictionary["UserId"], }; accounts.Add(accounts1); @@ -710,8 +711,31 @@ public static List<Common.Room> GetRoomList(string floorId) { return Common.Room.Lists.FindAll((obj) => obj.FloorId == floorId); - + //var list1 = new List<Common.Room>(); + /////鎵惧埌鏌愭ゼ灞傛埧闂村垪琛紱 + //var list = Common.Room.Lists.FindAll((obj) => obj.FloorId == floorId); + //for (int i = 0; i < list.Count; i++) + //{ + // if (str == "device") + // { + // if (list[i].DeviceUIList.Count != 0) + // { ///杩囨护鎺夋病鏈夎澶囩殑鎴块棿 + // list1.Add(list[i]); + // } + // } + // else + // { + // if (list[i].SceneUIList.Count != 0) + // { ///杩囨护鎺夋病鏈夊満鏅殑鎴块棿 + // list1.Add(list[i]); + // } + // } + //} + /////杩斿洖鎴块棿鍒楄〃锛� + //return list1; } + + #endregion #region ----鑾峰彇闂ㄩ攣 @@ -730,6 +754,7 @@ currUserIfon.CloudAccountId = Config.Instance.Guid; if (string.IsNullOrEmpty(UserCenter.UserCenterResourse.UserInfo.UserName)) { + ///濡傛灉鏄电О涓虹┖锛屾鏃讹紝鐧婚檰璐﹀彿涓洪粯璁ゆ樀绉帮紱 currUserIfon.UserName = UserCenter.UserCenterResourse.UserInfo.Account; } else @@ -738,12 +763,18 @@ } foreach (var o in AllUserIfon) { + if (o.IsFreezeUser || string.IsNullOrEmpty(o.UserId)) + { + ///杩囨护鎺夊喕缁撶殑鎴愬憳鍜孶serId涓虹┖鐨勬暟鎹紱 + continue; + } if (string.IsNullOrEmpty(currUserIfon.DoorLockMacPort)) { currUserIfon.DoorLockMacPort = o.DoorLockMacPort; } if (o.CloudAccountId == Config.Instance.Guid) { + UnlockingMode unlockingMode = new UnlockingMode(); unlockingMode.OpenMode = o.OpenMode; unlockingMode.UserId = o.UserId; @@ -769,6 +800,7 @@ userIfon.CloudAccountId = user.SubAccountDistributedMark; if (string.IsNullOrEmpty(user.UserName)) { + ///濡傛灉鏄电О涓虹┖锛屾鏃讹紝鐧婚檰璐﹀彿涓洪粯璁ゆ樀绉帮紱 userIfon.UserName = user.Account; } @@ -779,6 +811,11 @@ } for (int j = 0; j < AllUserIfon.Count; j++) { + if (AllUserIfon[j].IsFreezeUser || string.IsNullOrEmpty(AllUserIfon[j].UserId)) + { + ///杩囨护鎺夊喕缁撶殑鎴愬憳鍜孶serId涓虹┖鐨勬暟鎹紱 + continue; + } if (string.IsNullOrEmpty(userIfon.DoorLockMacPort)) { userIfon.DoorLockMacPort = AllUserIfon[j].DoorLockMacPort; @@ -834,6 +871,7 @@ user.CloudAccountId = data["CloudAccountId"].ToString(); user.DoorLockMacPort = data["DoorLockId"].ToString(); user.ModeName = data["UserIdRemarks"].ToString(); + user.IsFreezeUser = Convert.ToBoolean(data["IsFreezeUser"].ToString()); list.Add(user); } return list; @@ -842,8 +880,8 @@ public static async System.Threading.Tasks.Task<string> ReadUserList(string doorlockMac) { string s = null; - var str = await WebClientAsync(0, CommonPage.RequestHttpsHost+"/App/GetHomePager");//涓嶅悓鍖哄煙鍩熷悕鍓嶇紑涓嶄竴鏍� - // var str = await WebClientAsync(0, "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager"); + var str = await WebClientAsync(0, CommonPage.RequestHttpsHost + "/App/GetHomePager");//涓嶅悓鍖哄煙鍩熷悕鍓嶇紑涓嶄竴鏍� + // var str = await WebClientAsync(0, "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager"); var jObject = JObject.Parse(str); if (jObject == null || jObject["StateCode"].ToString() != "Success") { @@ -990,7 +1028,10 @@ /// 鐢ㄦ埛鏄电О /// </summary> public string UserName = string.Empty; - + /// <summary> + /// 鏄惁鍐荤粨璇ユ垚鍛橈紙true宸插喕缁擄級 + /// </summary> + public bool IsFreezeUser; } @@ -1033,15 +1074,17 @@ /// 闂ㄩ攣Mac+Port,璇嗗埆闂ㄩ攣锛� /// </summary> public string DoorLockMacPort = string.Empty; + /// <summary> + /// 鏄惁鍐荤粨璇ユ垚鍛橈紙true宸插喕缁擄級 + /// </summary> + public bool IsFreezeUser; } - /// <summary> /// 闂ㄩ攣鍒楄〃 /// </summary> public static List<MembershipIfon> LockList = new List<MembershipIfon>(); - /// <summary> /// 褰撳墠闂ㄩ攣 /// </summary> @@ -1051,5 +1094,6 @@ /// </summary> public static UserCenter.MemberInfoRes UserMemberInfoRes = null; #endregion + } } -- Gitblit v1.8.0