合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/Device/Logic/LogicView/CompleteView.cs

@@ -11,7 +11,7 @@
        {
            Width = Application.GetRealWidth(1080),
            Height = Application.GetRealHeight(140 + 320 + 70),
            Y = Application.GetRealHeight(1920 - 530),
            Y = Application.GetRealHeight(Method.H - 530),
            BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
            // Radius = (uint)Application.GetRealHeight(60),
        };
@@ -26,30 +26,33 @@
            TextID = MyInternationalizationString.cancel,
            TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
            Height = Application.GetRealHeight(140),
            Width = Application.GetRealWidth(200),
            Width = Application.GetRealWidth(150),
            X = Application.GetRealWidth(80),
            TextAlignment = TextAlignment.CenterLeft,
            TextSize = 14,

        };
        public Button Btntitle = new Button
        {
            //TextID = MyInternationalizationString.type,
            TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
            Height = Application.GetRealHeight(140),
            Width = Application.GetRealWidth(420),
            Width = Application.GetRealWidth(580),
            TextAlignment = TextAlignment.Center,
            X = Application.GetRealWidth(280 + 50),
            X = Application.GetRealWidth(230+20),
            TextSize = 16,

        };
        public Button Btncomplete = new Button
        {
            TextID = MyInternationalizationString.complete,
            TextColor = ZigbeeColor.Current.LogicBtnCompleteColor,
            Height = Application.GetRealHeight(140),
            Width = Application.GetRealWidth(200),
            Width = Application.GetRealWidth(150),
            TextAlignment = TextAlignment.CenterRight,
            X = Application.GetRealWidth(750+50),
            X = Application.GetRealWidth(850),
            TextSize = 14,

        };
        #endregion
       
@@ -57,12 +60,15 @@
        {
            //n多少行
            fraView.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
            fraView.Height = Application.GetRealHeight(140 + 70 + 160 * n);
            fraView.Height = Application.GetRealHeight(1+140 + 70 + 160 * n);//1作用就是覆盖底色
            fraView.Y = Application.GetRealHeight(1920 - 140 - 70 - 160 * n);
            fraView.AddChidren(titleRow);
            fraView.AddChidren(Btncancel);
            fraView.AddChidren(Btntitle);
            fraView.AddChidren(Btncomplete);
            if (titleRow.Parent == null)
            {
                fraView.AddChidren(titleRow);
                fraView.AddChidren(Btncancel);
                fraView.AddChidren(Btntitle);
                fraView.AddChidren(Btncomplete);
            }
            return fraView;
        }