合并了晾衣架(非新云端)

黄学彪

2020-12-14 e90209beae6a4e822cecb18e6889f8bda23f630e

 ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs

@@ -106,7 +106,7 @@
            btnDeviceName.TextSize = 16;

            btnDeviceName.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnDeviceName.SelectedTextColor = UserCenterColor.Current.White;

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

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

            this.AddChidren(btnDeviceName, ChidrenBindMode.BindEvent);



            //收集控件

@@ -219,9 +219,9 @@
                btnCollect.IsSelected = collect;

            }

            //设备图标也刷新

            HdlDeviceCommonLogic.Current.SetDeviceIconToControl2(btnDeviceIcon, i_device);

            Common.LocalDevice.Current.SetDeviceIconToControl2(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)

@@ -247,7 +247,7 @@
        public void SetCardOpenStatu(bool isOpen)

        {

            //设备状态必须刷新

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

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

            //开关控件

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

            {

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

            this.isHadOpenSwitch = false;

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

            return HdlDeviceCommonLogic.Current.CheckDeviceIsOnline(i_device);

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

        }





@@ -482,7 +482,7 @@
        public void StartCardLightAppeal()

        {

            //设备状态必须刷新

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

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



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

            this.isAppeal = true;