2020.2.28

gxc

2020-02-28 66a9965c44ecc32a6696abca876ab9d1cd091584

 ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs

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

        /// <summary>
        /// GetDeviceStatu
@@ -112,11 +106,11 @@
                {
                    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)
            {
@@ -159,7 +153,7 @@
                    }
                    else if(taskListInfo.Data1==4 || taskListInfo.Data1==5)
                    {
                        tempareture = $"{ taskListInfo.Data2} ℃";
                        tempareture = $"{ taskListInfo.Data2/100} ℃";
                    }
                    else if (taskListInfo.Data1 == 6)
                    {
@@ -179,7 +173,6 @@
                }
                return $"{tempareture},{model},{wind}";
            }

            else
            {
                return null;