合并了代码

黄学彪

2019-12-31 737c036a39176fd2085ce82b7c60391da8cb508c

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

@@ -280,185 +280,97 @@
            };
            lockRow.AddChidren(Btncomplete);
            #endregion
            bool @false = false;


            lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * membershipIfon.UserIdMode.Count) - 20 - 50);
            lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * membershipIfon.UserIdMode.Count) + 20 + 50);
            if (membershipIfon.UserIdMode.Count > 10)
            {
                @false = false;//
                ///元素超出10个，暂时默认显示10;
                lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * 10) - 20 - 50);
                lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * 10) + 20 + 50);
            }
            else
            {
                @false = false;
                lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * membershipIfon.UserIdMode.Count) - 20 - 50);
                lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * membershipIfon.UserIdMode.Count) + 20 + 50);
            }
            string SelectedLockStatus = "";
            ///定义两个变量记录选中状态；
            string attriButeId = "";
            string attriButeData2 = "";
            string modeName = "";
            if (!@false)

            for (int j = 0; j < membershipIfon.UserIdMode.Count; j++)
            {
                for (int j = 0; j < membershipIfon.UserIdMode.Count; j++)
                var userIdmode = membershipIfon.UserIdMode[j];
                var doorlockfra = new FrameLayout
                {
                    var userIdmode = membershipIfon.UserIdMode[j];
                    var doorlockfra = new FrameLayout
                    {
                        Height = Application.GetRealHeight(160),
                        Y = lockRow.Bottom + Application.GetRealHeight(20 + 160 * j),
                    };
                    lockcolorfra1.AddChidren(doorlockfra);
                    Height = Application.GetRealHeight(160),
                    Y = lockRow.Bottom + Application.GetRealHeight(20 + 160 * j),
                };
                lockcolorfra1.AddChidren(doorlockfra);

                    var doorlockRow = new RowLayout
                    {
                        Y = Application.GetRealHeight(30),
                        Width = Application.GetRealWidth(920),
                        Height = Application.GetRealHeight(130),
                        X = Application.GetRealWidth(80),
                        LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                    };
                    doorlockfra.AddChidren(doorlockRow);
                var doorlockRow = new RowLayout
                {
                    Y = Application.GetRealHeight(30),
                    Width = Application.GetRealWidth(920),
                    Height = Application.GetRealHeight(130),
                    X = Application.GetRealWidth(80),
                    LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                };
                doorlockfra.AddChidren(doorlockRow);

                    var doorlockBtn = new Button
                    {
                        Width = Application.GetRealWidth(600),
                        TextAlignment = TextAlignment.CenterLeft,
                        TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                        Text = userIdmode.ModeName,
                        TextSize = 14,
                    };
                    doorlockRow.AddChidren(doorlockBtn);
                var doorlockBtn = new Button
                {
                    Width = Application.GetRealWidth(600),
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                    Text = userIdmode.ModeName,
                    TextSize = 14,
                };
                doorlockRow.AddChidren(doorlockBtn);

                    var doorlockSelected = new Button
                    {
                        X = Application.GetRealWidth(860),
                        Width = Application.GetMinRealAverage(60),
                        Height = Application.GetMinRealAverage(60),
                        UnSelectedImagePath = "ZigeeLogic/selected.png",
                        Visible = false,
                        Gravity = Gravity.CenterVertical,
                var doorlockSelected = new Button
                {
                    X = Application.GetRealWidth(860),
                    Width = Application.GetMinRealAverage(60),
                    Height = Application.GetMinRealAverage(60),
                    UnSelectedImagePath = "ZigeeLogic/selected.png",
                    Visible = false,
                    Gravity = Gravity.CenterVertical,

                    };
                    doorlockRow.AddChidren(doorlockSelected);
                    if ((membershipIfon.UserIdMode.Count - 1) == j)
                };
                doorlockRow.AddChidren(doorlockSelected);
                if ((membershipIfon.UserIdMode.Count - 1) == j)
                {
                    doorlockRow.LineColor = ZigbeeColor.Current.LogicBackgroundColor;
                }
                EventHandler<MouseEventArgs> doorlockclick = (sender2, e2) =>
                {
                    SelectedLockStatus = "DoorLock";
                    selectedIcon.Visible = false;
                    selectedIcon = doorlockSelected;
                    doorlockSelected.Visible = true;
                        //doorlockBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                        attriButeId = userIdmode.OpenMode.ToString();
                    attriButeData2 = userIdmode.UserId;
                    modeName = userIdmode.ModeName;
                };
                doorlockRow.MouseUpEventHandler += doorlockclick;
                doorlockBtn.MouseUpEventHandler += doorlockclick;
                doorlockSelected.MouseUpEventHandler += doorlockclick;
                doorlockfra.MouseUpEventHandler += doorlockclick;
                ///显示之前的状态
                if (conditionsIndex != -1)
                {
                    var s = Common.Logic.CurrentLogic.Conditions[conditionsIndex];
                    if (s["AttriButeId"] == userIdmode.OpenMode.ToString() && s["AttriButeData2"] == userIdmode.UserId)
                    {
                        doorlockRow.LineColor = ZigbeeColor.Current.LogicBackgroundColor;
                    }
                    EventHandler<MouseEventArgs> doorlockclick = (sender2, e2) =>
                    {
                        SelectedLockStatus = "DoorLock";
                        selectedIcon.Visible = false;
                        selectedIcon = doorlockSelected;
                        doorlockSelected.Visible = true;
                    //doorlockBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                    attriButeId = userIdmode.OpenMode.ToString();
                        attriButeData2 = userIdmode.UserId;
                        modeName = userIdmode.ModeName;
                    };
                    doorlockRow.MouseUpEventHandler += doorlockclick;
                    doorlockBtn.MouseUpEventHandler += doorlockclick;
                    doorlockSelected.MouseUpEventHandler += doorlockclick;
                    doorlockfra.MouseUpEventHandler += doorlockclick;
                    ///显示之前的状态
                    if (conditionsIndex != -1)
                    {
                        var s = Common.Logic.CurrentLogic.Conditions[conditionsIndex];
                        if (s["AttriButeId"] == userIdmode.OpenMode.ToString() && s["AttriButeData2"] == userIdmode.UserId)
                        {
                            selectedIcon.Visible = false;
                            selectedIcon = doorlockSelected;
                            doorlockSelected.Visible = true;
                        }


                    }


                }
            }
            else
            {
                for (int j = 0; j < membershipIfon.UserIdMode.Count; j++)
                {
                    var userIdmode = membershipIfon.UserIdMode[j];

                    var vv = new VerticalScrolViewLayout
                    {
                        Height = Application.GetRealHeight(160 * 8),
                        Y = lockRow.Bottom,
                    };
                    lockcolorfra1.AddChidren(vv);
                    var doorlockfra = new FrameLayout
                    {
                        Height = Application.GetRealHeight(160),
                        Y = Application.GetRealHeight(160 * j),
                    };
                    vv.AddChidren(doorlockfra);

                    var doorlockRow = new RowLayout
                    {
                        Y = Application.GetRealHeight(30),
                        Width = Application.GetRealWidth(920),
                        Height = Application.GetRealHeight(130),
                        X = Application.GetRealWidth(80),
                        LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                    };
                    doorlockfra.AddChidren(doorlockRow);

                    var doorlockBtn = new Button
                    {
                        Width = Application.GetRealWidth(600),
                        TextAlignment = TextAlignment.CenterLeft,
                        TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                        Text = userIdmode.ModeName,
                        TextSize = 14,
                    };
                    doorlockRow.AddChidren(doorlockBtn);

                    var doorlockSelected = new Button
                    {
                        X = Application.GetRealWidth(860),
                        Width = Application.GetMinRealAverage(60),
                        Height = Application.GetMinRealAverage(60),
                        UnSelectedImagePath = "ZigeeLogic/selected.png",
                        Visible = false,
                        Gravity = Gravity.CenterVertical,

                    };
                    doorlockRow.AddChidren(doorlockSelected);
                    if ((membershipIfon.UserIdMode.Count - 1) == j)
                    {
                        doorlockRow.LineColor = ZigbeeColor.Current.LogicBackgroundColor;
                    }
                    EventHandler<MouseEventArgs> doorlockclick = (sender2, e2) =>
                    {
                        SelectedLockStatus = "DoorLock";
                        selectedIcon.Visible = false;
                        selectedIcon = doorlockSelected;
                        doorlockSelected.Visible = true;
                    //doorlockBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                    attriButeId = userIdmode.OpenMode.ToString();
                        attriButeData2 = userIdmode.UserId;
                        modeName = userIdmode.ModeName;
                    };
                    doorlockRow.MouseUpEventHandler += doorlockclick;
                    doorlockBtn.MouseUpEventHandler += doorlockclick;
                    doorlockSelected.MouseUpEventHandler += doorlockclick;
                    doorlockfra.MouseUpEventHandler += doorlockclick;
                    ///显示之前的状态
                    if (conditionsIndex != -1)
                    {
                        var s = Common.Logic.CurrentLogic.Conditions[conditionsIndex];
                        if (s["AttriButeId"] == userIdmode.OpenMode.ToString() && s["AttriButeData2"] == userIdmode.UserId)
                        {
                            selectedIcon.Visible = false;
                            selectedIcon = doorlockSelected;
                            doorlockSelected.Visible = true;
                        }


                    }
                }
            }

            Btncomplete.MouseUpEventHandler += (sender, e) =>
            {
@@ -544,9 +456,9 @@
                {
                    if (conditionsIndex == -1)
                    {
                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                                               Language.StringByID(MyInternationalizationString.usertip),
                                               Language.StringByID(MyInternationalizationString.confrim));
                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                   Language.StringByID(MyInternationalizationString.usertip),
                   Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();
                        return;
                    }