合并了代码

黄学彪

2020-12-31 fe3b2466c68b5db70d38e78039703add3b8b1dfe

 ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs

@@ -101,7 +101,7 @@
            //设备图标控件

            this.btnDeviceIcon = new IconViewControl(78);

            btnDeviceIcon.Gravity = Gravity.Center;

            HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnDeviceIcon, i_device);

            Common.LocalDevice.Current.SetDeviceIconToControl(btnDeviceIcon, i_device);

            frameIconBackGroud.AddChidren(btnDeviceIcon);

            //重新绑定事件

            this.frameTable.ChangedChidrenBindMode(frameIconBackGroud, ChidrenBindMode.BindEvent);

@@ -116,7 +116,7 @@
            btnDeviceName.X = Application.GetRealWidth(181);

            //当指定实际坐标时,这里需要的偏移量为2倍

            btnDeviceName.Y = Application.GetRealHeight(16) + this.chidrenYaxis * 2;

            btnDeviceName.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(i_device);

            btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);

            btnDeviceName.SelectedTextColor = Common.ZigbeeColor.Current.GXCTextSelectedColor;

            this.frameTable.AddChidren(btnDeviceName, ChidrenBindMode.BindEvent);

            

@@ -140,9 +140,9 @@
            }



            //底线

            var btnBottomLine = new NormalViewControl(Application.GetRealWidth(841), HdlControlResourse.BottomLineHeight, false);

            var btnBottomLine = new NormalViewControl(Application.GetRealWidth(841), ControlCommonResourse.BottomLineHeight, false);

            btnBottomLine.X = Application.GetRealWidth(181);

            btnBottomLine.Y = this.Height - HdlControlResourse.BottomLineHeight;

            btnBottomLine.Y = this.Height - ControlCommonResourse.BottomLineHeight;

            btnBottomLine.BackgroundColor = UserCenterColor.Current.ButtomLine;

            this.frameTable.AddChidren(btnBottomLine, ChidrenBindMode.NotBind);



@@ -245,7 +245,7 @@
        {

            this.frameTable.AddChidren(this.btnSwitch, ChidrenBindMode.NotBind);

            btnSwitch.InitControl();

            btnSwitch.X -= HdlControlResourse.XXLeft;

            btnSwitch.X -= ControlCommonResourse.XXLeft;

            btnSwitch.Y += this.chidrenYaxis;



            return btnSwitch;

@@ -262,9 +262,9 @@
        public virtual void RefreshControlInfo(CommonDevice i_device)

        {

            //设备图标也刷新

            HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnDeviceIcon, i_device);

            Common.LocalDevice.Current.SetDeviceIconToControl(btnDeviceIcon, i_device);

            //设备名字

            this.btnDeviceName.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(i_device);

            this.btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);

            //检测设备是否是打开状态

            bool isOpen = this.CheckIsOpenStatu(i_device);

            if (this.isHadOpenSwitch == true && i_device.HadReadDeviceStatu == false)

@@ -292,7 +292,7 @@
            //设备状态必须刷新

            if (this.btnStatu != null)

            {

                this.btnStatu.Text = HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device);

                this.btnStatu.Text = HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device);

            }

            //开关控件

            if (this.btnSwitch != null && this.btnSwitch.IsSelected != isOpen)

@@ -355,7 +355,7 @@
            //如果这个函数被重写的话,则代表这个设备有开关功能

            this.isHadOpenSwitch = false;

            //默认用在线状态来判断

            return HdlDeviceCommonLogic.Current.CheckDeviceIsOnline(i_device);

            return Common.LocalDevice.Current.CheckDeviceIsOnline(i_device);

        }





@@ -526,7 +526,7 @@
        public void StartRowLightAppeal()

        {

            //设备状态必须刷新

            this.btnStatu.Text = HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device);

            this.btnStatu.Text = HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device);



            if (this.isAppeal == true) { return; }

            this.isAppeal = true;