陈嘉乐
2020-05-18 790d1cadf03164aecd0fccd2874f7da7997e34d4
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -22,6 +22,7 @@
            return await System.Threading.Tasks.Task.Run(async () =>
            {
                List<int> logicIdList = new List<int>();
                Action<string, string> action = (topic, data) =>
                {
                    var gatewayID = topic.Split('/')[0];
@@ -30,20 +31,24 @@
                    {
                        return;
                    }
                    if (topic == $"{gatewayID}/Logic/GetLogicList_Respon")
                    {
                        Console.WriteLine("打印逻辑返回数据1====");
                        var list = jObjectdata["Data"]["LogicList"];
                        if (list == null)
                        {
                            return;
                        }
                        Console.WriteLine("打印逻辑返回数据2====");
                        foreach (var listIfon in list)
                        {
                            var logicId = int.Parse(listIfon["LogicId"].ToString());
                            logicIdList.Add(logicId);
                        }
                        Console.WriteLine("打印逻辑返回数据3===="+logicIdList.Count.ToString());
                    }
                };
@@ -499,6 +504,15 @@
                                            ["AccountName"] = dictionary["AccountName"],
                                        };
                                        if (dictionary.ContainsKey("Option4"))
                                        {
                                            accounts1.Add("Option4",dictionary["Option4"]);
                                        }
                                        if (dictionary.ContainsKey("Option2"))
                                        {
                                            accounts1.Add("Option2", int.Parse(dictionary["Option2"]));
                                        }
                                        accounts.Add(accounts1);
                                    }
                                }
@@ -517,6 +531,20 @@
                                    accounts.Add(location);
                                }
                                break;
                            case 8:
                                {
                                    var accounts1 = new JObject();
                                    if (dictionary.ContainsKey("Option4"))
                                    {
                                        accounts1.Add("Option4", dictionary["Option4"]);
                                    }
                                    if (dictionary.ContainsKey("Option2"))
                                    {
                                        accounts1.Add("Option2", int.Parse(dictionary["Option2"]));
                                    }
                                    accounts.Add(accounts1);
                                }
                                break;
                        }
                    }