合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

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

@@ -104,7 +104,7 @@

            AddBodyView();

            RefreshBodyView();
            RefreshBodyView(Config.Instance.Home.CurrentFloorId);
        }


@@ -162,10 +162,10 @@
            var floors = new SelectFloor();
            AddChidren(floors);
            floors.Init(580, 184, Direction.Right);
            floors.FloorAction += (floorName) =>
            floors.FloorAction += (floorId) =>
            {
                floorBtn.Text = floorName;
                RefreshBodyView();
                floorBtn.Text = Config.Instance.Home.GetFloorNameById(floorId);
                RefreshBodyView(floorId);
            };
        }
        /// <summary>
@@ -187,15 +187,15 @@
        /// <summary>
        /// RefreshBodyView
        /// </summary>
        private void RefreshBodyView()
        private void RefreshBodyView(string floorId)
        {
            AddRoomView();
            AddRoomView(floorId);
        }

        /// <summary>
        /// AddRoomView
        /// </summary>
        private void AddRoomView()
        private void AddRoomView(string floorId)
        {
            var roomFL = new HorizontalScrolViewLayout()
            {
@@ -216,7 +216,7 @@
            bodyFrameLayout.AddChidren(functionSceneBodyView);

            Button curBtn = new Button();
            foreach (var room in Common.Room.CurrentRoom.GetRoomsByCurrentFloorIdAppendLoveRoom())
            foreach (var room in Common.Room.CurrentRoom.GetRoomsByFloorIdAppendLoveRoom(floorId))
            {
                var row = new FrameLayout()
                {
@@ -463,6 +463,7 @@
                Height = Application.GetRealHeight(530),
            };
            dialog.AddChidren(selectFL);
            selectFL.Animate = Animate.DownToUp;

            var titleBG = new FrameLayout
            {
@@ -619,6 +620,7 @@
                Height = Application.GetRealHeight(752),
            };
            dialog.AddChidren(selectFL);
            selectFL.Animate = Animate.DownToUp;

            var titleBG = new FrameLayout
            {
@@ -784,6 +786,7 @@
                Height = Application.GetRealHeight(752),
            };
            dialog.AddChidren(selectFL);
            selectFL.Animate = Animate.DownToUp;

            var titleBG = new FrameLayout
            {
@@ -949,6 +952,7 @@
                Height = Application.GetRealHeight(1106),
            };
            dialog.AddChidren(selectFL);
            selectFL.Animate = Animate.DownToUp;

            var titleBG = new FrameLayout
            {
@@ -1074,13 +1078,15 @@
                        }
                        if (tasklist.Data1 == 4 || tasklist.Data1 == 5)
                        {
                            tempId = open.temperatureList.IndexOf(tasklist.Data2);
                            tempId = open.temperatureList.IndexOf(tasklist.Data2/100);
                        }
                    }

                    open.pickerView.setCurrentItems(tempId, modelId, fanid);
                }
            }



            comfrimBtn.MouseUpEventHandler = (sender, e) =>
            {
@@ -1132,7 +1138,7 @@
                        {
                            TaskType = taskType,
                            Data1 = 4,
                            Data2 = open.temperatureList[tempId]
                            Data2 = open.temperatureList[tempId]*100
                        };
                        taskList.Add(taskInfo3);

@@ -1144,7 +1150,7 @@
                        {
                            TaskType = taskType,
                            Data1 = 5,
                            Data2 = open.temperatureList[tempId]
                            Data2 = open.temperatureList[tempId]*100
                        };
                        taskList.Add(taskInfo3);
                    }