From c6b35c3138b944830b5336bf610f918154dd47c7 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期六, 12 十月 2019 15:45:10 +0800
Subject: [PATCH] 合并门锁,完成住宅管理

---
 ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
index a1b5119..77e997b 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
@@ -212,12 +212,12 @@
                 else if (this.Type == DeviceType.ColorDimmableLight)
                 {
                     //褰╃伅
-                    IconPath = "Device/ColorDimmableLight.png";
+                    IconPath = "Device/ColorLight.png";
                 }
                 else if (this.Type == DeviceType.DimmableLight)
                 {
                     //璋冨厜鍣�
-                    IconPath = "Device/ColorDimmableLight.png";
+                    IconPath = "Device/Light.png";
                 }
                 else if (this.Type == DeviceType.OnOffOutput)
                 {
@@ -293,9 +293,9 @@
         /// </summary>
         public DeviceType Type = DeviceType.UnKown;
         /// <summary>
-        /// 璁惧鐨勫姛鑳界被鍨�(姝ょ被鍨嬬洰鍓嶅彧閽堝缁х數鍣ㄥ洖璺湁鏁�,榛樿涓虹伅鍏�)
+        /// 璁惧鐨勫姛鑳界被鍨�(姝ょ被鍨嬬洰鍓嶅彧閽堝缁х數鍣ㄥ洖璺湁鏁�,榛樿鏈寚瀹�)
         /// </summary>
-        public DeviceFunctionType DfunctionType = DeviceFunctionType.A鐏厜;
+        public DeviceFunctionType DfunctionType = DeviceFunctionType.A鏈畾涔�;
         /// <summary>
         /// MAC鍦板潃
         /// </summary>

--
Gitblit v1.8.0