From d8713d720fe7bc6d5dec99fa238397829b715aff Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 18 十一月 2019 15:18:28 +0800
Subject: [PATCH] 2019-11-18-1
---
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
index 8870208..449d462 100644
--- 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,
@@ -83,6 +83,7 @@
Common.Logic.CurrentLogic.Relationship = 1;
//Config.Instance.Guid鐢ㄦ潵璇嗗埆璐﹀彿韬唤锛�
var accounts = new System.Collections.Generic.Dictionary<string, string>();
+ accounts.Add("Type","1");
accounts.Add("Account", Config.Instance.Guid);
Common.Logic.CurrentLogic.Accounts.Add(accounts);
Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.automation1);
@@ -148,7 +149,7 @@
{
Width = Application.GetRealWidth(1080),
Height = Application.GetRealHeight(190),
- LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+ LineColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
};
@@ -163,6 +164,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
Gravity = Gravity.CenterVertical,
+ TextSize = 15,
};
logicRowlayout.AddChidren(logicnameBtn);
@@ -194,6 +196,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 +239,7 @@
{
if (e1)
{
- Common.Logic.LogicList.Remove(logic);
+ Common.Logic.LockLogicList.Remove(logic);
Automationview();
Send.DelLogic(logic.LogicId);
}
--
Gitblit v1.8.0