From 8b4d79ca03495e522a1953e04ca17527f33c853a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 28 十月 2019 13:22:17 +0800
Subject: [PATCH] 合并完成代码

---
 ZigbeeApp/Shared/Phone/Device/Logic/Send.cs |   34 ++++++++++++++++++++--------------
 1 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index 348124f..a4e865e 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -14,7 +14,7 @@
         /// 鑾峰彇LogicId鐨勬柟娉�
         /// </summary>
         /// <returns>The logic identifier.</returns>
-        public static async System.Threading.Tasks.Task<List<int>> GetLogicId()
+        public static async System.Threading.Tasks.Task<List<int>> GetLogicId(int LogicType)
         {
             return await System.Threading.Tasks.Task.Run(async () =>
             {
@@ -53,6 +53,8 @@
                 mainGateWay.GwResDataAction += action;
 
                 var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 2004 } };
+                var jObjectdata1 = new JObject { { "LogicType", LogicType } };
+                jObject.Add("Data", jObjectdata1);
                 mainGateWay?.Send("Logic/GetLogicList", jObject.ToString());
                 //await System.Threading.Tasks.Task.Run(async () =>
                 //{
@@ -74,7 +76,7 @@
         /// 鑾峰彇Logic鐨勬柟娉�
         /// </summary>
         /// <returns>The logic identifier.</returns>
-        public static async System.Threading.Tasks.Task<Common.Logic> GetLogic(int LogicId)
+        public static async System.Threading.Tasks.Task<Common.Logic> GetLogic(int LogicId,int LogicType)
         {
             return await System.Threading.Tasks.Task.Run(async () =>
             {
@@ -149,7 +151,8 @@
                 {
                     var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 2002 } };
                     var data = new JObject {
-                        { "LogicId",LogicId}
+                        { "LogicId",LogicId},
+                        { "LogicType",LogicType}
                         };
                     jObject.Add("Data", data);
                     ZbGateway.MainGateWay?.Send("Logic/GetLogicInfo", jObject.ToString());
@@ -566,13 +569,13 @@
         /// 鑾峰彇Logic鍒楄〃鐨勬柟娉�
         /// </summary>
         /// <returns>The logic identifier.</returns>
-        public static async System.Threading.Tasks.Task<List<Common.Logic>> ReadList(int sum)
+        public static async System.Threading.Tasks.Task<List<Common.Logic>> ReadList(int sum,int LogicType)
         {
             return await System.Threading.Tasks.Task.Run(async () =>
             {
 
                 var listLogic = new List<Common.Logic>();
-                bool @bool = false;
+               // bool @bool = false;
                 Action<string, string> action = (topic, data) =>
                 {
                     var gatewayID = topic.Split('/')[0];
@@ -590,6 +593,7 @@
                         logic.LogicId = int.Parse(Logicifon["LogicId"].ToString());
                         logic.IsEnable = int.Parse(Logicifon["IsEnable"].ToString());
                         logic.LogicName = Logicifon["LogicName"].ToString();
+                        logic.LogicType = int.Parse(Logicifon["LogicType"].ToString());
                         logic.Relationship = int.Parse(Logicifon["Relationship"].ToString());
                         logic.TimeAttribute = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.TimeAttributeObj>(Logicifon["TimeAttribute"].ToString());
                         logic.Conditions = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(Logicifon["Conditions"].ToString());
@@ -639,10 +643,10 @@
                         }
 
                     }
-                    if (topic == $"{gatewayID}/Logic/AllLogicNum_Respon")
-                    {
-                        @bool = true;
-                    }
+                    //if (topic == $"{gatewayID}/Logic/AllLogicNum_Respon")
+                    //{
+                    //    @bool = true;
+                    //}
                 };
                 var mainGateWay = ZbGateway.MainGateWay;
                 if (mainGateWay == null)
@@ -654,6 +658,8 @@
                 try
                 {
                     var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 2015 } };
+                    var jObjectdata = new JObject { { "LogicType", LogicType } };
+                    jObject.Add("Data", jObjectdata);
                     ZbGateway.MainGateWay?.Send("Logic/GetAllLogicListInfo", jObject.ToString());
                 }
                 catch { }
@@ -661,14 +667,14 @@
                 while ((DateTime.Now - dateTime).TotalMilliseconds < 8 * 1000)
                 {
                     await System.Threading.Tasks.Task.Delay(100);
-                    //if (sum == listLogic.Count)
-                    //{
-                    //    break;
-                    //}
-                    if (@bool)
+                    if (sum == listLogic.Count)
                     {
                         break;
                     }
+                    //if (@bool)
+                    //{
+                    //    break;
+                    //}
                 }
                 ZbGateway.MainGateWay.GwResDataAction -= action;
                 return listLogic;

--
Gitblit v1.8.0