合并完成代码

黄学彪

2019-10-28 8b4d79ca03495e522a1953e04ca17527f33c853a

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

@@ -19,7 +19,11 @@
        /// <summary>
        /// SwitchBtn
        /// </summary>
        public CommonForm.SelectedStatuButton SwitchBtn;
        public Button SwitchBtn;
        /// <summary>
        /// ClickBtn
        /// </summary>
        public Button ClickBtn;
        /// <summary>
        /// v_Selected
        /// </summary>
@@ -56,8 +60,9 @@
        {
            X = Application.GetRealWidth(x);
            Y = Application.GetRealHeight(y);
            Width = Application.GetRealWidth(1022);
            Width = Application.GetRealWidth(1080);
            Height = Application.GetRealHeight(127);
            BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
        }

        /// <summary>
@@ -65,7 +70,7 @@
        /// </summary>
        /// <param name="imagePath"></param>
        /// <param name="selectedImagePath"></param>
        public void Init(string imagePath, string selectedImagePath)
        public void Init(string imagePath, string selectedImagePath,bool click=false)
        {
            ImageBG = new Button()
            {
@@ -94,7 +99,7 @@

            NameBtn = new Button()
            {
                X = Application.GetRealWidth(181),
                X = Application.GetRealWidth(200),
                Width = Application.GetRealWidth(500),
                Height = Application.GetRealHeight(80),
                Gravity = Gravity.CenterVertical,
@@ -105,7 +110,7 @@
            };
            AddChidren(NameBtn);

            SwitchBtn = new SelectedStatuButton()
            SwitchBtn = new Button()
            {
                X = Application.GetRealWidth(896),
                Width = Application.GetMinRealAverage(78),
@@ -119,14 +124,20 @@

            var line = new Button()
            {
                X = Application.GetRealWidth(180),
                X = Application.GetRealWidth(200),
                Y = Height - 2,
                Width = Application.GetRealWidth(841),
                Width = Application.GetRealWidth(821),
                Height = 2,
                BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor,
                Tag = Tag
            };
            AddChidren(line);
            
            ClickBtn = new Button();
            if (click)
            {
                AddChidren(ClickBtn);
            }
        }

        /// <summary>
@@ -153,5 +164,14 @@
        {
            NameBtn.IsSelected = ImageBG.IsSelected = ImageBtn.IsSelected = SwitchBtn.IsSelected = statu;
        }

        /// <summary>
        /// HideSwitchBtn
        /// </summary>
        /// <param name="statu"></param>
        public void HideSwitchBtn(bool statu)
        {
            SwitchBtn.Visible = statu;
        }
    }
}