From 67aea08d675c88fe5c4b8362efc131d1292630f7 Mon Sep 17 00:00:00 2001 From: WJC <wjc@hdlchina.com.cn> Date: 星期五, 25 十月 2019 17:36:26 +0800 Subject: [PATCH] 2019-10-25-2 --- ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 31 ++++++++----------------------- 1 files changed, 8 insertions(+), 23 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs old mode 100755 new mode 100644 index 01dd736..56aad98 --- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs +++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs @@ -1975,34 +1975,19 @@ CommonPage.Loading.Start(); if (Common.Logic.LogicList.Count == 0) { - //var Idlist = await Logic.Send.GetLogicId(); - //if (Idlist.Count != 0) - //{ - // foreach (var LogicId in Idlist) - // { - // var logic = await Logic.Send.GetLogic(LogicId); - // if (logic != null) - // { - // Common.Logic.LogicList.Add(logic); - // } - // } - //} - var Idlist = await Logic.Send.GetLogicId(); + var Idlist = await Logic.Send.GetLogicId(0); if (Idlist.Count != 0) { - var listlogic = await Logic.Send.ReadList(Idlist.Count); - for (int i = 0; i < Idlist.Count; i++) + var listlogic = await Logic.Send.ReadList(Idlist.Count,0); + //foreach鍙兘闆嗗悎宸茶淇敼,鏋氫妇鎿嶄綔鍙兘涓嶄細鎵ц,鍙兘鍑虹幇宕╂簝(寤鸿for)銆� + for (int j = 0; j < listlogic.Count; j++) { - var LogicId = Idlist[i]; - //foreach鍙兘闆嗗悎宸茶淇敼,鏋氫妇鎿嶄綔鍙兘涓嶄細鎵ц,鍙兘鍑虹幇宕╂簝(寤鸿for)銆� - for (int j = 0; j < listlogic.Count; j++) + var logic = listlogic[j]; + if (logic.LogicType != 0) { - var logic = listlogic[j]; - if (logic.LogicId == LogicId) - { - Common.Logic.LogicList.Add(logic); - } + continue; } + Common.Logic.LogicList.Add(logic); } } } -- Gitblit v1.8.0