合并代码

黄学彪

2020-01-06 72be4f06a683de33ddd563c8447c39f7f17e5b7d

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

@@ -2,7 +2,7 @@
using Shared.Common;
namespace Shared.Phone.Device.CommonForm
{
    public class SceneTargetTimeRow:FrameLayout
    public class SceneTargetTimeRow : FrameLayout
    {
        /// <summary>
        /// TipBtn
@@ -29,7 +29,7 @@
            X = Application.GetRealWidth(0);
            Y = Application.GetRealHeight(y);
            Width = Application.GetRealWidth(1080);
            Height = Application.GetRealHeight(127);
            Height = Application.GetRealHeight(127-2);
        }

        /// <summary>
@@ -43,7 +43,7 @@
                Width = Application.GetMinRealAverage(80),
                Height = Application.GetMinRealAverage(80),
                Gravity = Gravity.CenterVertical,
                UnSelectedImagePath="Item/Timer.png"
                UnSelectedImagePath = "Item/Timer.png"
            };
            AddChidren(Icon);

@@ -55,7 +55,8 @@
                Gravity = Gravity.CenterVertical,
                TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2,
                TextAlignment = TextAlignment.CenterLeft,
                TextID=R.MyInternationalizationString.Delay
                TextID = R.MyInternationalizationString.Delay,
                TextSize = 14
            };
            AddChidren(TipBtn);

@@ -65,17 +66,18 @@
                Width = Application.GetRealWidth(500),
                Height = Application.GetRealHeight(100),
                Gravity = Gravity.CenterVertical,
                TextAlignment=TextAlignment.CenterRight,
                TextColor=  ZigbeeColor.Current.GXCPlaceHolderTextColor2
                TextAlignment = TextAlignment.CenterRight,
                TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2,
                TextSize = 14
            };
            AddChidren(TitleBtn);

            line = new Button()
            {
                X = Application.GetRealWidth(222),
                Y = Height - 2,
                Y = Height - 1,
                Width = Application.GetRealWidth(800),
                Height = 2,
                Height = 1,
                BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2,
            };
            AddChidren(line);
@@ -96,7 +98,7 @@
        /// <param name="hiden"></param>
        public void HideLine(bool hiden)
        {
            line.Visible = hiden;
            line.Visible = !hiden;
        }
    }
}