合并代码

黄学彪

2020-01-06 72be4f06a683de33ddd563c8447c39f7f17e5b7d

 ZigbeeApp/Shared/Phone/Device/CommonForm/SelectTime.cs

@@ -33,10 +33,10 @@
            var backgroundFL = new FrameLayout
            {
                Y = Application.GetRealHeight(596),
                Height = Application.GetRealHeight(1425),
                BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor,
                Radius=(uint)Application.GetRealHeight(20)
                Height = Application.GetRealHeight(1325),
                BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
            };
            backgroundFL.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
            dialog.AddChidren(backgroundFL);

            var topView = new FrameLayout
@@ -52,7 +52,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.GXCTextGrayColor,
                TextID=R.MyInternationalizationString.Cancel,
                TextSize=16
                TextSize=14
            };
            topView.AddChidren(cancle);

@@ -72,39 +72,44 @@
                Width = Application.GetRealWidth(300),
                TextAlignment = TextAlignment.CenterRight,
                TextColor = ZigbeeColor.Current.GXCTextSelectedColor2,
                TextID = R.MyInternationalizationString.Confrim,
                TextSize = 16
                TextID = R.MyInternationalizationString.Complete,
                TextSize = 14
            };
            topView.AddChidren(confrim);

            var Line = new FrameLayout()
            {
                Y = topView.Height - 1,
                Height = 1,
                BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2
            };
            topView.AddChidren(Line);

            var timeLayout = new VerticalScrolViewLayout
            {
                Y = Application.GetRealHeight(207),
                Height = Application.GetRealHeight(703+127*2+12*2)
                Height = Application.GetRealHeight(703 + 127 * 2 + 12+12),
                ScrollEnabled = false,
                VerticalScrollBarEnabled = false,
            };
            backgroundFL.AddChidren(timeLayout);

            TempSelectBtn = new Button();
            TempTimeBtn = new Button();

            var unKe = new FrameLayout
            {
                Y = timeLayout.Bottom,
                Height = Application.GetRealHeight(161),
                BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
            };
            backgroundFL.AddChidren(unKe);

            var notOpen = new Button
            {
                X = Application.GetRealWidth(80),
                Y=Application.GetRealHeight(1200),
                Width=Application.GetRealWidth(400),
                Height=Application.GetRealHeight(80),
                TextColor = ZigbeeColor.Current.GXCTextGrayColor4,
                TextID = R.MyInternationalizationString.NotOpen,
                TextAlignment = TextAlignment.CenterLeft,
                Gravity = Gravity.CenterVertical,
                TextSize=16
                TextSize=14
            };
            unKe.AddChidren(notOpen);
            backgroundFL.AddChidren(notOpen);

            cancle.MouseUpEventHandler += Close;
            confrim.MouseUpEventHandler += Confrim_MouseEvent;
@@ -153,7 +158,8 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.GXCTextGrayColor4,
                SelectedTextColor = ZigbeeColor.Current.GXCTextBlackColor,
                IsSelected=false
                IsSelected=false,
                TextSize=14
            };
            trow.AddChidren(timeBtn);

@@ -170,13 +176,13 @@

            var Line = new FrameLayout()
            {
                Y = trow.Height - 1,
                Y = row.Height - 1,
                Width = Application.GetRealWidth(919),
                Height = 1,
                Gravity=Gravity.CenterHorizontal,
                BackgroundColor = Common.ZigbeeColor.Current.GXCGrayLineColor2
            };
            trow.AddChidren(Line);
            row.AddChidren(Line);

           
            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>