合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Text;
using Newtonsoft.Json.Linq;
using Shared;

namespace ZigBee.Device
{
@@ -413,6 +414,43 @@
        }

        /// <summary>
        /// 判断是否是空气质量传感器
        /// </summary>
        /// <param name="dev"></param>
        /// <returns></returns>
        public bool isAirQualitySensor(CommonDevice dev)
        {
            bool hasT = false;
            bool hasH = false;
            bool hasPM = false;
            bool hasCo2 = false;
            foreach (var clu in dev.InClusterList)
            {
                switch (clu.InCluster)
                {
                    case 1026:
                        hasT = true;
                        break;
                    case 1029:
                        hasH = true;
                        break;
                    case 1037:
                        hasCo2 = true;
                        break;
                    case 1066:
                        hasPM = true;
                        break;
                }
            }

            if (hasT == true && hasH == true && hasPM == true && hasCo2 == true)
            {
                return true;
            }
            return false;
        }

        /// <summary>
        /// 保存设备图标
        /// </summary>
        private void SaveDeviceIcon()
@@ -466,15 +504,23 @@
                }
                else if (this.Type == DeviceType.TemperatureSensor)
                {
                    if (((TemperatureSensor)this).SensorDiv == 1)
                    if (isAirQualitySensor(this))
                    {
                        //温度传感器
                        IconPath = "Device/SensorTemperature.png";
                        //空气质量传感器
                        IconPath = "Device/AirQualitySensorEpoint.png";
                    }
                    else if (((TemperatureSensor)this).SensorDiv == 2)
                    else
                    {
                        //湿度传感器
                        IconPath = "Device/SensorHumidity.png";
                        if (((TemperatureSensor)this).SensorDiv == 1)
                        {
                            //温度传感器
                            IconPath = "Device/SensorTemperature.png";
                        }
                        else if (((TemperatureSensor)this).SensorDiv == 2)
                        {
                            //湿度传感器
                            IconPath = "Device/SensorHumidity.png";
                        }
                    }
                }
                else if (this.Type != DeviceType.UnKown)
@@ -2453,13 +2499,13 @@
        public static void DebugPrintLog(string msg, bool flage = true)
        {
#if DEBUG
            if (flage == true)
            {
                if (msg.Contains("DeviceStatusReport") == false)
                {
                    System.Console.WriteLine(msg + "  " + System.DateTime.Now.ToLongTimeString() + " " + System.DateTime.Now.Millisecond);
                }
            }
      if (flage == true)
      {
        if (msg.Contains("DeviceStatusReport") == false)
        {
          System.Console.WriteLine(msg + "  " + System.DateTime.Now.ToLongTimeString() + " " + System.DateTime.Now.Millisecond);
        }
      }
#endif
        }