合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

 ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs

@@ -600,24 +600,17 @@
                flMain.RemoveFromParent();
            };

            var fraview1 = new FrameLayout
            {
                Width = Application.GetRealWidth(1080),
                Height = Application.GetRealHeight(100),
                Y = Application.GetRealHeight(1920 - 100),
                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
            };
            flMain.AddChidren(fraview1);

           
            var fraview = new FrameLayout
            {
                Width = Application.GetRealWidth(1080),
                Height = Application.GetRealHeight(850),
                Y = Application.GetRealHeight(1920 - 850),
                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
                Radius = (uint)Application.GetRealHeight(60),
                //Radius = (uint)Application.GetRealHeight(60),
            };
            flMain.AddChidren(fraview);
            fraview.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);

            #region  -------取消   完成
            var timetype = new RowLayout