From 944b87b6bcccb095cd73f13f4410fb20faf48f74 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 25 十二月 2019 11:21:06 +0800
Subject: [PATCH] 2019.12.25

---
 ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 2053 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 1,031 insertions(+), 1,022 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
index fa4e930..05ddd7c 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -7,6 +7,7 @@
 using Shared.Phone.Device.CommonForm;
 using Shared.Phone.Device.AC;
 using Shared.Phone.UserCenter.DoorLock;
+using Shared.Phone.Device.DeviceLogic;
 
 namespace Shared.Phone.Device.Category
 {
@@ -84,7 +85,7 @@
         /// <summary>
         /// 鍔熻兘绫诲瀷鎸夐挳
         /// </summary>
-        private FunctionButton functionTypeIMG;
+        //private FunctionButton functionTypeIMG;
         /// <summary>
         /// 鍔熻兘绫诲瀷
         /// </summary>
@@ -92,7 +93,7 @@
         /// <summary>
         /// 璁惧绫诲瀷RowLayout
         /// </summary>
-        private FrameLayout typeRowLayout;
+        //private FrameLayout typeRowLayout;
         /// <summary>
         /// 妤煎眰
         /// </summary>
@@ -102,6 +103,26 @@
         /// </summary>
         private Button selectFloorBtn;
 
+        /// <summary>
+        /// 鐩稿悓绫诲瀷鐨勮澶囧垪琛�
+        /// </summary>
+        private Dictionary<int, List<DeviceUI>> typeDeviceDic;
+        /// <summary>
+        /// 璁惧绫诲瀷鐨勫浘id
+        /// </summary>
+        private Dictionary<int, DeviceConcreteType> typeIdDic;
+        /// <summary>
+        /// dList
+        /// </summary>
+        private List<DeviceUI> devList;
+        /// <summary>
+        /// sceneList
+        /// </summary>
+        private List<SceneUI> sceneList;
+        /// <summary>
+        /// 褰撳墠閫変腑鎴块棿
+        /// </summary>
+        private Common.Room curRoom;
         #endregion
 
         #region 鈼� 鎺ュ彛____________________________
@@ -148,6 +169,10 @@
                 {
                     try
                     {
+                        if (common.DeviceStatusReport.AttriBute == null || common.DeviceStatusReport.AttriBute.Count == 0)
+                        {
+                            return;
+                        }
                         for (int i = 0; deviceListScrolView != null && i < deviceListScrolView.ChildrenCount; i++)
                         {
                             var rowLayout = deviceListScrolView.GetChildren(i) as RowLayout;
@@ -168,13 +193,9 @@
                                     {
                                         var light = deviceUI.CommonDevice as ToggleLight;
                                         light.DeviceStatusReport = common.DeviceStatusReport;
-                                        if (light.DeviceStatusReport.AttriBute == null || light.DeviceStatusReport.AttriBute.Count == 0)
-                                        {
-                                            continue;
-                                        }
                                         light.OnOffStatus = light.DeviceStatusReport.AttriBute[0].AttriButeData;
                                         var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
-                                        row.SetStatu(light.OnOffStatus == 1);
+                                        row.IsSelected = light.OnOffStatus == 1;
                                         row.SetStatuText(deviceUI.GetDeviceStatu());
                                         light.LastDateTime = DateTime.Now;
                                     }
@@ -182,8 +203,6 @@
                                     {
                                         deviceUI.CommonDevice.IsOnline = 1;
                                         deviceUI.CommonDevice.LastDateTime = DateTime.Now;
-                                        var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
-                                        row.SetStatu(true);
                                     }
                                     break;
 
@@ -193,13 +212,9 @@
                                     {
                                         var airSwitch = deviceUI.CommonDevice as ZigBee.Device.AirSwitch;
                                         airSwitch.DeviceStatusReport = common.DeviceStatusReport;
-                                        if (airSwitch.DeviceStatusReport.AttriBute == null || airSwitch.DeviceStatusReport.AttriBute.Count == 0)
-                                        {
-                                            return;
-                                        }
                                         airSwitch.OnOffStatus = airSwitch.DeviceStatusReport.AttriBute[0].AttriButeData;
                                         var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
-                                        row.SetStatu(airSwitch.OnOffStatus == 1);
+                                        row.IsSelected = airSwitch.OnOffStatus == 1;
                                         row.SetStatuText(deviceUI.GetDeviceStatu());
                                         airSwitch.LastDateTime = DateTime.Now;
                                     }
@@ -207,8 +222,6 @@
                                     {
                                         deviceUI.CommonDevice.IsOnline = 1;
                                         deviceUI.CommonDevice.LastDateTime = DateTime.Now;
-                                        var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
-                                        row.SetStatu(true);
                                     }
                                     break;
                                 case DeviceType.WindowCoveringDevice:
@@ -231,6 +244,7 @@
                                             rollerShade.DeviceStatusReport = common.DeviceStatusReport;
                                             rollerShade.WcdCurrentPositionLiftPercentage = common.DeviceStatusReport.AttriBute[0].AttriButeData;
                                             row.SetStatuText($"{Language.StringByID(R.MyInternationalizationString.Current)} { deviceUI.GetDeviceStatu()}");
+                                            row.IsSelected = rollerShade.WcdCurrentPositionLiftPercentage != 0;
                                             rollerShade.LastDateTime = DateTime.Now;
                                         }
                                     }
@@ -238,8 +252,6 @@
                                     {
                                         deviceUI.CommonDevice.IsOnline = 1;
                                         deviceUI.CommonDevice.LastDateTime = DateTime.Now;
-                                        var row = rowLayout.GetChildren(0) as CategoryFunctionForWinRow;
-                                        row.SetStatu(true);
                                     }
                                     break;
 
@@ -248,45 +260,49 @@
                                     if (common.DeviceStatusReport.CluterID == 513)
                                     {
                                         var attriButeList = common.DeviceStatusReport.AttriBute;
-                                        if (attriButeList == null || attriButeList.Count == 0)
-                                        {
-                                            return;
-                                        }
                                         var ac = deviceUI.CommonDevice as ZigBee.Device.AC;
                                         ac.DeviceStatusReport = common.DeviceStatusReport;
-
-                                        var curTemp = (attriButeList[0].AttriButeData / 100 < ACControlBase.Temperature_High || attriButeList[0].AttriButeData / 100 > ACControlBase.Temperature_Low) ? attriButeList[0].AttriButeData / 100 : ACControlBase.Temperature_Default;
-                                        switch (attriButeList[0].AttributeId)
+                                        foreach(var attList in attriButeList)
                                         {
-                                            case 0:
-                                                ac.currentLocalTemperature = curTemp;
-                                                ac.LastDateTime = DateTime.Now;
-                                                break;
-
-                                            case 17:
-                                                ac.currentCoolingSetpoint = curTemp;
-                                                ac.LastDateTime = DateTime.Now;
-                                                break;
-
-                                            case 18:
-                                                ac.currentHeatingSetpoint = curTemp;
-                                                ac.LastDateTime = DateTime.Now;
-                                                break;
-
-                                            case 4096:
-                                                ac.currentAutoSetpoint = curTemp;
-                                                ac.LastDateTime = DateTime.Now;
-                                                break;
-
-                                            case 28:
-                                                //姝ゅ睘鎬ф弿杩版亽娓╄澶囨澶勪簬鍝妯″紡
-                                                ac.currentSystemMode = attriButeList[0].AttriButeData;
-                                                ac.LastDateTime = DateTime.Now;
-                                                break;
+                                            var curTemp = (attList.AttriButeData / 100 < ACControlBase.Temperature_High && attList.AttriButeData / 100 > ACControlBase.Temperature_Low) ? attList.AttriButeData / 100 : ACControlBase.Temperature_Default;
+                                            switch (attList.AttributeId)
+                                            {
+                                                case 0:
+                                                    ac.currentLocalTemperature = curTemp;
+                                                    ac.LastDateTime = DateTime.Now;
+                                                    break;
+                                                case 17:
+                                                    ac.currentCoolingSetpoint = curTemp;
+                                                    ac.LastDateTime = DateTime.Now;
+                                                    break;
+                                                case 18:
+                                                    ac.currentHeatingSetpoint = curTemp;
+                                                    ac.LastDateTime = DateTime.Now;
+                                                    break;
+                                                case 4096:
+                                                    ac.currentAutoSetpoint = curTemp;
+                                                    ac.LastDateTime = DateTime.Now;
+                                                    break;
+                                                case 28:
+                                                    ac.currentSystemMode = attList.AttriButeData;
+                                                    ac.LastDateTime = DateTime.Now;
+                                                    break;
+                                                case 4099:
+                                                    var value = Convert.ToString(attList.AttriButeData, 2).PadLeft(16, '0');
+                                                    var modeStr = value.Substring(value.Length - 5, 5);
+                                                    for (int j = 0; j < modeStr.Length; j++)
+                                                    {
+                                                        ac.listSupportMode[j] = Convert.ToInt32(modeStr[j]) == 49 ? 1 : 0;
+                                                    }
+                                                    break;
+                                                case 4097:
+                                                    //杩囪檻缃戞竻娲楁爣蹇�:42
+                                                    ac.CleanStatu = attList.AttriButeData == 42;
+                                                    break;
+                                            }
                                         }
-
                                         var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
-                                        row.SetStatu(ac.currentSystemMode != 0);
+                                        row.IsSelected = ac.currentSystemMode != 0;
                                         row.SetStatuText(deviceUI.GetDeviceStatu());
                                     }
 
@@ -294,24 +310,23 @@
                                     {
                                         var ac = deviceUI.CommonDevice as ZigBee.Device.AC;
                                         var attriButeList = common.DeviceStatusReport.AttriBute;
-                                        if (attriButeList == null || attriButeList.Count == 0)
-                                        {
-                                            return;
-                                        }
                                         ac.DeviceStatusReport = common.DeviceStatusReport;
-                                        switch (attriButeList[0].AttributeId)
+                                        foreach(var attList in attriButeList)
                                         {
-                                            case 0:
-                                                ac.currentFanMode = attriButeList[0].AttriButeData;
-                                                ac.LastDateTime = DateTime.Now;
-                                                break;
-                                            case 4096:
-                                                ac.currentFanSwingMode = attriButeList[0].AttriButeData;
-                                                ac.LastDateTime = DateTime.Now;
-                                                break;
+                                            switch (attList.AttributeId)
+                                            {
+                                                case 0:
+                                                    ac.currentFanMode = attList.AttriButeData;
+                                                    ac.LastDateTime = DateTime.Now;
+                                                    break;
+                                                case 4096:
+                                                    ac.currentFanSwingMode = attList.AttriButeData;
+                                                    ac.LastDateTime = DateTime.Now;
+                                                    break;
+                                            }
                                         }
                                         var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
-                                        row.SetStatu(ac.currentSystemMode != 0);
+                                        row.IsSelected = ac.currentSystemMode != 0;
                                         row.SetStatuText(deviceUI.GetDeviceStatu());
                                     }
 
@@ -320,8 +335,6 @@
                                         var ac = deviceUI.CommonDevice as ZigBee.Device.AC;
                                         ac.IsOnline = 1;
                                         ac.LastDateTime = DateTime.Now;
-                                        var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
-                                        row.SetStatu(true);
                                     }
                                     break;
                                 case DeviceType.DimmableLight:
@@ -330,14 +343,19 @@
                                     {
                                         var dimmableLight = deviceUI.CommonDevice as DimmableLight;
                                         dimmableLight.DeviceStatusReport = common.DeviceStatusReport;
-                                        //璁板綍銆佹洿鏂扮姸鎬�
-                                        if (dimmableLight.DeviceStatusReport.AttriBute == null || dimmableLight.DeviceStatusReport.AttriBute.Count == 0)
-                                        {
-                                            continue;
-                                        }
                                         dimmableLight.OnOffStatus = dimmableLight.DeviceStatusReport.AttriBute[0].AttriButeData;
                                         var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
-                                        row.SetStatu(dimmableLight.OnOffStatus == 1);
+                                        row.IsSelected = dimmableLight.OnOffStatus == 1;
+                                        row.SetStatuText(deviceUI.GetDeviceStatu());
+                                        dimmableLight.LastDateTime = DateTime.Now;
+                                    }
+                                    if (common.DeviceStatusReport.CluterID == 8)
+                                    {
+                                        var dimmableLight = deviceUI.CommonDevice as DimmableLight;
+                                        dimmableLight.DeviceStatusReport = common.DeviceStatusReport;
+                                        dimmableLight.Level = dimmableLight.DeviceStatusReport.AttriBute[0].AttriButeData;
+                                        var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
+                                        row.IsSelected = dimmableLight.OnOffStatus == 1;
                                         row.SetStatuText(deviceUI.GetDeviceStatu());
                                         dimmableLight.LastDateTime = DateTime.Now;
                                     }
@@ -345,8 +363,6 @@
                                     {
                                         deviceUI.CommonDevice.IsOnline = 1;
                                         deviceUI.CommonDevice.LastDateTime = DateTime.Now;
-                                        var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
-                                        row.SetStatu(true);
                                     }
                                     break;
                             }
