2020-04-02-2

WJC

2020-04-02 94e4e5b9fd3da964c44b7b14227d6fe2bbb426d7

 ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using ZigBee.Device;

using static ZigBee.Device.Scene;

namespace Shared.Common
@@ -24,7 +25,7 @@
        /// 选择的设备
        /// Type=0 存在
        /// </summary>
        public DeviceUI DeviceUI = new DeviceUI();
        public CommonDevice DeviceUI = new CommonDevice();

        /// <summary>
        /// Type=0、1、2 存在
@@ -56,13 +57,7 @@
        /// 唯一标识--HashCode
        /// DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo)
        /// </summary>
        public string SceneTargetDeviceUIID
        {
            get
            {
                return GetHashCode().ToString();
            }
        }
        public string SceneTargetDeviceUIID = Guid.NewGuid().ToString();

        /// <summary>
        /// GetDeviceStatu
@@ -70,7 +65,7 @@
        /// <returns></returns>
        public string GetDeviceStatu()
        {
            if (DeviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.OnOffOutput)
            if (DeviceUI.Type == ZigBee.Device.DeviceType.OnOffOutput)
            {
                if (TaskList.Count == 0)
                {
@@ -82,7 +77,7 @@
                }
                return Language.StringByID(R.MyInternationalizationString.Shut);
            }
            else if (DeviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.AirSwitch)
            else if (DeviceUI.Type == ZigBee.Device.DeviceType.AirSwitch)
            {
                if (TaskList.Count == 0)
                {
@@ -94,7 +89,7 @@
                }
                return Language.StringByID(R.MyInternationalizationString.Shut);
            }
            else if (DeviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.DimmableLight)
            else if (DeviceUI.Type == ZigBee.Device.DeviceType.DimmableLight)
            {
                if (TaskList.Count == 0)
                {
@@ -106,19 +101,19 @@
                }
                return $"{(int)(TaskList[0].Data1 * 1.0 / 254 * 100)}%";
            }
            else if (DeviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.WindowCoveringDevice)
            else if (DeviceUI.Type == ZigBee.Device.DeviceType.WindowCoveringDevice)
            {
                if (TaskList.Count == 0)
                {
                    return null;
                }
                if (TaskList[0].Data1 == 0)
                if (TaskList[0].Data1 == 1)
                {
                    return Language.StringByID(R.MyInternationalizationString.Shut);
                }
                return $"{TaskList[0].Data1}%";
                return $"{TaskList[0].Data2}%";
            }
            else if (DeviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.Thermostat)
            else if (DeviceUI.Type == ZigBee.Device.DeviceType.Thermostat)
            {
                //温度，模式，风速
                string tempareture = string.Empty;
@@ -159,7 +154,7 @@
                    }
                    else if(taskListInfo.Data1==4 || taskListInfo.Data1==5)
                    {
                        tempareture = $"{ taskListInfo.Data2} ℃";
                        tempareture = $"{ taskListInfo.Data2/100} ℃";
                    }
                    else if (taskListInfo.Data1 == 6)
                    {
@@ -179,7 +174,6 @@
                }
                return $"{tempareture},{model},{wind}";
            }

            else
            {
                return null;