From 652c1986b854f54e0a6d38b4b538a9551c1e3151 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 13 五月 2020 11:27:42 +0800
Subject: [PATCH] 2
---
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 86 ++++++++++++++++++++++++++----------------
1 files changed, 53 insertions(+), 33 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index e358680..f2a23d6 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -20,10 +20,8 @@
{
case 0:
{
-
-
- ////new涓�涓柊閫昏緫瀵硅薄锛�
- ////鏂板姝ｅ父鑷姩鍖栧叆鍙�
+ //new涓�涓柊閫昏緫瀵硅薄锛�
+ //鏂板姝ｅ父鑷姩鍖栧叆鍙�
Common.Logic.CurrentLogic = new Common.Logic();
Common.Logic.CurrentLogic.IsEnable = 1;//榛樿涓哄紑
Common.Logic.CurrentLogic.LogicType = 0;//鏍囪閫昏緫绫诲瀷
@@ -62,12 +60,12 @@
doorLockLogicList.Show();
}
break;
-
+
}
}
-
+
#region 鈼� 鑷姩鍖朹_________________________
/// <summary>
/// 鑷姩鍖栧姛鑳戒唬鐮佸叆鍙�
@@ -242,10 +240,13 @@
};
//涓嬫媺鍒锋柊鑷姩鍖栧垪琛ㄧ殑浜嬩欢
logicScrolView.BeginHeaderRefreshingAction += () =>
- {
- //閲嶆柊鍒锋柊logic鍒楄〃
- Common.Logic.LogicList.Clear();
- Read(logicScrolView, no);
+ {
+ if (!Config.Instance.Home.IsVirtually)
+ {//铏氭嫙鐨勪笉鑾峰彇缃戝叧閫昏緫鍒楄〃
+ //閲嶆柊鍒锋柊logic鍒楄〃
+ Common.Logic.LogicList.Clear();
+ Read(logicScrolView, no);
+ }
//鍏抽棴鍒锋柊View锛�
logicScrolView.EndHeaderRefreshing();
};
@@ -260,37 +261,48 @@
/// <param name="logicScrolView"></param>
private static async void Read(VerticalRefreshLayout logicScrolView, bool no)
{
+ //if (Config.Instance.HomeId != UserCenter.UserCenterResourse.AccountOption.OldHomeStringId)
+ //{
+ // //鍒囨崲浣忓畢娓呴櫎涔嬪墠缂撳瓨鏁版嵁;
+ // Common.Logic.LogicList.Clear();
+ // Common.Logic.LockLogicList.Clear();
+ // Common.Logic.SoneLogicList.Clear();
+ //}
+
CommonPage.Loading.Start();
try
{
- if (Common.Logic.LogicList.Count == 0)
+ if (!Config.Instance.Home.IsVirtually)//铏氭嫙鐨勪笉鑾峰彇缃戝叧閫昏緫鍒楄〃
{
- var Idlist1 = await Send.GetLogicId(0);//
- var Idlist2 = await Send.GetLogicId(2);//闂ㄩ攣甯稿紑妯″紡
- if (Idlist1.Count != 0)
+ if (Common.Logic.LogicList.Count == 0)
{
- var listlogic1 = await Send.ReadList(Idlist1.Count, 0);
- for (int j = 0; j < listlogic1.Count; j++)
+ var Idlist1 = await Send.GetLogicId(0);//
+ var Idlist2 = await Send.GetLogicId(2);//闂ㄩ攣甯稿紑妯″紡
+ if (Idlist1.Count != 0)
{
- var logic = listlogic1[j];
- if (logic.LogicType != 0)
+ var listlogic1 = await Send.ReadList(Idlist1.Count, 0);
+ for (int j = 0; j < listlogic1.Count; j++)
{
- continue;
+ var logic = listlogic1[j];
+ if (logic.LogicType != 0)
+ {
+ continue;
+ }
+ Common.Logic.LogicList.Add(logic);
}
- Common.Logic.LogicList.Add(logic);
}
- }
- if (Idlist2.Count != 0)
- {
- var listlogic2 = await Send.ReadList(Idlist2.Count, 2);
- for (int j = 0; j < listlogic2.Count; j++)
+ if (Idlist2.Count != 0)
{
- var logic = listlogic2[j];
- if (logic.LogicType != 2)
+ var listlogic2 = await Send.ReadList(Idlist2.Count, 2);
+ for (int j = 0; j < listlogic2.Count; j++)
{
- continue;
+ var logic = listlogic2[j];
+ if (logic.LogicType != 2)
+ {
+ continue;
+ }
+ Common.Logic.LogicList.Add(logic);
}
- Common.Logic.LogicList.Add(logic);
}
}
}
@@ -310,6 +322,7 @@
/// <param name="refresview">Refresview.</param>
private static async void Automationview(VerticalRefreshLayout refresview, bool no)
{
+
refresview.RemoveAll();
if (Common.Logic.LogicList.Count == 0 && no == false)
{
@@ -398,7 +411,7 @@
//瀹炵幇android鏄剧ず閫昏緫鍒楄〃鐨勫渾瑙�;
fLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
logicRowlayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
-
+
}
i++;
var logicnameBtn = new Button
@@ -441,7 +454,10 @@
logic.IsEnable = 0;
StatusColor(logic, logicRowlayout, 0);
}
- Send.LogicControlSwitch(logic);
+ if (!Config.Instance.Home.IsVirtually)
+ {
+ Send.LogicControlSwitch(logic);
+ }
//Logic.Send.AddModifyLogic(logic);
};
if (logic.IsEnable == 1)
@@ -503,7 +519,10 @@
{
Common.Logic.LogicList.Remove(logic);
Automationview(refresview, no);
- Send.DelLogic(logic.LogicId);
+ if (!Config.Instance.Home.IsVirtually)
+ {
+ Send.DelLogic(logic.LogicId);
+ }
};
};
@@ -780,6 +799,7 @@
}
return _if;
}
-
+
}
}
+
--
Gitblit v1.8.0