@@ -380,37 +396,66 @@
                             {
                                 case DeviceType.OnOffOutput:
                                     deviceUI.CommonDevice.IsOnline = common.IsOnline;
-                                    var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
-                                    row.SetStatu(deviceUI.CommonDevice.IsOnline == 1);
                                     deviceUI.CommonDevice.LastDateTime = DateTime.Now;
                                     break;
 
                                 case DeviceType.AirSwitch:
                                     deviceUI.CommonDevice.IsOnline = common.IsOnline;
-                                    var row1 = rowLayout.GetChildren(0) as CategoryFunctionRow;
-                                    row1.SetStatu(deviceUI.CommonDevice.IsOnline == 1);
                                     deviceUI.CommonDevice.LastDateTime = DateTime.Now;
                                     break;
 
                                 case DeviceType.WindowCoveringDevice:
                                     deviceUI.CommonDevice.LastDateTime = DateTime.Now;
                                     deviceUI.CommonDevice.IsOnline = common.IsOnline;
-                                    var row2 = rowLayout.GetChildren(0) as CategoryFunctionForWinRow;
-                                    row2.SetStatu(deviceUI.CommonDevice.IsOnline == 1);
                                     break;
 
                                 case DeviceType.DimmableLight:
                                     deviceUI.CommonDevice.LastDateTime = DateTime.Now;
                                     deviceUI.CommonDevice.IsOnline = common.IsOnline;
-                                    var row3 = rowLayout.GetChildren(0) as CategoryFunctionRow;
-                                    row3.SetStatu(deviceUI.CommonDevice.IsOnline == 1);
                                     break;
 
                                 case DeviceType.Thermostat:
                                     deviceUI.CommonDevice.LastDateTime = DateTime.Now;
                                     deviceUI.CommonDevice.IsOnline = common.IsOnline;
-                                    var row5 = rowLayout.GetChildren(0) as CategoryFunctionRow;
-                                    row5.SetStatu(deviceUI.CommonDevice.IsOnline == 1);
+                                    break;
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        System.Console.WriteLine($"鍒嗙被璁惧鐘舵��-Error:{ex.Message}");
+                    }
+                });
+            }
+            else if (typeTag == "IASInfoReport")
+            {
+                Application.RunOnMainThread(() =>
+                {
+                    try
+                    {
+                        for (int i = 0; deviceListScrolView != null && i < deviceListScrolView.ChildrenCount; i++)
+                        {
+                            var rowLayout = deviceListScrolView.GetChildren(i) as RowLayout;
+                            var deviceUI = rowLayout.Tag as DeviceUI;
+                            if (deviceUI == null || deviceUI.CommonDevice == null)
+                            {
+                                continue;
+                            }
+                            if (deviceUI.CommonDevice.DeviceAddr != common.DeviceAddr || deviceUI.CommonDevice.DeviceEpoint != common.DeviceEpoint)
+                            {
+                                continue;
+                            }
+                            switch (deviceUI.CommonDevice.Type)
+                            {
+                                case DeviceType.IASZone:
+                                    //寮�鍏冲姛鑳�
+                                    var ias = common as IASZone;
+                                    var iAS = deviceUI.CommonDevice as ZigBee.Device.IASZone;
+                                    iAS.iASInfo = ias.iASInfo;
+                                    var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
+                                    row.IsSelected = iAS.iASInfo?.Alarm1 == 1;
+                                    row.SetStatuText(deviceUI.GetDeviceStatu());
+                                    iAS.LastDateTime = DateTime.Now;
                                     break;
                             }
                         }
@@ -451,6 +496,8 @@
         /// <param name="selectedBtn">閫変腑閭d釜鐣岄潰 0--鍔熻兘 1--鍦烘櫙 2--鑷姩鍖� </param>
         public void Show(int selectedBtn = 1)
         {
+            InitData();
+
             RemoveAll();
 
             #region topview
@@ -470,8 +517,9 @@
                 Gravity = Gravity.CenterVertical,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextID = R.MyInternationalizationString.Category,
-                TextSize = 20,
+                TextSize = 24,
                 TextColor = ZigbeeColor.Current.GXCTextDeepBlackColor,
+                IsBold=true
             };
             topView.AddChidren(title);
 
@@ -504,19 +552,21 @@
             midFL.AddChidren(functionSceneAutoBG);
 
             //鍦烘櫙
-            sceneBtn = new ButtonLineForm(CommonFormResouce.X_Left, 34, 150, 68);
+            sceneBtn = new ButtonLineForm(CommonFormResouce.X_Left, 34);
             functionSceneAutoBG.AddChidren(sceneBtn);
             sceneBtn.Init();
             sceneBtn.SetTitle(R.MyInternationalizationString.Scence);
             //鍔熻兘
-            functionBtn = new ButtonLineForm(CommonFormResouce.X_Left + 150 + 20, 34, 150, 68);
+            functionBtn = new ButtonLineForm(CommonFormResouce.X_Left + 150 + 20, 34);
             functionSceneAutoBG.AddChidren(functionBtn);
             functionBtn.Init();
             functionBtn.SetTitle(R.MyInternationalizationString.Function);
+            functionBtn.X = sceneBtn.Right;
             //鑷姩鍖�
-            automationBtn = new ButtonLineForm(CommonFormResouce.X_Left + 150 * 2 + 20, 34, 150, 68);
+            automationBtn = new ButtonLineForm(CommonFormResouce.X_Left + 150 * 2 + 20+50, 34);
             automationBtn.Init();
             automationBtn.SetTitle(R.MyInternationalizationString.Automation);
+            automationBtn.X = functionBtn.Right;
             //闅愯棌鑷姩鍖�
             if (UserCenter.UserCenterResourse.UserInfo.AuthorityNo != 3)
             {
@@ -531,6 +581,8 @@
                 Gravity = Gravity.CenterVertical,
                 TextAlignment = TextAlignment.CenterRight,
                 TextColor = ZigbeeColor.Current.GXCTextBlackColor,
+                TextSize=14,
+                IsBold=true
             };
 
             selectFloorBtn = new Button()
@@ -577,6 +629,7 @@
             #endregion
             //缁戝畾鎸夐挳浜嬩欢
             BindEvent();
+
         }
         #endregion
 
@@ -611,9 +664,10 @@
             var floors = new SelectFloor ();
             AddChidren(floors);
             floors.Init(580,330,Direction.Right);
-            floors.FloorAction += (floorName) =>
+            floors.changeFloor = true;
+            floors.FloorAction += (floorId) =>
             {
-                floorBtn.Text = floorName;
+                floorBtn.Text = Config.Instance.Home.GetFloorNameById(floorId);
                 RefreshBodyView();
             };
         }
@@ -749,6 +803,45 @@
             }
         }
 
+        /// <summary>
+        /// InitData
+        /// </summary>
+        private void InitData()
+        {
+            typeDeviceDic = new Dictionary<int, List<DeviceUI>> { };
+            typeIdDic = new Dictionary<int, DeviceConcreteType> { };
+        }
+
+        /// <summary>
+        /// RefreshData
+        /// </summary>
+        private void RefreshData(Common.Room room)
+        {
+            devList = room.DeviceUIList;
+            sceneList = room.SceneUIList;
+            typeDeviceDic.Clear();
+            typeIdDic.Clear();
+            foreach (var device in devList)
+            {
+                var info = Common.LocalDevice.Current.GetNotHdlMyDeviceEnumInfo(new List<CommonDevice> { device.CommonDevice });
+                if (info.BeloneType == DeviceBeloneType.A骞叉帴鐐� || info.BeloneType == DeviceBeloneType.A涓户鍣�)
+                {
+                    continue;
+                }
+                if (typeDeviceDic.ContainsKey(info.BeloneTextId) == false)
+                {
+                    var sameDevList = new List<DeviceUI> { };
+                    sameDevList.Add(device);
+                    typeDeviceDic[info.BeloneTextId] = sameDevList;
+                }
+                else
+                {
+                    typeDeviceDic[info.BeloneTextId].Add(device);
+                }
+                typeIdDic[info.BeloneTextId] = info.ConcreteType;
+            }
+        }
+
         #endregion
 
         #region 鈼� 鍔熻兘____________________________
@@ -795,714 +888,802 @@
         /// <param name="room"></param>
         private void RefreshFunction(Common.Room room)
         {
+            RefreshData(room);
             //绉婚櫎鐩戝惉
             RemoveAllUpdateControlDeviceStatuAction();
             functionSceneBodyView.RemoveAll();
 
-            if (room.DeviceUIList.Count == 0)
+            if (typeDeviceDic.Count == 0)
             {
                 ShowNoFunctionTip();
             }
             else
             {
+                var functionTypeView1 = new FrameLayout
+                {
+                    X = Application.GetRealWidth(CommonFormResouce.X_Left),
+                    Height = Application.GetRealHeight(160),
+                    Width = Application.GetRealWidth(1028),
+                    BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
+                };
+                functionSceneBodyView.AddChidren(functionTypeView1);
+                functionTypeView1.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerTopLeft);
+
+                var functionTypeView2 = new FrameLayout
+                {
+                    X = Application.GetRealWidth(CommonFormResouce.X_Left),
+                    Y = Application.GetRealHeight(150),
+                    Height = Application.GetRealHeight(279 - 150),
+                    Width = Application.GetRealWidth(1028),
+                    BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
+                };
+                functionSceneBodyView.AddChidren(functionTypeView2);
+                functionTypeView2.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);
+
                 functionTypeScrowView = new HorizontalScrolViewLayout
                 {
                     X = Application.GetRealWidth(CommonFormResouce.X_Left),
                     Height = Application.GetRealHeight(279),
                     Width = Application.GetRealWidth(1028),
-                    BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
                 };
                 functionSceneBodyView.AddChidren(functionTypeScrowView);
 
                 deviceListScrolView = new VerticalScrolViewLayout
                 {
                     X = Application.GetRealWidth(CommonFormResouce.X_Left),
-                    Y = Application.GetRealHeight(35+275),
+                    Y = Application.GetRealHeight(35+279),
                     Width = Application.GetRealWidth(1028),
-                    Height = Application.GetRealHeight(938) - 1,
+                    Height = Application.GetRealHeight(942),
                     BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
                 };
                 functionSceneBodyView.AddChidren(deviceListScrolView);
