新云端的代码Ver1.0

黄学彪

2020-11-20 99253403b560f761d5f9af8b4f5140496996433a

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

old mode 100755
new mode 100644
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);