~wjc/HomeApp.git

			@@ -156,11 +156,6 @@
			}
			else if (device.Type == DeviceType.PMSensor)
			{
			//在网关没有回复之前,默认离线
			if (device.HadReadDeviceStatu == false)
			{
			return Language.StringByID(R.MyInternationalizationString.uOffLine);
			}
			//空气质量
			string curQuality = "";
			//温度
			@@ -313,7 +308,7 @@
			//烟雾
			if (ias.iASInfo?.Alarm1 == 1)
			{
			return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Alarm);
			return Language.StringByID(R.MyInternationalizationString.uSmogAlarm);
			}
			return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Safe);
			}
			@@ -322,9 +317,9 @@
			//pir
			if (ias.iASInfo?.Alarm1 == 1)
			{
			return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Alarm);
			return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_HavePerson);
			}
			return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Safe);
			return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_NoPerson);
			}
			else if (info.ConcreteType == DeviceConcreteType.Sensor_Keyfob)
			{
			@@ -340,9 +335,9 @@
			//运动传感器
			if (ias.iASInfo?.Alarm1 == 1)
			{
			return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Alarm);
			return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_HavePerson);
			}
			return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Normal);
			return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_NoPerson);
			}
			else if (info.ConcreteType == DeviceConcreteType.Sensor_EmergencyButton)
			{
			@@ -352,6 +347,15 @@
			return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Alarm);
			}
			return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Normal);
			}
			else if (info.ConcreteType == DeviceConcreteType.Sensor_SphericalMotion)
			{
			//球型移动传感器
			if (ias.iASInfo?.Alarm1 == 1)
			{
			return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_HavePerson);
			}
			return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_NoPerson);
			}
			else
			{
			@@ -368,19 +372,19 @@
			var tempera = device as TemperatureSensor;
			if (tempera.SensorDiv == 1)
			{
			if (tempera.Temperatrue == 0)
			if (tempera.currentTemperature == 0)
			{
			return "--℃";
			return "0.0℃";
			}
			return $"{tempera.Temperatrue}℃";
			return $"{tempera.currentTemperature}℃";
			}
			else if (tempera.SensorDiv == 2)
			{
			if (tempera.Humidity == 0)
			if (tempera.currentHumidity == 0)
			{
			return "--%";
			}
			return $"{tempera.Humidity}%";
			return $"{tempera.currentHumidity}%";
			}
			return null;
			}