+                deviceListScrolView.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
+
                 tempFunctionTypeBtn = new FunctionButton();
+                tempFunctionTypeBtn.Init("","");
 
-                EventHandler<MouseEventArgs> ShowSameTypeFunction = (object typeSender, MouseEventArgs mouseEventArgs) =>
+                foreach (var deviceType in typeIdDic)
                 {
-                    tempFunctionTypeBtn.IsSelected = false;
-                    tempFunctionTypeBtn = (typeSender as Button).Parent as FunctionButton;
-                    ((typeSender as Button).Parent as FunctionButton).IsSelected = true;
-
-                    deviceListScrolView.RemoveAll();
-
-                    var sameTypeList = new List<DeviceUI> { };
-                    foreach (var devieceUI in room.DeviceUIList)
+                    var typeRowLayout = new FrameLayout()
                     {
-                        if (devieceUI == null || devieceUI.CommonDevice == null)
-                        {
-                            continue;
-                        }
-                        if (devieceUI.CommonDevice.Type.ToString() == (typeSender as Button).Tag.ToString())
-                        {
-                            if (!sameTypeList.Contains(devieceUI))
-                            {
-                                sameTypeList.Add(devieceUI);
-                            }
-                        }
-                    }
-                    foreach (var deviceUI in sameTypeList)
-                    {
-                        //鍒犻櫎璁惧
-                        EventHandler<MouseEventArgs> delEvent = (delSender, delE) =>
-                        {
-                            var alert = new CustomAlert();
-                            AddChidren(alert);
-                            alert.Show(Language.StringByID(R.MyInternationalizationString.ConfirmDelete));
-                            alert.ResultEventHandler += (e2) =>
-                            {
-                                if (e2)
-                                {
-                                    Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.CommonDevice);
-                                    deviceListScrolView.RemoveViewByTag((delSender as Button).Tag);
-                                    sameTypeList.Remove(deviceUI);
-                                    if (sameTypeList.Count == 0)
-                                    {
-                                        RefreshBodyView();
-                                    }
-                                }
-                            };
-                        };
-                        EventHandler<MouseEventArgs> deviceDetailHandler = (send2, e2) =>
-                        {
-                            var detailInfo = new Device.CommonForm.DeviceDetailInfo { };
-                            UserView.HomePage.Instance.AddChidren(detailInfo);
-                            UserView.HomePage.Instance.PageIndex += 1;
-                            detailInfo.Show(deviceUI, Shared.Common.Room.CurrentRoom);
-                            detailInfo.action = RefreshBodyView;
-                        };
-
-                        if (deviceUI.CommonDevice.Type == DeviceType.OnOffOutput)
-                        {
-                            //鐏�
-                            var light = deviceUI.CommonDevice as ToggleLight;
-                            //琛ヤ笂闈炶繙绋�
-                            if (light.Gateway == null)
-                            {
-                                continue;
-                            }
-                            if (light.Gateway.IsVirtual)
-                            {
-                                UserHomeView.ReadStatus(light, () =>
-                                {
-                                    light.ReadOnOffStatus();
-                                    light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
-                                });
-                            }
-                            else
-                            {
-                                //闃叉鐭椂闂村唴澶氭璇诲彇鐘舵��
-                                if (CommonPage.ReadDeviceStatuSpan < (DateTime.Now - light.LastDateTime).TotalSeconds)
-                                {
-                                    light.ReadOnOffStatus();
-                                    light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
-                                }
-                            }
-
-                            var deviceTypeRowLayout = new RowLayout()
-                            {
-                                Height = Application.GetRealHeight(129 + 35),
-                                LineColor = ZigbeeColor.Current.GXCBackgroundColor,
-                                Tag = deviceUI
-                            };
-                            deviceListScrolView.AddChidren(deviceTypeRowLayout);
-
-                            var deviceRow = new CategoryFunctionRow(0, 35);
-                            deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
-                            deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
-                            deviceRow.SetOnLineStatu(light.IsOnline == 1);
-                            deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
-                            deviceRow.SetStatu(light.OnOffStatus == 1);
-                            deviceTypeRowLayout.AddChidren(deviceRow);
-
-                            deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
-                            {
-                                zbGateway = deviceUI.CommonDevice.Gateway;
-                                sendedControlCommand = false;
-                                zbGateway.ReportAction += UpdateDeviceControllStatu;
-                                AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);
-                                (send2 as Button).IsSelected = !(send2 as Button).IsSelected;
-                                deviceRow.IsSelected = (send2 as Button).IsSelected;
-                                if ((send2 as Button).IsSelected)
-                                {
-                                    light.SwitchControl(1);
-                                }
-                                else
-                                {
-                                    light.SwitchControl(0);
-                                }
-                                deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
-                                //鎺у埗寤舵椂鍥炶皟
-                                DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
-                                {
-                                    if (Parent == null)
-                                    {
-                                        return;
-                                    }
-                                    RemoveUpdateControlDeviceStatuAction(zbGateway);
-                                    if (sendedControlCommand == false)
-                                    {
-                                        DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
-                                    }
-                                });
-                            };
-
-                            deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
-                            {
-                                if (deviceUI.CommonDevice.DfunctionType == DeviceFunctionType.A寮�鍏�)
-                                {
-                                    var lightControl = new Phone.Device.Light.OnOffControl();
-                                    UserView.HomePage.Instance.AddChidren(lightControl);
-                                    UserView.HomePage.Instance.PageIndex += 1;
-                                    //lightControl.action = RefreshBodyView;
-                                    lightControl.Show(deviceUI, room);
-                                }
-                                else if (deviceUI.CommonDevice.DfunctionType == DeviceFunctionType.A鎻掑骇)
-                                {
-                                    var lightControl = new Phone.Device.Light.PlugControl();
-                                    UserView.HomePage.Instance.AddChidren(lightControl);
-                                    UserView.HomePage.Instance.PageIndex += 1;
-                                    //lightControl.action = RefreshBodyView;
-                                    lightControl.Show(deviceUI, room);
-                                }
-                                else
-                                {
-                                    var lightControl = new Phone.Device.Light.LightControl();
-                                    UserView.HomePage.Instance.AddChidren(lightControl);
-                                    UserView.HomePage.Instance.PageIndex += 1;
-                                    //lightControl.action = RefreshBodyView;
-                                    lightControl.Show(deviceUI, room);
-                                }
-                            };
-
-                            var editBtn = new CommonForm.RowLayoutEditButton()
-                            {
-                                Tag = deviceUI,
-                                Radius = 0
-                            };
-                            deviceTypeRowLayout.AddRightView(editBtn);
-                            editBtn.MouseUpEventHandler += deviceDetailHandler;
-
-                            var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
-                            {
-                                Tag = deviceUI,
-                                Radius = 0
-                            };
-                            deviceTypeRowLayout.AddRightView(delBtn);
-                            delBtn.MouseUpEventHandler += delEvent;
-                        }
-                        else if (deviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.AirSwitch)
-                        {
-                            //绌烘皵寮�鍏�
-                            var airSwitch = deviceUI.CommonDevice as ZigBee.Device.AirSwitch;
-                            //琛ヤ笂闈炶繙绋�
-                            if (airSwitch.Gateway == null)
-                            {
-                                continue;
-                            }
-                            if (airSwitch.Gateway.IsVirtual)
-                            {
-                                UserHomeView.ReadStatus(airSwitch, () =>
-                                {
-                                    airSwitch.ReadOnOffStatus();
-                                    airSwitch.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
-                                });
-                            }
-                            else
-                            {
-                                if ((DateTime.Now - airSwitch.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
-                                {
-                                    airSwitch.ReadOnOffStatus();
-                                    airSwitch.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
-                                }
-                            }
-
-                            var deviceTypeRowLayout = new RowLayout()
-                            {
-                                Height = Application.GetRealHeight(129 + 35),
-                                LineColor = ZigbeeColor.Current.GXCBackgroundColor,
-                                Tag = deviceUI
-                            };
-                            deviceListScrolView.AddChidren(deviceTypeRowLayout);
-
-                            var deviceRow = new CategoryFunctionRow(0, 35);
-                            deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
-                            deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
-                            deviceRow.SetOnLineStatu(airSwitch.IsOnline == 1);
-                            deviceRow.SetStatu(airSwitch.OnOffStatus == 1);
-                            deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
-                            deviceTypeRowLayout.AddChidren(deviceRow);
-
-                            deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
-                            {
-                                zbGateway = deviceUI.CommonDevice.Gateway;
-                                sendedControlCommand = false;
-                                zbGateway.ReportAction += UpdateDeviceControllStatu;
-                                AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);
-
-                                (send2 as Button).IsSelected = !(send2 as Button).IsSelected;
-                                if ((send2 as Button).IsSelected)
-                                {
-                                    airSwitch.SwitchControl(1);
-                                }
-                                else
-                                {
-                                    airSwitch.SwitchControl(0);
-                                }
-                                deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
-                                //鎺у埗寤舵椂鍥炶皟
-                                DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
-                                {
-                                    if (Parent == null)
-                                    {
-                                        return;
-                                    }
-                                    RemoveUpdateControlDeviceStatuAction(zbGateway);
-                                    if (sendedControlCommand == false)
-                                    {
-                                        DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
-                                    }
-                                });
-                            };
-
-                            deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
-                            {
-
-                                var lightControl = new Phone.Device.Light.AirSwitchControl();
-                                UserView.HomePage.Instance.AddChidren(lightControl);
-                                UserView.HomePage.Instance.PageIndex += 1;
-                                //lightControl.action = RefreshBodyView;
-                                lightControl.Show(deviceUI, room);
-                            };
-
-                            var editBtn = new CommonForm.RowLayoutEditButton()
-                            {
-                                Tag = deviceUI,
-                                Radius = 0
-                            };
-                            deviceTypeRowLayout.AddRightView(editBtn);
-                            editBtn.MouseUpEventHandler += deviceDetailHandler;
-
-                            var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
-                            {
-                                Tag = deviceUI,
-                                Radius = 0
-                            };
-                            deviceTypeRowLayout.AddRightView(delBtn);
-                            delBtn.MouseUpEventHandler += delEvent;
-                        }
-                        else if (deviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.DimmableLight)
-                        {
-                            //璋冨厜鐏�
-                            var dimmableLight = deviceUI.CommonDevice as ZigBee.Device.DimmableLight;
-                            //琛ヤ笂闈炶繙绋�
-                            if (dimmableLight.Gateway == null)
-                            {
-                                continue;
-                            }
-                            if (dimmableLight.Gateway.IsVirtual)
-                            {
-                                UserHomeView.ReadStatus(dimmableLight, () =>
-                                {
-                                    dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
-                                    dimmableLight.ReadOnOffStatus();
-                                    dimmableLight.ReadLevel();
-                                });
-                            }
-                            else
-                            {
-                                if ((DateTime.Now - dimmableLight.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
-                                {
-                                    dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
-                                    dimmableLight.ReadOnOffStatus();
-                                    dimmableLight.ReadLevel();
-                                }
-                            }
-
-                            var deviceTypeRowLayout = new RowLayout()
-                            {
-                                Height = Application.GetRealHeight(129 + 35),
-                                LineColor = ZigbeeColor.Current.GXCBackgroundColor,
-                                Tag = deviceUI
-                            };
-                            deviceListScrolView.AddChidren(deviceTypeRowLayout);
-
-                            var deviceRow = new CategoryFunctionRow(0, 35);
-                            deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
-                            deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
-                            deviceRow.SetOnLineStatu(dimmableLight.IsOnline == 1);
-                            deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
-                            deviceRow.SetStatu(dimmableLight.OnOffStatus == 1);
-                            deviceTypeRowLayout.AddChidren(deviceRow);
-
-                            deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
-                            {
-                                zbGateway = deviceUI.CommonDevice.Gateway;
-                                sendedControlCommand = false;
-                                zbGateway.ReportAction += UpdateDeviceControllStatu;
-                                AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);
-
-                                (send2 as Button).IsSelected = !(send2 as Button).IsSelected;
-                                if ((send2 as Button).IsSelected)
-                                {
-                                    dimmableLight.SwitchControl(1);
-                                }
-                                else
-                                {
-                                    dimmableLight.SwitchControl(0);
-                                }
-                                deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
-                                //鎺у埗寤舵椂鍥炶皟
-                                DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
-                                {
-                                    if (Parent == null)
-                                    {
-                                        return;
-                                    }
-                                    RemoveUpdateControlDeviceStatuAction(zbGateway);
-                                    if (sendedControlCommand == false)
-                                    {
-                                        DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
-                                    }
-                                });
-                            };
-
-                            deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
-                            {
-                                var dimmableLightControl = new Phone.Device.Light.DimmableLightControl();
-                                UserView.HomePage.Instance.AddChidren(dimmableLightControl);
-                                UserView.HomePage.Instance.PageIndex += 1;
-                                UserView.HomePage.Instance.ScrollEnabled = false;
-                                //dimmableLightControl.action = RefreshBodyView;
-                                dimmableLightControl.Show(deviceUI, room);
-                            };
-
-                            var editBtn = new CommonForm.RowLayoutEditButton()
-                            {
-                                Tag = deviceUI,
-                                Radius = 0
-                            };
-                            deviceTypeRowLayout.AddRightView(editBtn);
-                            editBtn.MouseUpEventHandler += deviceDetailHandler;
-
-                            var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
-                            {
-                                Tag = deviceUI,
-                                Radius = 0
-                            };
-                            deviceTypeRowLayout.AddRightView(delBtn);
-                            delBtn.MouseUpEventHandler += delEvent;
-
-                        }
-                        else if (deviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.Thermostat)
-                        {
-                            //绌鸿皟
-                            var ac = deviceUI.CommonDevice as ZigBee.Device.AC;
-                            //琛ヤ笂闈炶繙绋�
-                            if (ac.Gateway == null)
-                            {
-                                continue;
-                            }
-                            if (ac.Gateway.IsVirtual)
-                            {
-                                //鍙戦�佽鍙栫姸鎬佸懡浠�
-                                UserView.UserHomeView.ReadStatus(ac, () =>
-                                {
-                                    ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
-                                    ac.ReadLocalTemperature();
-                                    ac.ReadCoolingSetpoint();
-                                    ac.ReadHeatingSetpoint();
-                                    ac.ReadAutoSetpoint();
-                                    ac.ReadFanMode();
-                                    ac.ReadSystemMode();
-                                    ac.ReadSystemFansSwingMode();
-                                });
-                            }
-                            else
-                            {
-                                //闃叉鐭椂闂村唴澶氭璇诲彇璁惧鐘舵��
-                                if ((DateTime.Now - ac.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
-                                {
-                                    ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
-                                    ac.ReadLocalTemperature();
-                                    ac.ReadCoolingSetpoint();
-                                    ac.ReadHeatingSetpoint();
-                                    ac.ReadAutoSetpoint();
-                                    ac.ReadFanMode();
-                                    ac.ReadSystemMode();
-                                    ac.ReadSystemFansSwingMode();
-                                }
-                            }
-
-                            var deviceTypeRowLayout = new RowLayout()
-                            {
-                                Height = Application.GetRealHeight(127 + 35),
-                                LineColor = ZigbeeColor.Current.GXCBackgroundColor,
-                                Tag = deviceUI
-                            };
-                            deviceListScrolView.AddChidren(deviceTypeRowLayout);
-
-                            var deviceRow = new CategoryFunctionRow(0, 35);
-                            deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
-                            deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
-                            deviceRow.SetOnLineStatu(ac.IsOnline == 1);
-                            deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
-                            deviceRow.SetStatu(ac.currentSystemMode != 1);
-                            deviceTypeRowLayout.AddChidren(deviceRow);
-
-                            deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
-                            {
-                                zbGateway = deviceUI.CommonDevice.Gateway;
-                                sendedControlCommand = false;
-                                zbGateway.ReportAction += UpdateDeviceControllStatu;
-                                AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);
-
-                                (send2 as Button).IsSelected = !(send2 as Button).IsSelected;
-                                if ((send2 as Button).IsSelected)
-                                {
-                                    ac.Open();
-                                }
-                                else
-                                {
-                                    ac.Close();
-                                }
-                                deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
-                                //鎺у埗寤舵椂鍥炶皟
-                                DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
-                                {
-                                    if (Parent == null)
-                                    {
-                                        return;
-                                    }
-                                    RemoveUpdateControlDeviceStatuAction(zbGateway);
-                                    if (sendedControlCommand == false)
-                                    {
-                                        DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
-                                    }
-                                });
-                            };
-
-                            var editBtn = new CommonForm.RowLayoutEditButton()
-                            {
-                                Tag = deviceUI,
-                                Radius = 0
-                            };
-                            deviceTypeRowLayout.AddRightView(editBtn);
-                            editBtn.MouseUpEventHandler += deviceDetailHandler;
-
-                            var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
-                            {
-                                Tag = deviceUI,
-                                Radius = 0
-                            };
-                            deviceTypeRowLayout.AddRightView(delBtn);
-                            delBtn.MouseUpEventHandler += delEvent;
-
-                            deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
-                            {
-                                var acControl = new Phone.Device.AC.ACControl();
-                                UserView.HomePage.Instance.AddChidren(acControl);
-                                UserView.HomePage.Instance.PageIndex += 1;
-                                UserView.HomePage.Instance.ScrollEnabled = false;
-                                //rollerShadeControl.action = RefreshBodyView;
-                                acControl.Show(deviceUI, room);
-                            };
-                        }
-                        else if (deviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.WindowCoveringDevice)
-                        {
-                            //鍗峰笜
-                            var rollerShade = deviceUI.CommonDevice as ZigBee.Device.Rollershade;
-                            //涓嶄笂闈炶繙绋�
-                            if (rollerShade.Gateway == null)
-                            {
-                                continue;
-                            }
-                            if (rollerShade.Gateway.IsVirtual)
-                            {
-                                UserHomeView.ReadStatus(rollerShade, () =>
-                                {
-                                    rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
-                                    rollerShade.ReadWcdCurrentPositionLiftPercentage();
-                                });
-                            }
-                            else
-                            {
-                                //闃叉鐭椂闂村唴澶氭璇诲彇
-                                if ((DateTime.Now - rollerShade.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
-                                {
-                                    rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
-                                    rollerShade.ReadWcdCurrentPositionLiftPercentage();
-                                }
-                            }
-
-                            var deviceTypeRowLayout = new RowLayout()
-                            {
-                                Height = Application.GetRealHeight(129 + 35),
-                                LineColor = ZigbeeColor.Current.GXCBackgroundColor,
-                                Tag = deviceUI
-                            };
-                            deviceListScrolView.AddChidren(deviceTypeRowLayout);
-
-                            var deviceRow = new CategoryFunctionForWinRow(0, 35);
-                            deviceRow.Init(deviceUI);
-                            deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
-                            deviceRow.SetOnLineStatu(rollerShade.IsOnline == 1);
-                            deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
-                            deviceRow.SetStatu(rollerShade.WcdCurrentPositionLiftPercentage != 0);
-                            deviceRow.SetRollerShadeIcon(rollerShade.WcdType);
-                            deviceTypeRowLayout.AddChidren(deviceRow);
-
-                            if (rollerShade.WcdType == -1)
-                            {
-                                CommonPage.Loading.Start();
-                                new System.Threading.Thread(() =>
-                                {
-                                    Rollershade.ReadWcdTypeAction(rollerShade, () =>
-                                    {
-                                        Application.RunOnMainThread(() =>
-                                        {
-                                            deviceRow.SetRollerShadeIcon(rollerShade.WcdType);
-                                            CommonPage.Loading.Hide();
-                                        });
-                                    });
-                                })
-                                { IsBackground = true }.Start();
-                            }
-
-                            var editBtn = new CommonForm.RowLayoutEditButton()
-                            {
-                                Tag = deviceUI,
-                                Radius = 0
-                            };
-                            deviceTypeRowLayout.AddRightView(editBtn);
-                            editBtn.MouseUpEventHandler += deviceDetailHandler;
-
-                            var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
-                            {
-                                Tag = deviceUI,
-                                Radius = 0
-                            };
-                            deviceTypeRowLayout.AddRightView(delBtn);
-                            delBtn.MouseUpEventHandler += delEvent;
-
-                            deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
-                            {
-                                var rollerShadeControl = new Phone.Device.Curtain.RollerShadeControl();
-                                UserView.HomePage.Instance.AddChidren(rollerShadeControl);
-                                UserView.HomePage.Instance.PageIndex += 1;
-                                UserView.HomePage.Instance.ScrollEnabled = false;
-                                //rollerShadeControl.action = RefreshBodyView;
-                                rollerShadeControl.Show(deviceUI, room);
-                            };
-                        }
-                        else if(deviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.DoorLock)
-                        {
-                            var deviceTypeRowLayout = new RowLayout()
-                            {
-                                Height = Application.GetRealHeight(129 + 35),
-                                LineColor = ZigbeeColor.Current.GXCBackgroundColor,
-                                Tag = deviceUI
-                            };
-                            deviceListScrolView.AddChidren(deviceTypeRowLayout);
-
-                            var deviceRow = new CategoryFunctionRow(0, 35);
-                            deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
-                            deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
-                            deviceRow.SetOnLineStatu(deviceUI.CommonDevice.IsOnline == 1);
-                            deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
-                            deviceRow.HideSwitchBtn(true);
-                            deviceTypeRowLayout.AddChidren(deviceRow);
-
-
-                            deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
-                            {
-                                var userDoorLockPage = new UserDoorLockPage(room, deviceUI);
-                                HomePage.Instance.AddChidren(userDoorLockPage);
-                                HomePage.Instance.PageIndex += 1;
-                                userDoorLockPage.Show();
-                            };
-
-                            var editBtn = new CommonForm.RowLayoutEditButton()
-                            {
-                                Tag = deviceUI
-                            };
-                            deviceTypeRowLayout.AddRightView(editBtn);
-                            editBtn.MouseUpEventHandler += deviceDetailHandler;
-
-                            var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
-                            {
-                                Tag = deviceUI
-                            };
-                            deviceTypeRowLayout.AddRightView(delBtn);
-                            delBtn.MouseUpEventHandler += delEvent;
-                        }
-                        else
-                        {
-                            var deviceTypeRowLayout = new RowLayout()
-                            {
-                                Height = Application.GetRealHeight(129 + 35),
-                                LineColor = ZigbeeColor.Current.GXCBackgroundColor,
-                                Tag = deviceUI
-                            };
-                            deviceListScrolView.AddChidren(deviceTypeRowLayout);
-
-                            var deviceRow = new CategoryFunctionRow(0, 35);
-                            deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
-                            deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
-                            deviceRow.SetOnLineStatu(deviceUI.CommonDevice.IsOnline == 1);
-                            deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
-                            deviceRow.HideSwitchBtn(true);
-                            deviceTypeRowLayout.AddChidren(deviceRow);
-
-                            var editBtn = new CommonForm.RowLayoutEditButton()
-                            {
-                                Tag = deviceUI
-                            };
-                            deviceTypeRowLayout.AddRightView(editBtn);
-                            editBtn.MouseUpEventHandler += deviceDetailHandler;
-
-                            var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
-                            {
-                                Tag = deviceUI
-                            };
-                            deviceTypeRowLayout.AddRightView(delBtn);
-                            delBtn.MouseUpEventHandler += delEvent;
-                        }
-                    }
-                };
-
-                foreach (var deviceType in Common.Room.GetdeviceTypes(room))
-                {
-                    typeRowLayout = new FrameLayout()
-                    {
-                        Width = Application.GetRealWidth(CommonPage.AppRealWidth / 5),
-                        Tag = deviceType
+                        Width = Application.GetRealWidth(220),
                     };
                     functionTypeScrowView.AddChidren(typeRowLayout);
 
-                    functionTypeIMG = new FunctionButton()
+                    var functionTypeIMG = new FunctionButton()
                     {
-                        Tag = deviceType
+                        Tag = deviceType.Key
                     };
-                    functionTypeIMG.Init(DeviceUI.GetDeviceTypeUnSelectedImagePath(deviceType), DeviceUI.GetDeviceTypeUnSelectedImagePath(deviceType));
-                    functionTypeIMG.SetTitle(DeviceUI.GetDeviceTypeName(deviceType));
+                    string imgPath = string.Empty;
+                    string imgSeletedPath = string.Empty;
+                    Common.LocalDevice.Current.GetDeviceBeloneIcon(deviceType.Value, ref imgPath, ref imgSeletedPath);
+                    functionTypeIMG.Init(imgPath, imgSeletedPath);
+                    functionTypeIMG.SetTitle(deviceType.Key);
                     typeRowLayout.AddChidren(functionTypeIMG);
 
                     functionTypeIMG.ClickBtn.MouseUpEventHandler += ShowSameTypeFunction;
 
-
-                    if (deviceType == room.DeviceUIList[0].CommonDevice.Type)
+                    if (functionTypeScrowView.ChildrenCount == 1)
                     {
                         ShowSameTypeFunction(functionTypeIMG.ImageBtn, null);
                     }
                 }
