From 1e76fa5a69bc478b3eb5738546aeb51b8fd6f7c9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 18 十一月 2019 16:30:41 +0800
Subject: [PATCH] 2019.11.18

---
 ZigbeeApp/Shared/Phone/Device/Category/Category.cs |   34 +++++++++++++++++++++++++++++++++-
 1 files changed, 33 insertions(+), 1 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
index 7fefc25..fa4e930 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -1402,7 +1402,7 @@
                                 rollerShadeControl.Show(deviceUI, room);
                             };
                         }
-                        else
+                        else if(deviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.DoorLock)
                         {
                             var deviceTypeRowLayout = new RowLayout()
                             {
@@ -1443,6 +1443,38 @@
                             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;
+                        }
                     }
                 };
 

--
Gitblit v1.8.0