代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

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

@@ -7,19 +7,23 @@
        /// <summary>
        /// name
        /// </summary>
        public Button NameBtn;
        private Button NameBtn;
        /// <summary>
        /// Image
        /// </summary>
        public Button ImageBtn;
        private Button ImageBtn;
        /// <summary>
        /// ImageBG
        /// </summary>
        public Button ImageBG;
        private Button ImageBG;
        /// <summary>
        /// SwitchBtn
        /// </summary>
        public Button SelectBtn;
        private Button SelectBtn;
        /// <summary>
        /// ClickBtn
        /// </summary>
        public Button ClickBtn;
        /// <summary>
        /// v_Selected
        /// </summary>
@@ -107,8 +111,8 @@
            SelectBtn = new Button()
            {
                X = Application.GetRealWidth(896),
                Width = Application.GetMinRealAverage(60),
                Height = Application.GetMinRealAverage(60),
                Width = Application.GetMinRealAverage(70),
                Height = Application.GetMinRealAverage(70),
                Gravity = Gravity.CenterVertical,
                UnSelectedImagePath = "Room/ItemUnSelected_Black.png",
                SelectedImagePath = "Room/ItemSelected.png",
@@ -126,6 +130,9 @@
                Tag = Tag
            };
            AddChidren(line);

            ClickBtn = new Button { };
            AddChidren(ClickBtn);
        }

        /// <summary>
@@ -148,17 +155,9 @@
        /// SetStatu
        /// </summary>
        /// <param name="statu"></param>
        public void SetStatu(bool statu)
        private void SetStatu(bool statu)
        {
            NameBtn.IsSelected = ImageBG.IsSelected = ImageBtn.IsSelected = statu;
        }
        /// <summary>
        /// SetSelectStatu
        /// </summary>
        /// <param name="statu"></param>
        public void SetSelectStatu(bool statu)
        {
            SelectBtn.IsSelected = statu;
            NameBtn.IsSelected = ImageBG.IsSelected = ImageBtn.IsSelected = SelectBtn.IsSelected = statu;
        }
    }
}