+            }
+        }
+
+        /// <summary>
+        /// 鏄剧ず鐩稿悓绫诲瀷鐨勫姛鑳�
+        /// </summary>
+        /// <param name="typeSender">typeSender.</param>
+        /// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
+        private void ShowSameTypeFunction(object typeSender, MouseEventArgs mouseEventArgs)
+        {
+            tempFunctionTypeBtn.IsSelected = false;
+            tempFunctionTypeBtn = (typeSender as Button).Parent as FunctionButton;
+            ((typeSender as Button).Parent as FunctionButton).IsSelected = true;
+
+            deviceListScrolView.RemoveAll();
+
+            var sameTypeList = new List<DeviceUI> { };
+            sameTypeList = typeDeviceDic[int.Parse((typeSender as Button).Tag.ToString())];
+
+            for (int i = 0; i < sameTypeList.Count; i++)
+            {
+                var deviceUI = sameTypeList[i];
+                new System.Threading.Thread(() =>
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        try
+                        {
+                            //鍒犻櫎璁惧
+                            EventHandler<MouseEventArgs> delEvent = (delSender, delE) =>
+                            {
+                                var alert = new CustomAlert();
+                                AddChidren(alert);
+                                alert.Show(Language.StringByID(R.MyInternationalizationString.DeleteFunction));
+                                alert.ResultEventHandler += (e2) =>
+                                {
+                                    if (e2)
+                                    {
+                                        if(curRoom.IsLove)
+                                        {
+                                            Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.FileName);
+                                            deviceListScrolView.RemoveViewByTag((delSender as Button).Tag);
+                                            sameTypeList.Remove(deviceUI);
+                                        }
+                                        else
+                                        {
+                                            Shared.Common.Room.CurrentRoom.DeleteDevice(deviceUI.CommonDevice);
+                                            deviceListScrolView.RemoveViewByTag((delSender as Button).Tag);
+                                            sameTypeList.Remove(deviceUI);
+                                        }
+                                        //if (sameTypeList.Count == 0)
+                                        //{
+                                        //    RefreshBodyView();
+                                        //}
+                                    }
+                                };
+                            };
+                            EventHandler<MouseEventArgs> deviceDetailHandler = (send2, e2) =>
+                            {
+                                var detailInfo = new Device.CommonForm.DeviceDetailInfo { };
+                                UserView.HomePage.Instance.AddChidren(detailInfo);
+                                UserView.HomePage.Instance.PageIndex += 1;
+                                detailInfo.Show(deviceUI, Shared.Common.Room.CurrentRoom);
+                                detailInfo.action = RefreshBodyView;
+                            };
+
+                            if (deviceUI.CommonDevice.Type == DeviceType.OnOffOutput)
+                            {
+                                //鐏�
+                                var light = deviceUI.CommonDevice as ToggleLight;
+                                if (light.Gateway != null)
+                                {
+                                    new System.Threading.Thread(() =>
+                                    {
+                                        System.Threading.Thread.Sleep(100 * i);
+                                        if (light.Gateway.IsVirtual)
+                                        {
+                                            UserHomeView.ReadStatus(light, () =>
+                                            {
+                                                ReadDeviceAttributeLogic.Instance.SendLightStatuComand(deviceUI.CommonDevice);
+                                            });
+                                        }
+                                        else
+                                        {
+                                            //闃叉鐭椂闂村唴澶氭璇诲彇鐘舵��
+                                            if (CommonPage.ReadDeviceStatuSpan < (DateTime.Now - light.LastDateTime).TotalSeconds)
+                                            {
+                                                ReadDeviceAttributeLogic.Instance.SendLightStatuComand(deviceUI.CommonDevice);
+                                            }
+                                        }
+                                    })
+                                    { IsBackground = true }.Start();
+
+                                    var deviceTypeRowLayout = new RowLayout()
+                                    {
+                                        Height = Application.GetRealHeight(129 + 35),
+                                        LineColor = ZigbeeColor.Current.GXCBackgroundColor,
+                                        Tag = deviceUI
+                                    };
+                                    deviceListScrolView.AddChidren(deviceTypeRowLayout);
+
+                                    var deviceRow = new CategoryFunctionRow(0, 35);
+                                    deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
+                                    deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+                                    //deviceRow.SetOnLineStatu(light.IsOnline == 1);
+                                    deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
+                                    deviceRow.IsSelected = light.OnOffStatus == 1;
+                                    deviceTypeRowLayout.AddChidren(deviceRow);
+
+                                    deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
+                                    {
+                                        zbGateway = deviceUI.CommonDevice.Gateway;
+                                        sendedControlCommand = false;
+                                        zbGateway.ReportAction += UpdateDeviceControllStatu;
+                                        AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);
+                                        (send2 as Button).IsSelected = !(send2 as Button).IsSelected;
+                                        deviceRow.IsSelected = (send2 as Button).IsSelected;
+                                        if ((send2 as Button).IsSelected)
+                                        {
+                                            light.SwitchControl(1);
+                                        }
+                                        else
+                                        {
+                                            light.SwitchControl(0);
+                                        }
+                                        deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
+                                        //鎺у埗寤舵椂鍥炶皟
+                                        DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
+                                        {
+                                            if (Parent == null)
+                                            {
+                                                return;
+                                            }
+                                            RemoveUpdateControlDeviceStatuAction(zbGateway);
+                                            if (sendedControlCommand == false)
+                                            {
+                                                DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
+                                            }
+                                        });
+                                    };
+
+                                    deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
+                                    {
+                                        if (deviceUI.CommonDevice.DfunctionType == DeviceFunctionType.A寮�鍏�)
+                                        {
+                                            var lightControl = new Phone.Device.Light.OnOffControl();
+                                            UserView.HomePage.Instance.AddChidren(lightControl);
+                                            UserView.HomePage.Instance.PageIndex += 1;
+                                            //lightControl.action = RefreshBodyView;
+                                            lightControl.Show(deviceUI, curRoom);
+                                        }
+                                        else if (deviceUI.CommonDevice.DfunctionType == DeviceFunctionType.A鎻掑骇)
+                                        {
+                                            var lightControl = new Phone.Device.Light.PlugControl();
+                                            UserView.HomePage.Instance.AddChidren(lightControl);
+                                            UserView.HomePage.Instance.PageIndex += 1;
+                                            //lightControl.action = RefreshBodyView;
+                                            lightControl.Show(deviceUI, curRoom);
+                                        }
+                                        else
+                                        {
+                                            var lightControl = new Phone.Device.Light.LightControl();
+                                            UserView.HomePage.Instance.AddChidren(lightControl);
+                                            UserView.HomePage.Instance.PageIndex += 1;
+                                            //lightControl.action = RefreshBodyView;
+                                            lightControl.Show(deviceUI, curRoom);
+                                        }
+                                    };
+
+                                    var editBtn = new CommonForm.RowLayoutEditButton()
+                                    {
+                                        Tag = deviceUI,
+                                        Radius = 0
+                                    };
+                                    var delBtn = new CommonForm.RowLayoutDeleteButton()
+                                    {
+                                        Tag = deviceUI,
+                                        Radius = 0
+                                    };
+                                    if (curRoom.IsSharedRoom == false)
+                                    {
+                                        deviceTypeRowLayout.AddRightView(editBtn);
+                                        editBtn.MouseUpEventHandler += deviceDetailHandler;
+                                        deviceTypeRowLayout.AddRightView(delBtn);
+                                        delBtn.MouseUpEventHandler += delEvent;
+                                    }
+                                }
+                            }
+                            else if (deviceUI.CommonDevice.Type == DeviceType.AirSwitch)
+                            {
+                                //绌烘皵寮�鍏�
+                                var airSwitch = deviceUI.CommonDevice as AirSwitch;
+                                if (airSwitch.Gateway != null)
+                                {
+                                    new System.Threading.Thread(() =>
+                                    {
+                                        System.Threading.Thread.Sleep(100 * i);
+                                        if (airSwitch.Gateway.IsVirtual)
+                                        {
+                                            UserHomeView.ReadStatus(airSwitch, () =>
+                                            {
+                                                ReadDeviceAttributeLogic.Instance.SendLightStatuComand(deviceUI.CommonDevice);
+                                            });
+                                        }
+                                        else
+                                        {
+                                            if ((DateTime.Now - airSwitch.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
+                                            {
+                                                ReadDeviceAttributeLogic.Instance.SendLightStatuComand(deviceUI.CommonDevice);
+                                            }
+                                        }
+                                    })
+                                    { IsBackground = true }.Start();
+
+                                    var deviceTypeRowLayout = new RowLayout()
+                                    {
+                                        Height = Application.GetRealHeight(129 + 35),
+                                        LineColor = ZigbeeColor.Current.GXCBackgroundColor,
+                                        Tag = deviceUI
+                                    };
+                                    deviceListScrolView.AddChidren(deviceTypeRowLayout);
+
+                                    var deviceRow = new CategoryFunctionRow(0, 35);
+                                    deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
+                                    deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+                                    //deviceRow.SetOnLineStatu(airSwitch.IsOnline == 1);
+                                    deviceRow.IsSelected = airSwitch.OnOffStatus == 1;
+                                    deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
+                                    deviceTypeRowLayout.AddChidren(deviceRow);
+
+                                    deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
+                                    {
+                                        zbGateway = deviceUI.CommonDevice.Gateway;
+                                        sendedControlCommand = false;
+                                        zbGateway.ReportAction += UpdateDeviceControllStatu;
+                                        AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);
+                                        (send2 as Button).IsSelected = !(send2 as Button).IsSelected;
+                                        deviceRow.IsSelected = (send2 as Button).IsSelected;
+                                        if ((send2 as Button).IsSelected)
+                                        {
+                                            airSwitch.SwitchControl(1);
+                                        }
+                                        else
+                                        {
+                                            airSwitch.SwitchControl(0);
+                                        }
+                                        deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
+                                        //鎺у埗寤舵椂鍥炶皟
+                                        DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
+                                        {
+                                            if (Parent == null)
+                                            {
+                                                return;
+                                            }
+                                            RemoveUpdateControlDeviceStatuAction(zbGateway);
+                                            if (sendedControlCommand == false)
+                                            {
+                                                DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
+                                            }
+                                        });
+                                    };
+
+                                    deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
+                                    {
+
+                                        var lightControl = new Phone.Device.Light.AirSwitchControl();
+                                        UserView.HomePage.Instance.AddChidren(lightControl);
+                                        UserView.HomePage.Instance.PageIndex += 1;
+                                        //lightControl.action = RefreshBodyView;
+                                        lightControl.Show(deviceUI, curRoom);
+                                    };
+
+                                    var editBtn = new CommonForm.RowLayoutEditButton()
+                                    {
+                                        Tag = deviceUI,
+                                        Radius = 0
+                                    };
+                                    var delBtn = new CommonForm.RowLayoutDeleteButton()
+                                    {
+                                        Tag = deviceUI,
+                                        Radius = 0
+                                    };
+                                    if (curRoom.IsSharedRoom == false)
+                                    {
+                                        deviceTypeRowLayout.AddRightView(editBtn);
+                                        editBtn.MouseUpEventHandler += deviceDetailHandler;
+                                        deviceTypeRowLayout.AddRightView(delBtn);
+                                        delBtn.MouseUpEventHandler += delEvent;
+                                    }
+                                }
+                            }
+                            else if (deviceUI.CommonDevice.Type == DeviceType.DimmableLight)
+                            {
+                                //璋冨厜鐏�
+                                var dimmableLight = deviceUI.CommonDevice as ZigBee.Device.DimmableLight;
+                                if (dimmableLight.Gateway != null)
+                                {
+                                    new System.Threading.Thread(() =>
+                                    {
+                                        System.Threading.Thread.Sleep(100 * i);
+                                        if (dimmableLight.Gateway.IsVirtual)
+                                        {
+                                            UserHomeView.ReadStatus(dimmableLight, () =>
+                                            {
+                                                ReadDeviceAttributeLogic.Instance.SendDimmableLightStatuComand(deviceUI.CommonDevice);
+                                            });
+                                        }
+                                        else
+                                        {
+                                            if ((DateTime.Now - dimmableLight.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
+                                            {
+                                                ReadDeviceAttributeLogic.Instance.SendDimmableLightStatuComand(deviceUI.CommonDevice);
+                                            }
+                                        }
+                                    })
+                                    { IsBackground = true }.Start();
+
+                                    var deviceTypeRowLayout = new RowLayout()
+                                    {
+                                        Height = Application.GetRealHeight(129 + 35),
+                                        LineColor = ZigbeeColor.Current.GXCBackgroundColor,
+                                        Tag = deviceUI
+                                    };
+                                    deviceListScrolView.AddChidren(deviceTypeRowLayout);
+
+                                    var deviceRow = new CategoryFunctionRow(0, 35);
+                                    deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
+                                    deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+                                    //deviceRow.SetOnLineStatu(dimmableLight.IsOnline == 1);
+                                    deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
+                                    deviceRow.IsSelected = dimmableLight.OnOffStatus == 1;
+                                    deviceTypeRowLayout.AddChidren(deviceRow);
+
+                                    deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
+                                    {
+                                        zbGateway = deviceUI.CommonDevice.Gateway;
+                                        sendedControlCommand = false;
+                                        zbGateway.ReportAction += UpdateDeviceControllStatu;
+                                        AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);
+                                        (send2 as Button).IsSelected = !(send2 as Button).IsSelected;
+                                        deviceRow.IsSelected = (send2 as Button).IsSelected;
+                                        if ((send2 as Button).IsSelected)
+                                        {
+                                            dimmableLight.SwitchControl(1);
+                                        }
+                                        else
+                                        {
+                                            dimmableLight.SwitchControl(0);
+                                        }
+                                        deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
+                                        //鎺у埗寤舵椂鍥炶皟
+                                        DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
+                                        {
+                                            if (Parent == null)
+                                            {
+                                                return;
+                                            }
+                                            RemoveUpdateControlDeviceStatuAction(zbGateway);
+                                            if (sendedControlCommand == false)
+                                            {
+                                                DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
+                                            }
+                                        });
+                                    };
+
+                                    deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
+                                    {
+                                        var dimmableLightControl = new Phone.Device.Light.DimmableLightControl();
+                                        UserView.HomePage.Instance.AddChidren(dimmableLightControl);
+                                        UserView.HomePage.Instance.PageIndex += 1;
+                                        UserView.HomePage.Instance.ScrollEnabled = false;
+                                        //dimmableLightControl.action = RefreshBodyView;
+                                        dimmableLightControl.Show(deviceUI, curRoom);
+                                    };
+
+                                    var editBtn = new CommonForm.RowLayoutEditButton()
+                                    {
+                                        Tag = deviceUI,
+                                        Radius = 0
+                                    };
+                                    var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
+                                    {
+                                        Tag = deviceUI,
+                                        Radius = 0
+                                    };
+                                    if (curRoom.IsSharedRoom == false)
+                                    {
+                                        deviceTypeRowLayout.AddRightView(editBtn);
+                                        editBtn.MouseUpEventHandler += deviceDetailHandler;
+                                        deviceTypeRowLayout.AddRightView(delBtn);
+                                        delBtn.MouseUpEventHandler += delEvent;
+                                    }
+                                }
+                            }
+                            else if (deviceUI.CommonDevice.Type == DeviceType.Thermostat)
+                            {
+                                //绌鸿皟
+                                var ac = deviceUI.CommonDevice as ZigBee.Device.AC;
+                                if (ac.Gateway != null)
+                                {
+                                    new System.Threading.Thread(() =>
+                                    {
+                                        System.Threading.Thread.Sleep(100 * i);
+                                        if (ac.Gateway.IsVirtual)
+                                        {
+                                            //鍙戦�佽鍙栫姸鎬佸懡浠�
+                                            UserView.UserHomeView.ReadStatus(ac, () =>
+                                            {
+                                                ReadDeviceAttributeLogic.Instance.SendACStatuComand(deviceUI.CommonDevice);
+                                            });
+                                        }
+                                        else
+                                        {
+                                            //闃叉鐭椂闂村唴澶氭璇诲彇璁惧鐘舵��
+                                            if ((DateTime.Now - ac.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
+                                            {
+                                                ReadDeviceAttributeLogic.Instance.SendACStatuComand(deviceUI.CommonDevice);
+                                            }
+                                        }
+                                    })
+                                    { IsBackground = true }.Start();
+
+                                    var deviceTypeRowLayout = new RowLayout()
+                                    {
+                                        Height = Application.GetRealHeight(129 + 35),
+                                        LineColor = ZigbeeColor.Current.GXCBackgroundColor,
+                                        Tag = deviceUI
+                                    };
+                                    deviceListScrolView.AddChidren(deviceTypeRowLayout);
+
+                                    var deviceRow = new CategoryFunctionRow(0, 35);
+                                    deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
+                                    deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+                                    //deviceRow.SetOnLineStatu(ac.IsOnline == 1);
+                                    deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
+                                    deviceRow.IsSelected = ac.currentSystemMode != 1;
+                                    deviceTypeRowLayout.AddChidren(deviceRow);
+
+                                    deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
+                                    {
+                                        zbGateway = deviceUI.CommonDevice.Gateway;
+                                        sendedControlCommand = false;
+                                        zbGateway.ReportAction += UpdateDeviceControllStatu;
+                                        AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);
+
+                                        (send2 as Button).IsSelected = !(send2 as Button).IsSelected;
+                                        deviceRow.IsSelected = (send2 as Button).IsSelected;
+                                        if ((send2 as Button).IsSelected)
+                                        {
+                                            ac.Open();
+                                        }
+                                        else
+                                        {
+                                            ac.Close();
+                                        }
+                                        deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
+                                        //鎺у埗寤舵椂鍥炶皟
+                                        DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
+                                        {
+                                            if (Parent == null)
+                                            {
+                                                return;
+                                            }
+                                            RemoveUpdateControlDeviceStatuAction(zbGateway);
+                                            if (sendedControlCommand == false)
+                                            {
+                                                DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
+                                            }
+                                        });
+                                    };
+
+                                    var editBtn = new CommonForm.RowLayoutEditButton()
+                                    {
+                                        Tag = deviceUI,
+                                        Radius = 0
+                                    };
+                                    var delBtn = new CommonForm.RowLayoutDeleteButton()
+                                    {
+                                        Tag = deviceUI,
+                                        Radius = 0
+                                    };
+                                    if (curRoom.IsSharedRoom == false)
+                                    {
+                                        deviceTypeRowLayout.AddRightView(editBtn);
+                                        editBtn.MouseUpEventHandler += deviceDetailHandler;
+                                        deviceTypeRowLayout.AddRightView(delBtn);
+                                        delBtn.MouseUpEventHandler += delEvent;
+                                    }
+
+                                    deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
+                                    {
+                                        var acControl = new Phone.Device.AC.ACControl();
+                                        UserView.HomePage.Instance.AddChidren(acControl);
+                                        UserView.HomePage.Instance.PageIndex += 1;
+                                        UserView.HomePage.Instance.ScrollEnabled = false;
+                                        //rollerShadeControl.action = RefreshBodyView;
+                                        acControl.Show(deviceUI, curRoom);
+                                    };
+                                }
+                            }
+                            else if (deviceUI.CommonDevice.Type == DeviceType.WindowCoveringDevice)
+                            {
+                                //鍗峰笜
+                                var rollerShade = deviceUI.CommonDevice as ZigBee.Device.Rollershade;
+                                if (rollerShade.Gateway != null)
+                                {
+                                    new System.Threading.Thread(() =>
+                                    {
+                                        System.Threading.Thread.Sleep(100 * i);
+                                        if (rollerShade.Gateway.IsVirtual)
+                                        {
+                                            UserHomeView.ReadStatus(rollerShade, () =>
+                                            {
+                                                ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(deviceUI.CommonDevice);
+                                            });
+                                        }
+                                        else
+                                        {
+                                            //闃叉鐭椂闂村唴澶氭璇诲彇
+                                            if ((DateTime.Now - rollerShade.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
+                                            {
+                                                ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(deviceUI.CommonDevice);
+                                            }
+                                        }
+                                    })
+                                    { IsBackground = true }.Start();
+
+                                    var deviceTypeRowLayout = new RowLayout()
+                                    {
+                                        Height = Application.GetRealHeight(129 + 35),
+                                        LineColor = ZigbeeColor.Current.GXCBackgroundColor,
+                                        Tag = deviceUI
+                                    };
+                                    deviceListScrolView.AddChidren(deviceTypeRowLayout);
+
+                                    var deviceRow = new CategoryFunctionForWinRow(0, 35);
+                                    deviceRow.Init(deviceUI);
+                                    deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+                                    //deviceRow.SetOnLineStatu(rollerShade.IsOnline == 1);
+                                    deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
+                                    deviceRow.IsSelected = rollerShade.WcdCurrentPositionLiftPercentage != 0;
+                                    deviceRow.SetRollerShadeIcon(rollerShade.WcdType);
+                                    deviceTypeRowLayout.AddChidren(deviceRow);
+
+                                    if (rollerShade.WcdType == -1)
+                                    {
+                                        CommonPage.Loading.Start();
+                                        new System.Threading.Thread(() =>
+                                        {
+                                            Rollershade.ReadWcdTypeAction(rollerShade, () =>
+                                            {
+                                                Application.RunOnMainThread(() =>
+                                                {
+                                                    deviceRow.SetRollerShadeIcon(rollerShade.WcdType);
+                                                    CommonPage.Loading.Hide();
+                                                });
+                                            });
+                                        })
+                                        { IsBackground = true }.Start();
+                                    }
+
+                                    var editBtn = new CommonForm.RowLayoutEditButton()
+                                    {
+                                        Tag = deviceUI,
+                                        Radius = 0
+                                    };
+                                    var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
+                                    {
+                                        Tag = deviceUI,
+                                        Radius = 0
+                                    };
+                                    if (curRoom.IsSharedRoom == false)
+                                    {
+                                        deviceTypeRowLayout.AddRightView(editBtn);
+                                        editBtn.MouseUpEventHandler += deviceDetailHandler;
+                                        deviceTypeRowLayout.AddRightView(delBtn);
+                                        delBtn.MouseUpEventHandler += delEvent;
+                                    }
+
+                                    deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
+                                    {
+                                        var rollerShadeControl = new Phone.Device.Curtain.RollerShadeControl();
+                                        UserView.HomePage.Instance.AddChidren(rollerShadeControl);
+                                        UserView.HomePage.Instance.PageIndex += 1;
+                                        UserView.HomePage.Instance.ScrollEnabled = false;
+                                        //rollerShadeControl.action = RefreshBodyView;
+                                        rollerShadeControl.Show(deviceUI, curRoom);
+                                    };
+                                }
+                            }
+                            else if (deviceUI.CommonDevice.Type == DeviceType.DoorLock)
+                            {
+                                var deviceTypeRowLayout = new RowLayout()
+                                {
+                                    Height = Application.GetRealHeight(129 + 35),
+                                    LineColor = ZigbeeColor.Current.GXCBackgroundColor,
+                                    Tag = deviceUI
+                                };
+                                deviceListScrolView.AddChidren(deviceTypeRowLayout);
+
+                                var deviceRow = new CategoryFunctionRow(0, 35);
+                                deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
+                                deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+                                //deviceRow.SetOnLineStatu(deviceUI.CommonDevice.IsOnline == 1);
+                                deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
+                                deviceRow.HideSwitchBtn(true);
+                                deviceTypeRowLayout.AddChidren(deviceRow);
+
+                                deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
+                                {
+                                    var userDoorLockPage = new UserDoorLockPage(curRoom, deviceUI);
+                                    HomePage.Instance.AddChidren(userDoorLockPage);
+                                    HomePage.Instance.PageIndex += 1;
+                                    userDoorLockPage.Show();
+                                };
+
+                                var editBtn = new CommonForm.RowLayoutEditButton()
+                                {
+                                    Tag = deviceUI
+                                };
+                                var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
+                                {
+                                    Tag = deviceUI
+                                };
+                                if (curRoom.IsSharedRoom == false)
+                                {
+                                    deviceTypeRowLayout.AddRightView(editBtn);
+                                    editBtn.MouseUpEventHandler += deviceDetailHandler;
+                                    deviceTypeRowLayout.AddRightView(delBtn);
+                                    delBtn.MouseUpEventHandler += delEvent;
+                                }
+                            }
+                            else if (deviceUI.CommonDevice.Type == DeviceType.IASZone)
+                            {
+                                var deviceTypeRowLayout = new RowLayout()
+                                {
+                                    Height = Application.GetRealHeight(129 + 35),
+                                    LineColor = ZigbeeColor.Current.GXCBackgroundColor,
+                                    Tag = deviceUI
+                                };
+                                deviceListScrolView.AddChidren(deviceTypeRowLayout);
+
+                                var deviceRow = new CategoryFunctionRow(0, 35);
+                                deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
+                                deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+                                deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
+                                deviceRow.IsSelected = (deviceUI.CommonDevice as IASZone).iASInfo?.Alarm1 == 1;
+                                deviceRow.HideSwitchBtn(true);
+                                deviceTypeRowLayout.AddChidren(deviceRow);
+
+                                deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
+                                {
+                                    var userDoorLockPage = new UserDoorLockPage(curRoom, deviceUI);
+                                    HomePage.Instance.AddChidren(userDoorLockPage);
+                                    HomePage.Instance.PageIndex += 1;
+                                    userDoorLockPage.Show();
+                                };
+
+                                var editBtn = new CommonForm.RowLayoutEditButton()
+                                {
+                                    Tag = deviceUI
+                                };
+                                var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
+                                {
+                                    Tag = deviceUI
+                                };
+                                if (curRoom.IsSharedRoom == false)
+                                {
+                                    deviceTypeRowLayout.AddRightView(editBtn);
+                                    editBtn.MouseUpEventHandler += deviceDetailHandler;
+                                    deviceTypeRowLayout.AddRightView(delBtn);
+                                    delBtn.MouseUpEventHandler += delEvent;
+                                }
+                            }
+                            else
+                            {
+                                var deviceTypeRowLayout = new RowLayout()
+                                {
+                                    Height = Application.GetRealHeight(129 + 35),
+                                    LineColor = ZigbeeColor.Current.GXCBackgroundColor,
+                                    Tag = deviceUI
+                                };
+                                deviceListScrolView.AddChidren(deviceTypeRowLayout);
+
+                                var deviceRow = new CategoryFunctionRow(0, 35);
+                                deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
+                                deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+                                //deviceRow.SetOnLineStatu(deviceUI.CommonDevice.IsOnline == 1);
+                                deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
+                                deviceRow.HideSwitchBtn(true);
+                                deviceTypeRowLayout.AddChidren(deviceRow);
+
+                                var editBtn = new CommonForm.RowLayoutEditButton()
+                                {
+                                    Tag = deviceUI
+                                };
+                                var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
+                                {
+                                    Tag = deviceUI
+                                };
+                                if (curRoom.IsSharedRoom == false)
+                                {
+                                    deviceTypeRowLayout.AddRightView(editBtn);
+                                    editBtn.MouseUpEventHandler += deviceDetailHandler;
+                                    deviceTypeRowLayout.AddRightView(delBtn);
+                                    delBtn.MouseUpEventHandler += delEvent;
+                                }
+                            }
+                        }
+                        catch
+                        {
+
+                        }
+                    });
+                })
+                { IsBackground = true }.Start();
             }
         }
 
