From 446b27177064d14561d43e5ce33cde5d7df075c7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 11 五月 2020 17:53:36 +0800
Subject: [PATCH] 2020-05-11-2
---
ZigbeeApp/Shared/Phone/Device/Logic/Method.cs | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
index c484111..e4fff88 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
@@ -766,11 +766,18 @@
if (Config.Instance.Home.IsVirtually)
{
+ if (Common.Logic.LogicList.Count == 0)
+ {
+ CurrentLogic.LogicId = 1;
+ Common.Logic.LogicList.Add(CurrentLogic);
+ }
+
if (CurrentLogic.LogicId == 0)
{
bool d = false;
for (int i = 1; i < 50; i++)
{
+
for (int j = 0; j < Common.Logic.LogicList.Count; j++)
{
if (i != Common.Logic.LogicList[j].LogicId)
@@ -792,7 +799,7 @@
{
for (int j = 0; j < Common.Logic.LogicList.Count; j++)
{
- if (j == Common.Logic.LogicList[j].LogicId)
+ if (CurrentLogic.LogicId == Common.Logic.LogicList[j].LogicId)
{
Common.Logic.LogicList.RemoveAt(j);
Common.Logic.LogicList.Insert(j,CurrentLogic);
@@ -875,11 +882,13 @@
else if (LogicView.IfString._SoneLogic == if_logic)
{
//璺冲埌Sone闂ㄩ攣鑱斿姩浜嬩欢鍒楄〃鐣岄潰
- UserView.HomePage.Instance.RemoveViewByTag("SoneLogic");//绉婚櫎鎵�鏈夋爣璁癓ockListView鐣岄潰
- var soneLogicList = new SoneLogicList();
- UserView.HomePage.Instance.AddChidren(soneLogicList);
- UserView.HomePage.Instance.PageIndex += 1;
- soneLogicList.Show();
+ //UserView.HomePage.Instance.RemoveViewByTag("SoneLogic");//绉婚櫎鎵�鏈夋爣璁癓ockListView鐣岄潰
+ //var soneLogicList = new SoneLogicList();
+ //UserView.HomePage.Instance.AddChidren(soneLogicList);
+ //UserView.HomePage.Instance.PageIndex += 1;
+ //soneLogicList.Show();
+
+ SoneLogicList.soneLogicList?.RefreshView();
}
}
--
Gitblit v1.8.0