合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs

@@ -31,7 +31,7 @@
                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,

                };
@@ -194,6 +195,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 +238,7 @@
                    {
                        if (e1)
                        {
                            Common.Logic.LogicList.Remove(logic);
                            Common.Logic.LockLogicList.Remove(logic);
                            Automationview();
                            Send.DelLogic(logic.LogicId);
                        }