合并代码

黄学彪

2020-01-06 72be4f06a683de33ddd563c8447c39f7f17e5b7d

 ZigbeeApp/Shared/Phone/UserView/SafetyShortcutControl.cs

@@ -43,7 +43,7 @@

            var bg = new Button
            {
                X = Application.GetRealWidth(485),
                X = Application.GetRealWidth(495),
                Y = Application.GetRealHeight(161),
                Width = Application.GetRealWidth(449),
                Height = Application.GetRealHeight(495),
@@ -53,7 +53,7 @@

            var bg1 = new FrameLayout
            {
                X = Application.GetRealWidth(485),
                X = Application.GetRealWidth(495),
                Y = Application.GetRealHeight(161),
                Width = Application.GetRealWidth(449),
                Height = Application.GetRealHeight(495),
@@ -110,9 +110,9 @@
                atHome.IsSelected = true;
                tempRow = atHome;
            }
            atHome.ClickBtn.MouseUpEventHandler += (sender, e) =>
            atHome.ButtonClickEvent += (sender, e) =>
            {
                if((sender as Button).IsSelected)
                if(sender.IsSelected)
                {
                    dialog.Close();
                    return;
@@ -127,10 +127,10 @@
                        dialog.Close();
                        if(result == GarrisonMode.AtHome)
                        {
                            

                        }
                    });
                    

                })
                { IsBackground = true }.Start();
            };
@@ -146,9 +146,9 @@
                withdrawGarriso.IsSelected = true;
                tempRow = withdrawGarriso;
            }
            withdrawGarriso.ClickBtn.MouseUpEventHandler += (sender, e) =>
            withdrawGarriso.ButtonClickEvent += (sender, e) =>
            {
                if ((sender as Button).IsSelected)
                if (sender.IsSelected)
                {
                    dialog.Close();
                    return;
@@ -179,9 +179,9 @@
            {
                atHome.IsSelected = true;
            }
            atHome.ClickBtn.MouseUpEventHandler += (sender, e) =>
            atHome.ButtonClickEvent += (sender, e) =>
            {
                if ((sender as Button).IsSelected)
                if (sender.IsSelected)
                {
                    dialog.Close();
                    return;
@@ -206,9 +206,9 @@
            {
                removeHome.IsSelected = true;
            }
            removeHome.ClickBtn.MouseUpEventHandler += (sender, e) =>
            removeHome.ButtonClickEvent += (sender, e) =>
            {
                if ((sender as Button).IsSelected)
                if (sender.IsSelected)
                {
                    dialog.Close();
                    return;
@@ -233,9 +233,9 @@
            {
                withdrawGarriso.IsSelected = true;
            }
            withdrawGarriso.ClickBtn.MouseUpEventHandler += (sender, e) =>
            withdrawGarriso.ButtonClickEvent += (sender, e) =>
            {
                if ((sender as Button).IsSelected)
                if (sender.IsSelected)
                {
                    dialog.Close();
                    return;