2020.06.12

lss

2020-06-12 9c16d3614d9b88c637f967518a329f239fcd3aaf

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceRoomControl.cs

@@ -26,18 +26,21 @@
        /// <summary>

        /// 在线状态

        /// </summary>

        private bool m_isOnline = false;

        private bool m_isOnline = true;

        /// <summary>

        /// 在线状态

        /// </summary>

        public bool isOnline

        public bool IsOnline

        {

            get { return m_isOnline; }

            set

            {

                m_isOnline = value;

                //设置在线状态的特效

                this.SetOnlineStatu(m_isOnline);

                if (m_isOnline != value)

                {

                    m_isOnline = value;

                    //设置在线状态的特效

                    this.SetOnlineStatu(m_isOnline);

                }

            }

        }

        /// <summary>

@@ -61,7 +64,7 @@
        /// 做成一个显示设备回路+房间的RowLayout

        /// </summary>

        /// <param name="i_device">设备对象</param>

        /// <param name="i_ChidrenYaxis">子控件Y轴偏移量(真实值,有些界面需要这种特殊操作)</param>

        /// <param name="i_ChidrenYaxis">子控件Y轴偏移量(【列表控件的rowSpace/2】即可,不懂默认为0即可)</param>

        public DeviceRoomControl(CommonDevice i_device, int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)

        {

            this.mainKey = Common.LocalDevice.Current.GetDeviceMainKeys(i_device);

@@ -93,7 +96,7 @@
            btnDevie.TextSize = 15;

            //这个坐标有点特殊

            btnDevie.Y = Application.GetRealHeight(12) + this.chidrenYaxis;

            frameTable.AddChidren(btnDevie, ChidrenBindMode.BindEventOnly);

            frameTable.AddChidren(btnDevie, ChidrenBindMode.BindEvent);

            if (tempDevice != null)

            {

                btnDevie.Text = Common.LocalDevice.Current.GetDeviceEpointName(tempDevice);

@@ -111,10 +114,10 @@
            btnRoom.Y = Application.GetRealHeight(72) + this.chidrenYaxis;

            btnRoom.TextSize = 12;

            btnRoom.TextColor = UserCenterColor.Current.TextGrayColor1;

            frameTable.AddChidren(btnRoom, ChidrenBindMode.BindEventOnly);

            frameTable.AddChidren(btnRoom, ChidrenBindMode.BindEvent);

            if (tempDevice != null)

            {

                btnRoom.Text = Common.Room.CurrentRoom.GetRoomNameByDevice(tempDevice);

                btnRoom.Text = HdlRoomLogic.Current.GetRoomNameByDevice(tempDevice);

            }

            else

            {

@@ -140,7 +143,7 @@
                return;

            }

            btnDevie.Text = Common.LocalDevice.Current.GetDeviceEpointName(tempDevice);

            btnRoom.Text = Common.Room.CurrentRoom.GetRoomNameByDevice(tempDevice);

            btnRoom.Text = HdlRoomLogic.Current.GetRoomNameByDevice(tempDevice);



            string unSelectPath = string.Empty;

            string selectPath = string.Empty;

@@ -155,10 +158,10 @@
        /// <summary>

        /// 设置在线状态的特效

        /// </summary>

        /// <param name="isOnline"></param>

        private void SetOnlineStatu(bool isOnline)

        /// <param name="i_isOnline"></param>

        private void SetOnlineStatu(bool i_isOnline)

        {

            if (isOnline == false)

            if (i_isOnline == false)

            {

                btnDevie.TextColor = UserCenterColor.Current.TextGrayColor1;

            }