@@ -1529,36 +1710,27 @@
             };
             functionSceneAutoBodyView.AddChidren(functionSceneBodyView);
 
-            Button curBtn = new Button();
+            RoomButton curBtn = new RoomButton(0,0);
             foreach (var room in Common.Room.CurrentRoom.GetRoomsByCurrentFloorIdAppendLoveRoom())
             {
                 var row = new FrameLayout()
                 {
-                    Width = Application.GetRealWidth(187 + 50),
+                    Width = Application.GetRealWidth(255),
                     Height = Application.GetRealHeight(167)
                 };
                 roomFL.AddChidren(row);
 
-                var roomBtn = new Button()
-                {
-                    Width = Application.GetRealWidth(187),
-                    Height = Application.GetRealHeight(78),
-                    Radius = (uint)Application.GetRealHeight(78 / 2),
-                    Gravity = Gravity.Center,
-                    Text = room.Name,
-                    TextColor = ZigbeeColor.Current.GXCTextGrayColor,
-                    SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
-                    BackgroundColor = ZigbeeColor.Current.GXCButtonUnSelectedColor3,
-                    SelectedBackgroundColor = ZigbeeColor.Current.GXCButtonSelectedColor,
-                    BorderColor = ZigbeeColor.Current.GXCBorderUnSelectedColor,
-                    BorderWidth = 1
-                };
+                RoomButton roomBtn = new RoomButton(0, 0);
+                roomBtn.Gravity = Gravity.Center;
+                roomBtn.Init();
+                roomBtn.SetTitle(room.Name);
                 row.AddChidren(roomBtn);
+
                 if (room.IsLove)
                 {
                     roomBtn.IsSelected = true;
+                    this.curRoom = room;
                     curBtn = roomBtn;
-
                     if(sceneBtn.IsSelected)
                     {
                         RefreshScene(room);
@@ -1567,17 +1739,17 @@
                     {
                         RefreshFunction(room);
                     }
-
                 }
-                roomBtn.MouseUpEventHandler += (sender, e) =>
+                roomBtn.ButtonClickEvent += (sender, e) =>
                 {
-                    if ((sender as Button) == curBtn)
+                    if (sender  == curBtn)
                     {
                         return;
                     }
-                    (sender as Button).IsSelected = true;
+                    sender.IsSelected = true;
                     curBtn.IsSelected = false;
-                    curBtn = sender as Button;
+                    curBtn = sender;
+                    this.curRoom = room;
                     if (sceneBtn.IsSelected)
                     {
                         RefreshScene(room);
@@ -1588,7 +1760,6 @@
                     }
                 };
             }
-
         }
 
         #endregion
