From 2294816f28804660a441038b5cc89921703f4f41 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 26 十一月 2019 17:57:28 +0800
Subject: [PATCH] 2019.11.26

---
 ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs b/ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs
index bb2ee90..772c787 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs
+++ b/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()
                 {
@@ -445,7 +445,7 @@
             }
             else if (device.CommonDevice.Type == ZigBee.Device.DeviceType.Thermostat)
             {
-                SelectWindowCoveringDevice(dialog, device, sceneTarget);
+                SelectThermostat(dialog, device, sceneTarget);
             }
         }
 
@@ -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
             {
@@ -1082,6 +1086,8 @@
                 }
             }
 
+
+
             comfrimBtn.MouseUpEventHandler = (sender, e) =>
             {
 
@@ -1120,7 +1126,7 @@
                     {
                         TaskType = taskType,
                         Data1 = 3,
-                        Data2 = open.modeList[fanid]
+                        Data2 = open.modeList[modelId]
                     };
                     taskList.Add(taskInfo2);
 

--
Gitblit v1.8.0