From 70fe48768ea3695780f4b2ae32e940d50bb580c7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 07 五月 2020 17:50:42 +0800
Subject: [PATCH] 2020-05-07-3
---
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index 374b643..6d11569 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -20,6 +20,31 @@
{
case 0:
{
+ // if (doorLock == null)
+ // {
+ // ///闃叉鎶涘紓甯�
+ // Send.CurrentDoorLock = new DoorLock();
+ // }
+ // ///澶囨敞锛歐JC鐨�
+ //// Shared.Phone.Device.Logic.Send.CurrentDoorLock = doorLock;
+ // ///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱
+ // Common.Logic.LogicDviceList.Clear();
+ // if (Common.Logic.LogicDviceList.Count == 0)
+ // {
+ // Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
+ // }
+ // var addLogicPage = new Shared.Phone.Device.Logic.SoneLogicList();
+ // UserView.HomePage.Instance.AddChidren(addLogicPage);
+ // UserView.HomePage.Instance.PageIndex += 1;
+ // addLogicPage.Show();
+ // addLogicPage.action += (w) =>
+ // {
+ // //doorLock.IsDoorLockNormallyMode = w;
+ // /////鐣欑粰寰愭鐢ㄧ殑
+ // //UpdateNomallyOpenStatus();
+ // };
+
+
//new涓�涓柊閫昏緫瀵硅薄锛�
//鏂板姝ｅ父鑷姩鍖栧叆鍙�
Common.Logic.CurrentLogic = new Common.Logic();
@@ -241,9 +266,12 @@
//涓嬫媺鍒锋柊鑷姩鍖栧垪琛ㄧ殑浜嬩欢
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();
};
@@ -258,6 +286,14 @@
/// <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
{
--
Gitblit v1.8.0