Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightFloorMenuControl.cs

@@ -35,6 +35,10 @@
        /// 行数

        /// </summary>

        private int RowCount = 0;

        /// <summary>

        /// 当前楼层id

        /// </summary>

        private string nowFloorId = string.Empty;



        #endregion



@@ -48,9 +52,11 @@
        /// <para>1: 395宽度</para>

        /// <para>2: 449宽度</para>

        /// </param>

        /// <param name="i_floorId">当前选择的楼层ID</param>

        /// <param name="titleText">标题文本(如果不为空,菜单模式变更为拥有标题的模式)</param>

        public TopRightFloorMenuControl(int i_RowCount, int i_widthType, string titleText = null)

        public TopRightFloorMenuControl(int i_RowCount, int i_widthType,string i_floorId, string titleText = null)

        {

            this.nowFloorId = i_floorId;

            this.RowCount = i_RowCount;

            if (i_widthType == 1)

            {

@@ -162,7 +168,7 @@
                btnLine.X = Application.GetRealWidth(81);

            }



            if (floorId == Common.Config.Instance.Home.CurrentFloorId)

            if (this.nowFloorId == floorId)

            {

                //当前楼层默认设置为选择状态

                this.SetRowSelectStatu(rowFrame, true);