2019.10.29

gxc

2019-10-29 7fa61a2e8415f8dd862aad5541d323c9c51c45c5

 ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs

@@ -15,22 +15,22 @@
        /// bodyFrameLayout
        /// </summary>
        private FrameLayout bodyFrameLayout;
        /// <summary>
        /// floorIds
        /// </summary>
        List<string> floorIds = new List<string> { };
        /// <summary>
        /// floorNames
        /// </summary>
        List<string> floorNames = new List<string> { };
        /// <summary>
        /// roomNames
        /// </summary>
        List<List<string>> roomNames = new List<List<string>> { };
        /// <summary>
        /// roomNames
        /// </summary>
        List<List<Common.Room>> rooms = new List<List<Common.Room>> { };
        ///// <summary>
        ///// floorIds
        ///// </summary>
        //List<string> floorIds = new List<string> { };
        ///// <summary>
        ///// floorNames
        ///// </summary>
        //List<string> floorNames = new List<string> { };
        ///// <summary>
        ///// roomNames
        ///// </summary>
        //List<List<string>> roomNames = new List<List<string>> { };
        ///// <summary>
        ///// roomNames
        ///// </summary>
        //List<List<Common.Room>> rooms = new List<List<Common.Room>> { };
        /// <summary>
        /// ImagePath
        /// </summary>
@@ -273,16 +273,16 @@
        /// </summary>
        private void Init()
        {
            foreach (var floor in Config.Instance.Home.FloorDics)
            {
                floorIds.Add(floor.Key);
                floorNames.Add(floor.Value);
                if(Common.Room.CurrentRoom.GetRoomsByFloorId(floor.Key).Count>0)
                {
                    roomNames.Add(Common.Room.CurrentRoom.GetRoomNamesByFloorId(floor.Key));
                    rooms.Add(Common.Room.CurrentRoom.GetRoomsByFloorId(floor.Key));
                }
            }
            //foreach (var floor in Config.Instance.Home.FloorDics)
            //{
            //    floorIds.Add(floor.Key);
            //    floorNames.Add(floor.Value);
            //    if(Common.Room.CurrentRoom.GetRoomsByFloorId(floor.Key).Count>0)
            //    {
            //        roomNames.Add(Common.Room.CurrentRoom.GetRoomNamesByFloorId(floor.Key));
            //        rooms.Add(Common.Room.CurrentRoom.GetRoomsByFloorId(floor.Key));
            //    }
            //}
        }

        /// <summary>
@@ -370,7 +370,7 @@
            zoneRow.SetTipTitle($"{Language.StringByID(R.MyInternationalizationString.BelongZone)}:");
            //zoneRow.SetTitle(curRoom.Name);
            infoFL.AddChidren(zoneRow);
            zoneRow.HideLine(false);
            zoneRow.HideLine(true);

            var targetFL = new FrameLayout()
            {
@@ -479,16 +479,54 @@
            //区域
            EventHandler<MouseEventArgs> zoneHander = (sender, e) =>
            {
                PickerView.ShowSecondary(floorNames, roomNames, (index1, index2) =>
                List<string> floorIds = new List<string> { };
                List<string> floorNames = new List<string> { };
                List<List<string>> roomNames = new List<List<string>> { };
                List<List<Common.Room>> rooms = new List<List<Common.Room>> { };
                List<Common.Room> rs = new List<Common.Room> { };
                List<string> rNames = new List<string> { };
                if (Config.Instance.Home.FloorDics.Count > 0)
                {
                    curRoom = rooms[index1][index2];
                    zoneRow.NameText.Text = $"{Config.Instance.Home.GetFloorNameById(floorIds[index1])} , {rooms[index1][index2].Name}";
                }, 0, 0, Language.StringByID(R.MyInternationalizationString.BelongFloor), Language.StringByID(R.MyInternationalizationString.Confrim), Language.StringByID(R.MyInternationalizationString.Cancel));
                    foreach (var floor in Config.Instance.Home.FloorDics)
                    {
                        floorIds.Add(floor.Key);
                        floorNames.Add(floor.Value);
                        if (Common.Room.CurrentRoom.GetRoomsByFloorId(floor.Key).Count > 0)
                        {
                            roomNames.Add(Common.Room.CurrentRoom.GetRoomNamesByFloorId(floor.Key));
                            rooms.Add(Common.Room.CurrentRoom.GetRoomsByFloorId(floor.Key));
                        }
                    }
                    PickerView.ShowSecondary(floorNames, roomNames, (index1, index2) =>
                    {
                        curRoom = rooms[index1][index2];
                        zoneRow.SetTitle($"{Config.Instance.Home.GetFloorNameById(floorIds[index1])} , {rooms[index1][index2].Name}");
                    }, 0, 0, Language.StringByID(R.MyInternationalizationString.BelongFloor),
                   Language.StringByID(R.MyInternationalizationString.Confrim),
                   Language.StringByID(R.MyInternationalizationString.Cancel));
                }
                else
                {
                    for (int i = 0; i < Common.Room.Lists.Count; i++)
                    {
                        var r = Common.Room.Lists[i];
                        if (r.IsLove)
                        {
                            continue;
                        }
                        rs.Add(r);
                        rNames.Add(r.Name);
                    }
                    PickerView.Show(rNames, (index1) =>
                    {
                        curRoom = rs[index1];
                        zoneRow.SetTitle(rs[index1].Name);
                    }, 0, Language.StringByID(R.MyInternationalizationString.BelongFloor),
                   Language.StringByID(R.MyInternationalizationString.Confrim),
                   Language.StringByID(R.MyInternationalizationString.Cancel));
                }
            };
            zoneRow.NextBtn.MouseUpEventHandler += zoneHander;
            zoneRow.TipBtn.MouseUpEventHandler += zoneHander;
            zoneRow.NameText.MouseUpEventHandler += zoneHander;
            zoneRow.MouseUpEventHandler += zoneHander;
            zoneRow.ClickBtn.MouseUpEventHandler += zoneHander;

            //执行目标-添加执行设备
            EventHandler<MouseEventArgs> targetAddHander = (sender, e) =>