From f270cd68364fad5766ec9060d7ce835fe6b456b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 24 七月 2020 14:44:06 +0800
Subject: [PATCH] 2020-07-24-2

---
 ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs         |    2 
 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml                   |   28 +++++++--
 ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs |   11 ---
 ZigbeeApp/Shared/Phone/Device/Logic/Method.cs            |   21 ++++++
 ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs |   92 ++++++++++--------------------
 5 files changed, 73 insertions(+), 81 deletions(-)

diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 72d7a3b..2af1f32 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,27 +1,41 @@
 锘�<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
   <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
   <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/Method.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicIfon.cs">
     <Files>
       <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="528" Column="78" />
-      <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="15" Column="122" />
-      <File FileName="Shared/Phone/Device/Logic/RoomAndDeviceView.cs" Line="447" Column="31" />
-      <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="265" Column="102" />
+      <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="1305" Column="48" />
+      <File FileName="Shared/Phone/Device/Logic/RoomAndDeviceView.cs" Line="495" Column="1" />
+      <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="121" Column="50" />
+      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="159" Column="42" />
+      <File FileName="Shared/Phone/Device/Logic/LogicDveiceStatus.cs" Line="180" Column="83" />
+      <File FileName="Shared/Phone/Device/Logic/Illumination.cs" Line="214" Column="31" />
+      <File FileName="Shared/Phone/Device/Logic/TemplatePage.cs" Line="136" Column="40" />
+      <File FileName="Shared/Phone/Device/Logic/LogicIfon.cs" Line="47" Column="67" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State name="__root__">
           <Node name="GateWay" expanded="True">
-            <Node name="GateWay.Droid" expanded="True" />
+            <Node name="GateWay.Droid" expanded="True">
+              <Node name="Assets" expanded="True">
+                <Node name="Phone" expanded="True">
+                  <Node name="ZigeeLogic" expanded="True" />
+                </Node>
+              </Node>
+            </Node>
             <Node name="Shared" expanded="True">
+              <Node name="Common" expanded="True" />
               <Node name="Phone" expanded="True">
                 <Node name="Device" expanded="True">
                   <Node name="Logic" expanded="True">
-                    <Node name="Method.cs" selected="True" />
+                    <Node name="LogicIfon.cs" selected="True" />
                   </Node>
                 </Node>
                 <Node name="UserCenter" expanded="True">
-                  <Node name="CommonBase" expanded="True" />
+                  <Node name="CommonBase" expanded="True">
+                    <Node name="Common" expanded="True" />
+                  </Node>
                 </Node>
                 <Node name="UserView" expanded="True" />
                 <Node name="ZigBee" expanded="True">
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs
index ebc0789..ae2e49c 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs
@@ -177,35 +177,41 @@
                                             {
                                                 case 13:
                                                     {
-                                                        if (conditions.ContainsKey("IgnoreTime"))
+                                                        if (conditions["Cluster_ID"] == "1024")
                                                         {
-                                                            int minute = int.Parse(conditions["IgnoreTime"]) / 60;
-                                                            int second = int.Parse(conditions["IgnoreTime"]) % 60;
-                                                            if (minute != 0 && second != 0)
-                                                            {
-                                                                state = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
-
-                                                            }
-                                                            else
-                                                            {
-                                                                if (minute == 0 && second != 0)
-                                                                {
-                                                                    state = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
-
-                                                                }
-                                                                if (minute != 0 && second == 0)
-                                                                {
-                                                                    state = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1);
-
-                                                                }
-
-                                                            }
+                                                            state = Language.StringByID(MyInternationalizationString.ambientLight) + "<" + conditions["AttriButeData1"] + "lux" + Language.StringByID(MyInternationalizationString.hour1);
                                                         }
                                                         else
                                                         {
-                                                            state = Language.StringByID(MyInternationalizationString.someone);
-                                                        }
+                                                            if (conditions.ContainsKey("IgnoreTime"))
+                                                            {
+                                                                int minute = int.Parse(conditions["IgnoreTime"]) / 60;
+                                                                int second = int.Parse(conditions["IgnoreTime"]) % 60;
+                                                                if (minute != 0 && second != 0)
+                                                                {
+                                                                    state = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
 
+                                                                }
+                                                                else
+                                                                {
+                                                                    if (minute == 0 && second != 0)
+                                                                    {
+                                                                        state = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+
+                                                                    }
+                                                                    if (minute != 0 && second == 0)
+                                                                    {
+                                                                        state = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+
+                                                                    }
+
+                                                                }
+                                                            }
+                                                            else
+                                                            {
+                                                                state = Language.StringByID(MyInternationalizationString.someone);
+                                                            }
+                                                        }
                                                     }
                                                     break;
                                                 case 21:
@@ -289,44 +295,6 @@
                                                             state =Language.StringByID( MyInternationalizationString.callthepolice);
                                                         }
 
