新云端Ver1.3

黄学彪

2020-12-17 9f326f4000847e6167d8166fa2f6a66f53cb3734

 ZigbeeApp/Shared/Phone/Common/Controls/CompoundControls/BelongAreaControl.cs

File was renamed from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;

namespace Shared.Phone.UserCenter
namespace Shared.Phone
{
    /// <summary>
    /// 所属区域的控件
@@ -54,7 +54,7 @@
        /// <param name="i_gateway">网关对象</param>
        public void InitControl(string i_caption, ZigBee.Device.ZbGateway i_gateway)
        {
            var room = HdlRoomLogic.Current.GetRoomByGateway(i_gateway);
            var room = HdlRoomLogic.Current.GetRoomByGateway(i_gateway.GwId);
            this.DoInitControl(i_caption, room);
        }

@@ -115,7 +115,7 @@
        {
            //标题
            var btnCaption = new NormalViewControl(270, 58, true);
            btnCaption.X = ControlCommonResourse.XXLeft;
            btnCaption.X = HdlControlResourse.XXLeft;
            btnCaption.Gravity = Gravity.CenterVertical;
            btnCaption.Text = i_caption + "：";
            this.AddChidren(btnCaption, ChidrenBindMode.BindEvent);