请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

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

@@ -10,7 +10,7 @@

        public LockLogicList()
        {
            Tag = "Logic";
            Tag = "LockListView";
        }
        VerticalRefreshLayout middle;
        public void Show()
@@ -36,10 +36,9 @@
                //new一个新逻辑对象；
                Common.Logic.CurrentLogic = new Common.Logic();
                Common.Logic.CurrentLogic.IsEnable = 1;//默认为开
                Common.Logic.CurrentLogic.LogicType = 1;
                Common.Logic.CurrentLogic.LogicType = 1;//标记自动化类型
                Common.Logic.CurrentLogic.Relationship = 1;
                Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.automation1);
                //Common.Logic.CurrentLogic.LogicCustomPushText = Common.Logic.CurrentLogic.LogicName + Language.StringByID(MyInternationalizationString.defaulttext);
                Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.linkageevent);
                var lockLogicCommunalPage = new LockLogicCommunalPage();
                UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
                UserView.HomePage.Instance.PageIndex += 1;
@@ -49,7 +48,7 @@
            middle = new VerticalRefreshLayout
            {
                Y = view.topRowLayout.Bottom,
                Height = Application.GetRealHeight(1920 - 184),
                Height = Application.GetRealHeight(Method.H - 184),
                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
            };
            this.AddChidren(middle);
@@ -80,7 +79,7 @@
                    for (int j = 0; j < listlogic.Count; j++)
                    {
                        var logic = listlogic[j];
                        if (logic.LogicType == 0)
                        if (logic.LogicType != 1)
                        {
                            continue;
                        }
@@ -156,6 +155,7 @@
                    Height = Application.GetRealHeight(190),
                    LineColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
                    BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
                    SubViewWidth = Application.GetRealWidth(184),//改变编辑控件宽度多少；

                };
                middle.AddChidren(logicRowlayout);
@@ -176,8 +176,8 @@

                var logicswitchBtn = new Button
                {
                    Width = Application.GetMinRealAverage(104),
                    Height = Application.GetMinRealAverage(63),
                    Width = Application.GetRealWidth(104),
                    Height = Application.GetRealHeight(63),
                    UnSelectedImagePath = "ZigeeLogic/logicclose.png",
                    SelectedImagePath = "ZigeeLogic/logicopen.png",
                    X = logicRowlayout.Width - Application.GetRealWidth(104 + 58),
@@ -227,7 +227,6 @@

                };


                ///删除
                var del = new Button
                {
@@ -238,18 +237,16 @@
                logicRowlayout.AddRightView(del);
                del.MouseUpEventHandler += (sender, e) =>
                {
                    var alert = new Alert(Language.StringByID(MyInternationalizationString.tip), Language.StringByID(MyInternationalizationString.doyouwanttodelete),
                                             Language.StringByID(MyInternationalizationString.cancel), Language.StringByID(MyInternationalizationString.confrim));
                    alert.ResultEventHandler += (sender1, e1) =>
                    var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
                    Language.StringByID(MyInternationalizationString.doyouwanttodelete),
                    Language.StringByID(MyInternationalizationString.confrim));

                    alert.Show();

                    alert.ConfirmClickEvent += () =>

                    {
                        if (e1)
                        {
                            Common.Logic.LockLogicList.Remove(logic);
                            Automationview();
                            Send.DelLogic(logic.LogicId);
                        }
                        Common.Logic.LockLogicList.Remove(logic);
                        Automationview();
                        Send.DelLogic(logic.LogicId);

                    };
                    alert.Show();

                };
            }