新云端代码Ver1.2

黄学彪

2020-12-16 0d9f64668fd7350d6a21fd157e32009a96d98134

 ZigbeeApp/Shared/Phone/Common/Controls/DeviceControls/DeviceSelectControl.cs

File was renamed from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceSelectControl.cs
@@ -3,7 +3,7 @@
using System.Text;
using ZigBee.Device;

namespace Shared.Phone.UserCenter
namespace Shared.Phone
{
    /// <summary>
    /// 做成一个设备选择的行控件
@@ -17,7 +17,7 @@
        /// </summary>
        public CommonDevice device
        {
            get { return Common.LocalDevice.Current.GetDevice(MainKeys); }
            get { return HdlDeviceCommonLogic.Current.GetDevice(MainKeys); }
        }
        /// <summary>
        /// 选择控件
@@ -66,7 +66,7 @@
        /// <param name="i_ChidrenYaxis">子控件Y轴偏移量(【列表控件的rowSpace/2】即可,不懂默认为0即可)</param>
        public DeviceSelectControl(CommonDevice i_device, bool autoSelect, int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)
        {
            this.MainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(i_device);
            this.MainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(i_device);
            if (autoSelect == true)
            {
                this.ButtonClickEvent += (sender, e) =>
@@ -83,10 +83,10 @@
        {
            //图标
            var btnIcon = this.AddLeftIcon();
            Common.LocalDevice.Current.SetDeviceIconToControl(btnIcon, device);
            HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnIcon, device);

            //设备
            string eName = Common.LocalDevice.Current.GetDeviceEpointName(device);
            string eName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
            this.AddTopView(eName, 850);

            //房间