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 | 30 +++++++++++++++++++++++++++--- 1 files changed, 27 insertions(+), 3 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs index f6f67b8..21c171d 100644 --- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs @@ -711,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 ----鑾峰彇闂ㄩ攣 @@ -857,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") { @@ -1071,5 +1094,6 @@ /// </summary> public static UserCenter.MemberInfoRes UserMemberInfoRes = null; #endregion + } } -- Gitblit v1.8.0