~wjc/HomeApp.git

			@@ -139,7 +139,7 @@
			{
			var deviceinof = Method.GetCommonDevice(conditions["MacAddr"], conditions["Epoint"]);
			selecteddevice.deviceNameBtn.Visible = true;
			selecteddevice.deviceNameBtn.Text = LocalDevice.Current.GetDeviceEpointName(deviceinof);
			selecteddevice.deviceNameBtn.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(deviceinof);
			selecteddevice.regionNameBtn.Visible = true;
			Method.RoomNmae(selecteddevice.regionNameBtn, deviceinof);
			selecteddevice.edit.Tag = i;
			@@ -176,7 +176,7 @@
			///删除控件
			selecteddevice.del.MouseUpEventHandler += (sender, e) =>
			{
			var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
			var alert = new ShowMsgControl(ShowMsgType.Confirm,
			Language.StringByID(MyInternationalizationString.doyouwanttodelete),
			Language.StringByID(MyInternationalizationString.confrim));
			alert.Show();
			@@ -246,7 +246,7 @@
			{

			var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
			name =LocalDevice.Current.GetDeviceEpointName(deviceinof);
			name =HdlDeviceCommonLogic.Current.GetDeviceEpointName(deviceinof);
			actiondevice.regionNameBtn.Visible = true;
			Method.RoomNmae(actiondevice.regionNameBtn, deviceinof);

			@@ -504,7 +504,86 @@
			}
			}
			break;
			case DeviceType.ColorTemperatureLight:
			{
			icon = "ZigeeLogic/nightLight.png";
			var taskList = actions["TaskList"] as List<Dictionary<string, string>>;
			if (taskList == null)
			{
			continue;
			}
			foreach (var tasks in taskList)
			{
			switch (tasks["TaskType"])
			{
			case "1":
			{
			if (tasks["Data1"] == "0")
			{
			state += Language.StringByID(MyInternationalizationString.close) + ";";
			}
			else
			{
			state += Language.StringByID(MyInternationalizationString.open) + ";";
			}
			}
			break;

			}
			}
			foreach (var tasks in taskList)
			{
			switch (tasks["TaskType"])
			{

			case "3":
			{
			var intvalue = int.Parse(tasks["Data1"]);
			var lightbrightnessvalue = (intvalue * 100) / 254;
			state += Language.StringByID(MyInternationalizationString.brightness) + lightbrightnessvalue.ToString() + "%;";
			}
			break;

			}
			}
			foreach (var tasks in taskList)
			{
			switch (tasks["TaskType"])
			{

			case "7":
			{
			if (tasks["Data1"] == "0")
			{
			state += Language.StringByID(MyInternationalizationString.buzzer) + Language.StringByID(MyInternationalizationString.close) + ";";
			}
			else
			{
			state += Language.StringByID(MyInternationalizationString.buzzer) + Language.StringByID(MyInternationalizationString.open) + ";";
			}
			}
			break;

			}
			}
			foreach (var tasks in taskList)
			{
			switch (tasks["TaskType"])
			{

			case "8":
			{
			var intvalue = int.Parse(tasks["Data1"]);
			var colorTemperatureValue = 1000000 / (intvalue * 100);
			state += Language.StringByID(MyInternationalizationString.colorTemperature) + colorTemperatureValue.ToString() + "K";
			}
			break;
			}
			}

			state = state.TrimEnd(';');//去掉最后那个";"
			}
			break;
			}


			@@ -512,9 +591,9 @@
			break;
			case 2:
			{
			actiondevice.edit.Visible = false;//隐藏编辑按钮(场景不需要编辑)
			//在本地查找该场景;
			var sceneinof = UserCenter.HdlSceneLogic.Current.GetSceneUIBySceneId(Convert.ToInt32(actions["DeviceAddr"].ToString()));
			actiondevice.edit.Visible = false;//隐藏编辑按钮(场景不需要编辑)
			//在本地查找该场景;
			var sceneinof = HdlSceneLogic.Current.GetSceneUIBySceneId(Convert.ToInt32(actions["DeviceAddr"].ToString()));
			//本地没有存在;
			if (sceneinof == null)
			{
			@@ -542,7 +621,7 @@
			name = sceneinof.Name;
			actiondevice.regionNameBtn.Visible = true;
			/////通过设备找到区域(房间)名称
			actiondevice.regionNameBtn.Text = UserCenter.HdlRoomLogic.Current.GetRoomNameBySceneId(sceneinof.Id);
			actiondevice.regionNameBtn.Text = HdlRoomLogic.Current.GetRoomNameBySceneId(sceneinof.Id);

			}
			break;
			@@ -559,6 +638,7 @@
			actiondevice.selecetddevicestateBtn.Text = state;

			///编辑
			actiondevice.edit.Tag = i.ToString();
			actiondevice.edit.MouseUpEventHandler += (sender, e) =>
			{
			switch (linkType)
			@@ -569,7 +649,7 @@
			var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
			var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
			this.AddChidren(flMain);
			CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_lockaction");
			CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_lockaction", int.Parse(actiondevice.edit.Tag.ToString()));
			}
			break;

			@@ -580,7 +660,7 @@
			actiondevice.del.MouseUpEventHandler += (sender, e) =>
			{

			var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
			var alert = new ShowMsgControl(ShowMsgType.Confirm,
			Language.StringByID(MyInternationalizationString.doyouwanttodelete),
			Language.StringByID(MyInternationalizationString.confrim));
			alert.Show();