合并代码 ver.10086

黄学彪

2020-01-17 4b378188ce972df432b23d9cb73babb6cc0679c6

 ZigbeeApp/Shared/Phone/Device/Logic/Send.cs

@@ -479,6 +479,7 @@
                                        {
                                            ["Type"] = int.Parse(dictionary["Type"]),
                                            ["Account"] = dictionary["Account"],
                                            ["AccountName"] = dictionary["AccountName"],
                                            ["UserId"] = dictionary["UserId"],

                                        };
@@ -723,7 +724,11 @@
            var room = new Common.Room();
            btnregionname.Text = room.GetRoomNameByDevice(device);
        }

        /// <summary>
        /// 找出楼层所有房间
        /// </summary>
        /// <param name="floorId">楼层ID</param>
        /// <returns></returns>
        public static List<Common.Room> GetRoomList(string floorId)
        {
            return Common.Room.Lists.FindAll((obj) => obj.FloorId == floorId);
@@ -750,8 +755,6 @@
            /////返回房间列表；
            //return list1;
        }


        /// <summary>
        /// 获取场景信息的方法
        /// </summary>
@@ -1013,16 +1016,7 @@
            lockifon.doorlockmac = residential.doorlockmac;
            return await WebClientAsync(2, lockifon.Url, lockifon);
        }

        //打印NameValueCollection()显示索引, 键,值    
        public static void PrintKeysAndValues2(NameValueCollection myCol)
        {
            for (int i = 0; i < myCol.Count; i++)
            {
                //打印显示索引, 键,值  
                Console.WriteLine("[{0}]{1,-10} {2}", i, myCol.GetKey(i), myCol.Get(i));
            }
        }
        #region 定义解析门锁的对象
        public class Residential
        {
            /// <summary>
@@ -1116,7 +1110,6 @@
            public bool IsFreezeUser;

        }

        /// <summary>
        /// 门锁列表
        /// </summary>
@@ -1130,6 +1123,8 @@
        /// </summary>
        public static UserCenter.MemberInfoRes UserMemberInfoRes = null;
        #endregion
        #endregion

        /// <summary>
        ///  自己用
        /// </summary>
@@ -1199,6 +1194,15 @@
                        jObject.Add("LogicID", Common.Logic.CurrentLogic.LogicId);
                    }
                    break;
                case "读取云端门锁数据":
                    {
                        jObject.Add("RequestVersion", CommonPage.RequestVersion);
                        jObject.Add("HomeId", Config.Instance.HomeId);
                        jObject.Add("DoorLockId", obj.ToString());//门锁Mac+端口
                        jObject.Add("PageSetting.PageSize", Int32.MaxValue.ToString());
                    }
                    break;

            }
            return await HttpWebRequest(getUrl, jObject.ToString(), method);
        }