新云端的代码Ver1.0

黄学彪

2020-11-20 99253403b560f761d5f9af8b4f5140496996433a

 ZigbeeApp/Shared/Phone/Common/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs

old mode 100755
new mode 100644
File was renamed from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs
@@ -3,7 +3,7 @@
using System.Text;

using ZigBee.Device;



namespace Shared.Phone.UserCenter

namespace Shared.Phone
{

    /// <summary>

    /// 设备功能类型的自定义行控件

@@ -127,7 +127,7 @@
                HdlThreadLogic.Current.RunThread(() =>

                {

                    //设置功能类型到网关

                    var result = Common.LocalDevice.Current.SendDeviceFunctionTypeToGateway(this.device, (DeviceFunctionType)nowSelectNo);

                    var result = HdlDeviceCommonLogic.Current.SendDeviceFunctionTypeToGateway(this.device, (DeviceFunctionType)nowSelectNo);
                    

                    HdlThreadLogic.Current.RunMain(() =>

                    {

@@ -194,28 +194,28 @@
                || this.device.Type == DeviceType.DimmableLight)

            {

                //灯光类固定为 灯光

                var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("A418");

                var infoContent = HdlDeviceCommonLogic.Current.GetDeviceModelIdNameInfo("A418");
                strType = infoContent != null ? infoContent.A官方名字 : string.Empty;

                nowSelectNo = 2;

            }

            else if (this.device.Type == DeviceType.WindowCoveringDevice)

            {

                //窗帘固定为 遮阳

                var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("A400");

                var infoContent = HdlDeviceCommonLogic.Current.GetDeviceModelIdNameInfo("A400");
                strType = infoContent != null ? infoContent.A官方名字 : string.Empty;

                nowSelectNo = -1;

            }

            else if (this.device.Type == DeviceType.Thermostat)

            {

                //空调固定为 空调

                var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("A406");

                var infoContent = HdlDeviceCommonLogic.Current.GetDeviceModelIdNameInfo("A406");
                strType = infoContent != null ? infoContent.A官方名字 : string.Empty;

                nowSelectNo = -1;

            }

            else if (this.device.Type == DeviceType.DoorLock)

            {

                //门锁固定为 门锁

                var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("A405");

                var infoContent = HdlDeviceCommonLogic.Current.GetDeviceModelIdNameInfo("A405");
                strType = infoContent != null ? infoContent.A官方名字 : string.Empty;

                nowSelectNo = -1;

            }

@@ -347,7 +347,7 @@
            HdlThreadLogic.Current.RunThread(() =>

            {

                //读取设备功能类型

                var info = Common.LocalDevice.Current.ReadDeviceEpointDeviceInfo(this.device);

                var info = HdlDeviceCommonLogic.Current.ReadDeviceEpointDeviceInfo(this.device);
                if (info != null && ((int)this.device.DfunctionType) != info.FunctionType)

                {

                    this.device.DfunctionType = (DeviceFunctionType)info.FunctionType;