~wxr/OnPro.git - Gitblit

			@@ -91,7 +91,7 @@
			TextAlignment = TextAlignment.CenterLeft,
			TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
			TextColor = CSS_Color.FirstLevelTitleColor,
			Text = MainPage.cityInfo.location,
			Text = MainPage.cityInfo.city,
			};
			topWeatherView.AddChidren(btnLocationText);

			@@ -392,6 +392,10 @@
			imagePath = "FunctionIcon/EnvirSensor/HchoBg.png";
			iconPath = "FunctionIcon/EnvirSensor/HchoIcon.png";
			break;
			case SPK.SensorLight:
			imagePath = "FunctionIcon/EnvirSensor/IlluminationBg.png";
			iconPath = "FunctionIcon/EnvirSensor/IlluminationIcon.png";
			break;
			}
			sensorView.BackgroundImagePath = imagePath;

			@@ -413,6 +417,10 @@

			btnIcon.MouseUpEventHandler = (sender, e) =>
			{
			if (!IsSupportClick(sensor))
			{
			return;
			}
			#region
			var esp = new EnvironmentalSensorPage(sensor);
			MainPage.BasePageView.AddChidren(esp);
			@@ -432,6 +440,10 @@
			sensorView.AddChidren(btnInfoIcon);
			btnInfoIcon.MouseUpEventHandler = (sender, e) =>
			{
			if (!IsSupportClick(sensor))
			{
			return;
			}
			LoadInfo(sensor);
			};

			@@ -442,15 +454,17 @@
			Width = Application.GetRealWidth(100),
			Height = Application.GetRealWidth(32),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = sensorTemp.GetLevelColorList(sensor.spk)[sensorTemp.GetCurLevel(sensor) - 1],
			TextSize = CSS_FontSize.SubheadingFontSize,
			TextID = levelTextList[sensorTemp.GetCurLevel(sensor) - 1],
			Tag = "SensorLevel",
			};
			sensorView.AddChidren(btnLevel);

			btnLevel.MouseUpEventHandler = (sender, e) =>
			{
			if (!IsSupportClick(sensor))
			{
			return;
			}
			#region
			var esp = new EnvironmentalSensorPage(sensor);
			MainPage.BasePageView.AddChidren(esp);
			@@ -476,6 +490,11 @@
			sensorView.AddChidren(btnSensorValues);
			btnSensorValues.MouseUpEventHandler = (sender, e) =>
			{
			if (!IsSupportClick(sensor))
			{
			return;
			}

			#region
			var esp = new EnvironmentalSensorPage(sensor);
			MainPage.BasePageView.AddChidren(esp);
			@@ -483,7 +502,18 @@
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			#endregion
			};

			if (!IsSupportClick(sensor))
			{
			btnLevel.TextID = StringId.guangzhao;
			btnLevel.TextColor = 0xFF1B2D4D;
			btnSensorValues.Text = sensor.GetAttrState("illuminance");
			}
			else
			{
			btnLevel.TextID = levelTextList[sensorTemp.GetCurLevel(sensor) - 1];
			btnLevel.TextColor = sensorTemp.GetLevelColorList(sensor.spk)[sensorTemp.GetCurLevel(sensor) - 1];
			btnSensorValues.Text = sensor.GetAttrState(FunctionAttributeKey.Value);
			}
			}
			}

			@@ -805,8 +835,24 @@
			}




			/// <summary>
			/// 是否支持事件
			/// </summary>
			/// <param name="device"></param>
			/// <returns></returns>
			bool IsSupportClick(Function device)
			{
			if (device == null)
			{
			return false;
			}
			if (device.spk == SPK.SensorLight)
			{
			//先过滤掉光照传感器
			return false;
			}
			return true;
			}

			#region event

			@@ -857,6 +903,7 @@
			}
			}

			Console.WriteLine(updateTemp.spk);
			for (int i = 0; i < bodyView.sensorListView.ChildrenCount; i++)
			{
			var sensorTag = updateTemp.spk + updateTemp.sid + updateTemp.deviceId;
			@@ -875,9 +922,9 @@
			if (btn.Tag != null)
			{
			FunctionAttributes attr = updateTemp.GetAttribute(FunctionAttributeKey.Value);
			if(attr == null)
			if (attr == null)
			{
			switch(updateTemp.spk)
			switch (updateTemp.spk)
			{
			case SPK.SensorCO2:
			attr = updateTemp.GetAttribute(FunctionAttributeKey.Co2);
			@@ -897,6 +944,10 @@
			case SPK.SensorHumidity:
			attr = updateTemp.GetAttribute(FunctionAttributeKey.Humidity);
			break;
			case SPK.SensorLight:
			attr = updateTemp.GetAttribute(FunctionAttributeKey.Illuminance);
			break;

			}
			}

			@@ -907,8 +958,11 @@
			}
			else if (tag == "SensorLevel")
			{
			(btn as Button).TextID = bodyView.sensorTemp.GetLevelTextList(updateTemp.spk)[bodyView.sensorTemp.GetCurLevel(updateTemp) - 1];
			(btn as Button).TextColor = bodyView.sensorTemp.GetLevelColorList(updateTemp.spk)[bodyView.sensorTemp.GetCurLevel(updateTemp) - 1];
			if (updateTemp.spk != SPK.SensorLight)
			{
			(btn as Button).TextID = bodyView.sensorTemp.GetLevelTextList(updateTemp.spk)[bodyView.sensorTemp.GetCurLevel(updateTemp) - 1];
			(btn as Button).TextColor = bodyView.sensorTemp.GetLevelColorList(updateTemp.spk)[bodyView.sensorTemp.GetCurLevel(updateTemp) - 1];
			}
			}
			}
			}