@@ -1608,252 +1779,22 @@
         /// <param name="room"></param>
         public void RefreshScene(Common.Room room)
         {
+            RefreshData(room);
             functionSceneBodyView.RemoveAll();
-            var sceneList = room.SceneUIList;
             if (sceneList.Count == 0)
             {
                 ShowNoSceneTip();
             }
             else
             {
-                var sceneScrolView = new VerticalScrolViewLayout
-                {
-                    //Y = Application.GetRealHeight(58)
-                };
+                var sceneScrolView = new VerticalScrolViewLayout { };
                 functionSceneBodyView.AddChidren(sceneScrolView);
                 foreach (var scene in sceneList)
                 {
-                    var sceneFL = new FrameLayout()
-                    {
-                        Height = Application.GetRealHeight(446),
-                        BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor,
-                        Tag = scene
-                    };
-                    sceneScrolView.AddChidren(sceneFL);
-                    var sceneRowLayout = new RowLayout
-                    {
-                        Y = Application.GetRealHeight(46),
-                        Height = Application.GetRealHeight(446 - 46),
-                        LineColor = ZigbeeColor.Current.GXCGrayBackgroundColor,
-                        Radius = CommonPage.BigFormRadius
-                    };
-                    sceneFL.AddChidren(sceneRowLayout);
-
-                    var sceneImg = new Button()
-                    {
-                        X = Application.GetRealWidth(179),
-                        Width = Application.GetRealWidth(844),
-                        Height = Application.GetRealHeight(400),
-                        UnSelectedImagePath = scene.IconPath,
-                        Radius = (uint)Application.GetRealHeight(17)
-                    };
-                    sceneRowLayout.AddChidren(sceneImg);
-
-                    var leftFL = new FrameLayout
-                    {
-                        X = Application.GetRealWidth(CommonFormResouce.X_Left),
-                        Y = Application.GetRealHeight(58),
-                        Width = Application.GetRealWidth(251),
-                        Height = Application.GetRealHeight(282),
-                        BackgroundColor = ZigbeeColor.Current.GXCBlackBackgroundColor2,
-                        Radius = (uint)Application.GetRealHeight(17)
-                    };
-                    sceneRowLayout.AddChidren(leftFL);
-
-                    var collectionBtn = new Button
-                    {
-                        X = Application.GetRealWidth(23),
-                        Y = Application.GetRealHeight(23),
-                        Width = Application.GetMinRealAverage(65),
-                        Height = Application.GetMinRealAverage(65),
-                        UnSelectedImagePath = "Item/Collection.png",
-                        SelectedImagePath = "Item/CollectionSelected.png",
-                        IsSelected = Common.Room.CurrentRoom.GetLoveRoom().SceneUIFilePathList.Contains(scene.FileName),
-                        Tag = scene
-                    };
-                    leftFL.AddChidren(collectionBtn);
-
-                    var sceneNameBtn = new Button()
-                    {
-                        Width = Application.GetRealWidth(176),
-                        Height = Application.GetRealHeight(150),
-                        TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
-                        Text = scene.Name,
-                        Gravity = Gravity.Center,
-                        IsMoreLines = true
-                    };
-                    leftFL.AddChidren(sceneNameBtn);
-
-                    var collection = new Button
-                    {
-                        Tag=scene
-                    };
-                    leftFL.AddChidren(collection);
-                    collection.MouseUpEventHandler += (sender, e) =>
-                    {
-                        if (room.IsLove)
-                        {
-                            Common.Room.CurrentRoom.GetLoveRoom().DeleteScene(scene);
-                            sceneScrolView.RemoveViewByTag(collectionBtn.Tag);
-                        }
-                        else
-                        {
-                            collectionBtn.IsSelected = !collectionBtn.IsSelected;
-                            if (collectionBtn.IsSelected)
-                            {
-                                Common.Room.CurrentRoom.GetLoveRoom().AddScene(scene);
-                            }
-                            else
-                            {
-                                Common.Room.CurrentRoom.GetLoveRoom().DeleteScene(scene);
-                            }
-                        }
-                    };
-
-                    //瀹氭椂
-                    var delayBtn = new RowLayoutDeleteButton
-                    {
-                        TextID = R.MyInternationalizationString.Delay,
-                        Tag = scene.SceneDelayTime
-                    };
-                    sceneRowLayout.AddLeftView(delayBtn);
-
-                    //缂栬緫
-                    var settingBtn = new Device.CommonForm.RowLayoutEditButton()
-                    {
-                        TextID = R.MyInternationalizationString.Editor,
-                        Tag = scene.SceneDelayTime
-                    };
-                    //鍒犻櫎
-                    var deleteBtn = new Device.CommonForm.RowLayoutDeleteButton
-                    {
-                        Tag = scene
-                    };
-
-
-                    if(room.IsSharedRoom)
-                    {
-
-                    }
-                    else
-                    {
-                        if(room.IsLove)
-                        {
-                            sceneRowLayout.AddRightView(deleteBtn);
-                        }
-                        else
-                        {
-                            sceneRowLayout.AddRightView(settingBtn);
-                            sceneRowLayout.AddRightView(deleteBtn);
-                        }
-                    }
-
-
-                    //璋冪敤鍦烘櫙
-                    EventHandler<MouseEventArgs> sceneUpHandler = async (sender, e) =>
-                    {
-                        //1鎴愬姛 0澶辫触
-                        //鍚庨潰琛ヤ笂鐩稿叧鎻愮ず
-                        //瑕佸厛浠庣綉鍏宠鍙栧欢鏃舵槸鍚︽鍦ㄦ墽琛岋紝濡傛灉鏄繘琛屽�掕鏃讹紝涓嶅厑璁稿湪鐐瑰嚮
-                        var sceneOpenAllData = await ZigBee.Device.Scene.ControlSceneAsync(scene.Id, scene.SceneDelayTime);
-                        //涓荤綉鍏充笉鍦ㄧ嚎
-                        if (sceneOpenAllData == null)
-                        {
-                            //CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.TheMainGatewayIsNotOnLine);
-                            CommonPage.Instance.FailureToServer();
-                            return;
-                        }
-                        if (sceneOpenAllData.sceneOpenData == null)
-                        {
-                            CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.FailedPleaseTryAgain);
-                            return;
-                        }
-                        //鎴愬姛
-                        if (sceneOpenAllData.sceneOpenData.Result == 1)
-                        {
-
-                        }
-                        //澶辫触
-                        else
-                        {
-                            CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.FailedPleaseTryAgain);
-                            return;
-                        }
-                    };
-                    sceneImg.MouseUpEventHandler += sceneUpHandler;
-                    //鍒犻櫎鍦烘櫙
-                    EventHandler<MouseEventArgs> delEvent = (sender, e) =>
-                    {
-                        if(room.IsLove)
-                        {
-                            Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteScene(scene);
-                            sceneScrolView.RemoveViewByTag((sender as Button).Tag);
-                        }
-                        else
-                        {
-                            var tip = new CustomAlert { };
-                            AddChidren(tip);
-                            tip.Show(Language.StringByID(R.MyInternationalizationString.ConfirmDelete));
-
-                            //var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.ConfirmDelete), Language.StringByID(R.MyInternationalizationString.Cancel), Language.StringByID(R.MyInternationalizationString.Confrim));
-                            //alert.Show();
-                            tip.ResultEventHandler += async (e1) =>
-                            {
-                                if (e1)
-                                {
-                                    //0 绉婚櫎澶辫触 1 绉婚櫎鎴愬姛 2 娌℃湁璇ュ満鏅�
-                                    var removeSceneAllData = await ZigBee.Device.Scene.DeleteSceneAsync(scene.Id);
-                                    if (removeSceneAllData == null || removeSceneAllData.removeSceneData == null)
-                                    {
-                                        //CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.TheMainGatewayIsNotOnLine);
-                                        CommonPage.Instance.FailureToServer();
-                                        return;
-                                    }
-                                    //1鎴愬姛
-                                    if (removeSceneAllData.removeSceneData.Result == 1)
-                                    {
-                                        room.RemoveScene(scene);
-                                        //RefreshBodyView();
-                                        sceneScrolView.RemoveViewByTag((sender as Button).Tag);
-                                    }
-                                    //0 绉婚櫎澶辫触
-                                    else if (removeSceneAllData.removeSceneData.Result == 0)
-                                    {
-                                        CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.FailedPleaseTryAgain);
-                                        return;
-                                    }
-                                    //2 娌℃湁璇ュ満鏅�
-                                    else if (removeSceneAllData.removeSceneData.Result == 2)
-                                    {
-                                        room.RemoveScene(scene);
-                                        //RefreshBodyView();
-                                        sceneScrolView.RemoveViewByTag((sender as Button).Tag);
-                                        CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.TheSceneIsNull);
-                                        return;
-                                    }
-                                }
-                            };
-                        }
-
-                    };
-                    deleteBtn.MouseUpEventHandler += delEvent;
-                    //缂栬緫鍦烘櫙
-                    settingBtn.MouseUpEventHandler += (sender, e) =>
-                    {
-                        SceneUI.EditScene(scene, room);
-                    };
-                    //缂栬緫寤舵椂
-                    delayBtn.MouseUpEventHandler += (sender, e) =>
-                    {
-                        var timeSelect = new SelectTime();
-                        CommonPage.Instance.AddChidren(timeSelect);
-                        timeSelect.TempTime = scene.SceneDelayTime;
-                        timeSelect.Init();
-                        timeSelect.TimeAction = (t) =>
-                        {
-                            scene.SceneDelayTime = t;
-                        };
-                    };
+                    var sceneView = new SceneCategoryView(0, 0);
+                    sceneScrolView.AddChidren(sceneView);
+                    sceneView.Init(scene, room);
+                    GetDelayScene(sceneScrolView);
                 }
             }
         }
