From 691b0f2434acc1685b43f873657c9230726ffe6f Mon Sep 17 00:00:00 2001 From: chenqiyang <1406175257@qq.com> Date: 星期二, 19 四月 2022 13:38:20 +0800 Subject: [PATCH] 1.增加人脸、可视对讲入口 2.增加清除推送角标数值接口 3.修改初始化全视通、登出全视通 --- ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs old mode 100755 new mode 100644 index db4cf4f..93c4e6e --- a/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs @@ -13,7 +13,7 @@ Tag = "Logic"; } - public void Show (string titlename) + public void Show (string titlename,string if_logic,bool _bool) { #region 鐣岄潰鐨勫竷灞�浠g爜 @@ -181,10 +181,23 @@ Common.Logic.CurrentLogic.TimeAttribute.Repeat = 5; Common.Logic.CurrentLogic.TimeAttribute.WeekDay = weekvalue; - var logicCommunalPage = new LogicCommunalPage { }; - UserView.HomePage.Instance.AddChidren(logicCommunalPage); - UserView.HomePage.Instance.PageIndex += 1; - logicCommunalPage.Show(() => { }); + + if (LogicView.IfString._LockLogic == if_logic) + { + //璺冲埌s_one闂ㄩ攣缂栬緫鐣岄潰 + var oneLogic = new OneLogic(); + UserView.HomePage.Instance.AddChidren(oneLogic); + UserView.HomePage.Instance.PageIndex += 1; + oneLogic.Show(_bool); + } + else + { + + var logicCommunalPage = new LogicCommunalPage { }; + UserView.HomePage.Instance.AddChidren(logicCommunalPage); + UserView.HomePage.Instance.PageIndex += 1; + logicCommunalPage.Show(() => { }); + } }; -- Gitblit v1.8.0