请合并最新多功能面板代码

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

 ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs

@@ -7,7 +7,7 @@
    /// <summary>

    /// 引导界面的共通界面

    /// </summary>

    public class GuideCommonForm : FrameLayout

    public class GuideCommonForm : FrameLayoutBase

    {

        #region ■ 变量声明___________________________



@@ -37,7 +37,7 @@
        /// </summary>

        public virtual void ShowFrom()

        {

            Phone.MainPage.ListRoomViewFrom.Instance.CanClick = false;

            Phone.MainPage.LeftListRoomViewFrom.Instance.CanClick = false;



            UserView.UserPage.Instance.AddChidren(this);

            this.BackgroundColor = Common.ZigbeeColor.Current.GXCGrayBackgroundColor;

@@ -243,8 +243,8 @@
            //主页

            var btnMenuHome = new IconViewControl(10, false);

            btnMenuHome.X = Application.GetRealWidth(109);

            btnMenuHome.Width = Application.GetMinRealAverage(138);

            btnMenuHome.Height = Application.GetMinRealAverage(98);

            btnMenuHome.Width = this.GetPictrueRealSize(138);

            btnMenuHome.Height = this.GetPictrueRealSize(98);

            btnMenuHome.UnSelectedImagePath = "Navigation/HomeSelected.png";

            frameMenu.AddChidren(btnMenuHome);

            var btnMenuHomeName = new NormalViewControl(btnMenuHome.Width, Application.GetRealHeight(40), false);

@@ -259,8 +259,8 @@
            //分类

            var btnFenlei = new IconViewControl(10, false);

            btnFenlei.X = Application.GetRealWidth(469);

            btnFenlei.Width = Application.GetMinRealAverage(138);

            btnFenlei.Height = Application.GetMinRealAverage(98);

            btnFenlei.Width = this.GetPictrueRealSize(138);

            btnFenlei.Height = this.GetPictrueRealSize(98);

            btnFenlei.UnSelectedImagePath = "Navigation/Category.png";

            frameMenu.AddChidren(btnFenlei);

            var btnFenleiName = new NormalViewControl(btnFenlei.Width, Application.GetRealHeight(40), false);

@@ -275,8 +275,8 @@
            //我的

            var btnMy = new IconViewControl(10, false);

            btnMy.X = Application.GetRealWidth(832);

            btnMy.Width = Application.GetMinRealAverage(138);

            btnMy.Height = Application.GetMinRealAverage(98);

            btnMy.Width = this.GetPictrueRealSize(138);

            btnMy.Height = this.GetPictrueRealSize(98);

            btnMy.UnSelectedImagePath = "Navigation/Setting.png";

            frameMenu.AddChidren(btnMy);

            var btnMyName = new NormalViewControl(btnMy.Width, Application.GetRealHeight(40), false);