-                                                    }
-                                                    break;
-                                                case 541:
-                                                    {
-                                                        if (conditions["Cluster_ID"] == "1024") {
-                                                            state = Language.StringByID(MyInternationalizationString.ambientLight)+"<"+conditions["AttriButeData1"]+"lux"+ Language.StringByID(MyInternationalizationString.hour1);
-                                                        }
-                                                        else
-                                                        {
-                                                            if (conditions.ContainsKey("IgnoreTime"))
-                                                            {
-                                                                int minute = int.Parse(conditions["IgnoreTime"]) / 60;
-                                                                int second = int.Parse(conditions["IgnoreTime"]) % 60;
-                                                                if (minute != 0 && second != 0)
-                                                                {
-                                                                    state = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
-
-                                                                }
-                                                                else
-                                                                {
-                                                                    if (minute == 0 && second != 0)
-                                                                    {
-                                                                        state = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
-
-                                                                    }
-                                                                    if (minute != 0 && second == 0)
-                                                                    {
-                                                                        state = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1);
-
-                                                                    }
-
-                                                                }
-                                                            }
-                                                            else
-                                                            {
-                                                                state = Language.StringByID(MyInternationalizationString.someone);
-                                                            }
-                                                        }
                                                     }
                                                     break;
                                                 default:
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
index fd74126..9725229 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
@@ -44,7 +44,7 @@
                         else if (common.Type == DeviceType.IASZone)
                         {
                             var iASZonedevice = common as IASZone;
-                            if (iASZonedevice.IasDeviceType == 541)
+                            if (iASZonedevice.ModelIdentifier == "MSPIRB-ZB.10")
                             {//鐞冨舰绉诲姩浼犳劅鍣�
                                 if (Common.Logic.CurrentLogic.Conditions[i]["Cluster_ID"] == objecttype["Cluster_ID"])
                                 {
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
index 9629046..81bac76 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
@@ -46,7 +46,7 @@
                 {
                     ///鍖哄垎鍑鸿緭鍏ユ潯浠跺拰杈撳嚭鐩爣璁惧
                     var listdevicetype = GetDevice(type);
-                    var listdevice = GetDeviceUIList(listAllRoom[i], listdevicetype);
+                    var listdevice = GetDeviceUIList(listAllRoom[i], listdevicetype, type);
                     if (listdevice.Count == 0)
                     {
                         ///杩囨护鎺夋病鏈夎澶囩殑鎴块棿
@@ -68,8 +68,9 @@
         /// </summary>
         /// <param name="room">褰撳墠鎴块棿</param>
         /// <param name="deviceTypelist">璁惧绫诲瀷</param>
+        ///  /// <param name="type">閫昏緫绫诲瀷</param>
         /// <returns></returns>
-        public static List<CommonDevice> GetDeviceUIList(Common.Room room, List<DeviceType> deviceTypelist)
+        public static List<CommonDevice> GetDeviceUIList(Common.Room room, List<DeviceType> deviceTypelist,string type)
         {
             var deviceUIlist = new List<CommonDevice>();
             foreach (var deviceKey in room.ListDevice)
@@ -94,6 +95,22 @@
                         continue;
                     }
                 }
+                if (type == "condition_mould")
+                {
+                    if (device.Type == DeviceType.IASZone)
+                    {
+                        if (device.IasDeviceType != 13)
+                        {//鑷姩鍖栨ā鏉垮彧鏀寔绾㈠浼犳劅鍣�
+                            continue;
+                        }
+                        if (device.ModelIdentifier == "MSPIRB-ZB.10")
+                        {
+                            //鑷姩鍖栨ā鏉夸笉鏀寔鍏夌収搴�
+                            continue;
+                        }
+
+                    }
+                }
                 deviceUIlist.Add(device);
             }
             return deviceUIlist;
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
index 8bfa320..0bacf91 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
@@ -264,7 +264,7 @@
                     roomTextButton = roomClickView.roomnameBtn;
                     roomClickView.roomnameBtn.IsSelected = true;
 
-                    var list = Method.GetDeviceUIList(room, deviceTypeList);
+                    var list = Method.GetDeviceUIList(room, deviceTypeList, IfType);
                     AllDeviceTypeView(list);
                 }
 
@@ -297,7 +297,7 @@
                     roomTextButton = roomClickView.roomnameBtn;
                     roomClickView.roomnameBtn.IsSelected = true;
 
-                    var list = Method.GetDeviceUIList(room, deviceTypeList);
+                    var list = Method.GetDeviceUIList(room, deviceTypeList, IfType);
                     AllDeviceTypeView(list);
                 };
                 roomClickView.roomnameBtn.MouseUpEventHandler += roomclick;
@@ -414,13 +414,6 @@
                 if (deviceTypelist.Count != 0 && !deviceTypelist.Contains(common.Type))
                 {
                     continue;
-                }
-                if (IfType == "condition_mould")
-                {
-                    if (common.IasDeviceType != 13)
-                    {//鑷姩鍖栨ā鏉垮彧鏀寔绾㈠浼犳劅鍣�
-                        continue;
-                    }
                 }
                 var deviceFramelayout = new FrameLayout
                 {

--
Gitblit v1.8.0