@@ -1888,8 +1829,72 @@
         }
 
 
-        #endregion
+        /// <summary>
+        /// GetDelayScene
+        /// </summary>
+        /// <param name="scrolViewLayout"></param>
+        private async void GetDelayScene(VerticalScrolViewLayout scrolViewLayout)
+        {
+            var catDelaySceneResponseAllData = await Scene.CatDelaySceneAsync();
+            if (catDelaySceneResponseAllData == null)
+            {
+                return;
+            }
+            var catDelaySceneResponseData = catDelaySceneResponseAllData.catDelaySceneResponseData;
+            if (catDelaySceneResponseData == null || catDelaySceneResponseData.DelayScenesList.Count == 0)
+            {
+                return;
+            }
+            var delayList = catDelaySceneResponseData.DelayScenesList;
 
+            for (int i = 0; scrolViewLayout != null && i < scrolViewLayout.ChildrenCount; i++)
+            {
+                var sceneView = scrolViewLayout.GetChildren(i) as SceneCategoryView;
+                foreach (var delayScenesListResponseInfo in delayList)
+                {
+                    if (delayScenesListResponseInfo.ScenesId == sceneView.scene.Id)
+                    {
+                        sceneView.scene.RemainTime = delayScenesListResponseInfo.RemainTime;
+                        var remainTime= delayScenesListResponseInfo.RemainTime;
+                        if (remainTime > 0)
+                        {
+                            new System.Threading.Thread(() =>
+                            {
+                                while (remainTime-- > 0)
+                                {
+                                    System.Threading.Thread.Sleep(1000);
+                                    Application.RunOnMainThread(() =>
+                                    {
+                                        sceneView.SetTimeText(CommonFormResouce.GetTimeString(remainTime));
+                                    });
+                                }
+                                Application.RunOnMainThread(() =>
+                                {
+                                    sceneView.scene.RemainTime = 0;
+                                    sceneView.SetTimeImage();
+                                });
+                            })
+                            { IsBackground = true }.Start();
+                        }
+                        break;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// GetExecScene
+        /// </summary>
+        /// <param name="scrolViewLayout"></param>
+        private void GetExecScene(VerticalScrolViewLayout scrolViewLayout)
+        {
+            new System.Threading.Thread(() =>
+            {
+
+            })
+            { IsBackground = true }.Start();
+        }
+        #endregion
 
         #region 鈼� 鑷姩鍖朹_________________________
 
@@ -1907,11 +1912,11 @@
                 Height = Application.GetRealHeight(170),
                 BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
                 X = Application.GetRealWidth(58),
-                Radius = (uint)Application.GetRealHeight(50),
+                //Radius = (uint)Application.GetRealHeight(50),
                 Y = Application.GetRealHeight(30),
             };
             functionSceneAutoBodyView.AddChidren(bjFrameLayout);
-
+            bjFrameLayout.SetCornerWithSameRadius(25, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);
             var sigBtn = new Button
             {
                 Width = Application.GetMinRealAverage(84),
@@ -1932,6 +1937,7 @@
                 TextID = MyInternationalizationString.logictemplate,
                 Gravity = Gravity.CenterVertical,
                 TextColor = ZigbeeColor.Current.LogicBtnSelectedColor,
+                TextSize=15,
             };
             bjFrameLayout.AddChidren(recommendtextBtn);
 
@@ -1961,10 +1967,11 @@
                 Height = functionSceneAutoBodyView.Height - bjFrameLayout.Height - bjFrameLayout.Y - scenehorizontalScrol.Height - Application.GetRealHeight(30),
                 BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
                 X = Application.GetRealWidth(58),
-                Radius = (uint)Application.GetRealHeight(50),
+                //Radius = (uint)Application.GetRealHeight(50),
                 Y = scenehorizontalScrol.Bottom,
             };
             functionSceneAutoBodyView.AddChidren(logicScrolView);
+            logicScrolView.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);
 
 
             recommendswitchBtn.MouseUpEventHandler += (sender, e) =>
@@ -2002,6 +2009,7 @@
                             Y = Application.GetRealHeight(246 - 23 - 80),
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+                            TextSize = 14,
                         };
                         frameLayout.AddChidren(logicnameBtn);
 
@@ -2112,6 +2120,7 @@
                     Y = Application.GetRealHeight(30),
                     TextAlignment = TextAlignment.CenterLeft,
                     TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                    TextSize = 14,
                 };
                 logicRowlayout.AddChidren(logicnameBtn);
 

--
Gitblit v1.8.0