From 944b87b6bcccb095cd73f13f4410fb20faf48f74 Mon Sep 17 00:00:00 2001 From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local> Date: 星期三, 25 十二月 2019 11:21:06 +0800 Subject: [PATCH] 2019.12.25 --- ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs index 8870208..ebf8d23 100755 --- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs @@ -27,11 +27,11 @@ var titleName = new Button { - TextSize = 16, + TextSize = 17, TextColor = ZigbeeColor.Current.LogicTextBlackColor, TextAlignment = TextAlignment.CenterLeft, X = Application.GetRealWidth(176), - Width = Application.GetRealWidth(400), + Width = Application.GetRealWidth(600), Height = Application.GetRealHeight(69), Y = Application.GetRealHeight(92), TextID = MyInternationalizationString.linkageevent, @@ -81,10 +81,6 @@ Common.Logic.CurrentLogic.IsEnable = 1;//榛樿涓哄紑 Common.Logic.CurrentLogic.LogicType = 1; Common.Logic.CurrentLogic.Relationship = 1; - //Config.Instance.Guid鐢ㄦ潵璇嗗埆璐﹀彿韬唤锛� - var accounts = new System.Collections.Generic.Dictionary<string, string>(); - accounts.Add("Account", Config.Instance.Guid); - Common.Logic.CurrentLogic.Accounts.Add(accounts); Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.automation1); var lockLogicCommunalPage = new LockLogicCommunalPage(); UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage); @@ -148,7 +144,7 @@ { Width = Application.GetRealWidth(1080), Height = Application.GetRealHeight(190), - LineColor = ZigbeeColor.Current.LogicBackgroundColor, + LineColor = ZigbeeColor.Current.LogicMiddleBackgroundColor, BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor, }; @@ -163,6 +159,7 @@ TextAlignment = TextAlignment.CenterLeft, TextColor = ZigbeeColor.Current.LogicTextBlackColor, Gravity = Gravity.CenterVertical, + TextSize = 15, }; logicRowlayout.AddChidren(logicnameBtn); @@ -194,6 +191,14 @@ Send.LogicControlSwitch(logic); }; + if (logic.IsEnable == 1) + { + logicswitchBtn.IsSelected = true; + } + else if (logic.IsEnable == 0) + { + logicswitchBtn.IsSelected = false; + } ///缂栬緫 var edit = new Button { @@ -229,7 +234,7 @@ { if (e1) { - Common.Logic.LogicList.Remove(logic); + Common.Logic.LockLogicList.Remove(logic); Automationview(); Send.DelLogic(logic.LogicId); } -- Gitblit v1.8.0