From b94f318b1cb5c3618dd53b5240c1d999c8427b71 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 29 十一月 2019 13:09:25 +0800
Subject: [PATCH] 2019.11.29

---
 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs |   66 +++++++-------------------------
 1 files changed, 15 insertions(+), 51 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
index 25ca514..03ff3a0 100644
--- a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
@@ -6,6 +6,7 @@
 using Shared.Phone.Device.CommonForm;
 using Shared.Phone.UserCenter.DoorLock;
 using System.Timers;
+using Shared.Phone.Device.DeviceLogic;
 
 namespace Shared.Phone.UserView
 {
@@ -652,12 +653,11 @@
                         BackgroundImagePath = room.BackgroundImage
                     };
                     roomPageView.AddChidren(roomBackView);
-                    var roomBG = new Button()
+                    if (room.BackgroundImageType != 0)
                     {
-                        UnSelectedImagePath = "Room/HomeBG.png",
-                        //UnSelectedImagePath = room.BackgroundImage
-                    };
-                    roomBackView.AddChidren(roomBG);
+                        roomBackView.BackgroundImagePath = System.IO.Path.Combine(Config.Instance.FullPath, room.BackgroundImage);
+                    }
+
                     var roomName = new Button()
                     {
                         X = Application.GetRealWidth(20),
@@ -1019,14 +1019,14 @@
                             //鍙戦�佽鍙栫姸鎬佸懡浠�
                             ReadStatus(rollerShade, () =>
                             {
-                                rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+                                ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(device.CommonDevice);
                             });
                         }
                         else
                         {
                             if (CommonPage.ReadDeviceStatuSpan < (DateTime.Now - rollerShade.LastDateTime).TotalSeconds)
                             {
-                                rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+                                ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(device.CommonDevice);
                             }
                         }
                         var lightView = new FunctionMainView(xx, yy);
@@ -1124,16 +1124,14 @@
                             //鍙戦�佽鍙栫姸鎬佸懡浠�
                             ReadStatus(light, () =>
                             {
-                                light.ReadOnOffStatus();
-                                light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+                                ReadDeviceAttributeLogic.Instance.SendLightStatuComand(device.CommonDevice);
                             });
                         }
                         else
                         {
                             if (CommonPage.ReadDeviceStatuSpan < (DateTime.Now - light.LastDateTime).TotalSeconds)
                             {
-                                light.ReadOnOffStatus();
-                                light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+                                ReadDeviceAttributeLogic.Instance.SendLightStatuComand(device.CommonDevice);
                             }
                         }
 
@@ -1259,8 +1257,7 @@
                             //鍙戦�佽鍙栫姸鎬佸懡浠�
                             ReadStatus(airSwitch, () =>
                             {
-                                airSwitch.ReadOnOffStatus();
-                                airSwitch.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+                                ReadDeviceAttributeLogic.Instance.SendLightStatuComand(device.CommonDevice);
                             });
                         }
                         else
@@ -1268,8 +1265,7 @@
                             //闃叉鐭椂闂村唴澶氭璇诲彇璁惧鐘舵��
                             if ((DateTime.Now - airSwitch.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
                             {
-                                airSwitch.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
-                                airSwitch.ReadOnOffStatus();
+                                ReadDeviceAttributeLogic.Instance.SendLightStatuComand(device.CommonDevice);
                             }
                         }
 
@@ -1367,15 +1363,7 @@
                             //鍙戦�佽鍙栫姸鎬佸懡浠�
                             ReadStatus(ac, () =>
                             {
-                                ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
-                                ac.ReadLocalTemperature();
-                                ac.ReadCoolingSetpoint();
-                                ac.ReadHeatingSetpoint();
-                                ac.ReadAutoSetpoint();
-                                ac.ReadFanMode();
-                                ac.ReadSystemMode();
-                                ac.ReadSystemFansSwingMode();
-                                ac.ReadModeSupport();
+                                ReadDeviceAttributeLogic.Instance.SendACStatuComand(device.CommonDevice);
                             });
                         }
                         else
@@ -1383,15 +1371,7 @@
                             //闃叉鐭椂闂村唴澶氭璇诲彇璁惧鐘舵��
                             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();
-                                ac.ReadModeSupport();
+                                ReadDeviceAttributeLogic.Instance.SendACStatuComand(device.CommonDevice);
                             }
                         }
                         var lightView = new FunctionMainView(xx, yy);
@@ -1486,8 +1466,7 @@
                             //鍙戦�佽鍙栫姸鎬佸懡浠�
                             ReadStatus(dimmableLight, () =>
                             {
-                                dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
-                                dimmableLight.ReadOnOffStatus();
+                                ReadDeviceAttributeLogic.Instance.SendDimmableLightStatuComand(device.CommonDevice);
                             });
                         }
                         else
@@ -1495,8 +1474,7 @@
                             //闃叉鐭椂闂村唴澶氭璇诲彇璁惧鐘舵��
                             if ((DateTime.Now - dimmableLight.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
                             {
-                                dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
-                                dimmableLight.ReadOnOffStatus();
+                                ReadDeviceAttributeLogic.Instance.SendDimmableLightStatuComand(device.CommonDevice);
                             }
                         }
 
@@ -1596,20 +1574,6 @@
                         if (dimmableLight.Gateway == null)
                         {
                             continue;
-                        }
-                        if (dimmableLight.Gateway.IsVirtual)
-                        {
-                            ReadStatus(dimmableLight, () =>
-                            {
-                                dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
-                            });
-                        }
-                        else
-                        {
-                            if ((DateTime.Now - dimmableLight.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
-                            {
-                                dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
-                            }
                         }
 
                         var lightView = new FunctionMainView(xx, yy);

--
Gitblit v1.8.0