~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -426,6 +426,44 @@

			}
			break;
			case 541:
			{
			if (conditions["Cluster_ID"] == "1024") {
			state = Language.StringByID(MyInternationalizationString.ambientLight)+"<"+conditions["AttriButeData1"]+"lux"+ Language.StringByID(MyInternationalizationString.hour1);
			}
			else
			{
			if (conditions.ContainsKey("IgnoreTime"))
			{
			int minute = int.Parse(conditions["IgnoreTime"]) / 60;
			int second = int.Parse(conditions["IgnoreTime"]) % 60;
			if (minute != 0 && second != 0)
			{
			state = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);

			}
			else
			{
			if (minute == 0 && second != 0)
			{
			state = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);

			}
			if (minute != 0 && second == 0)
			{
			state = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1);

			}

			}
			}
			else
			{
			state = Language.StringByID(MyInternationalizationString.someone);
			}
			}
			}
			break;
			default:
			{
			if (intvalue == "1")
			@@ -593,6 +631,7 @@
			selecteddevice.selecetddevicestateBtn.Text = state;
			}
			///编辑
			selecteddevice.edit.Tag = i.ToString();
			selecteddevice.edit.MouseUpEventHandler += (sender, e) =>
			{
			switch (Type)
			@@ -625,7 +664,7 @@
			{
			var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
			this.AddChidren(flMain);
			CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "condition_logic");
			CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "condition_logic",int.Parse(selecteddevice.edit.Tag.ToString()));
			}
			else
			{
			@@ -987,6 +1026,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;
			}

			}
			@@ -1113,6 +1232,7 @@
			actiondevice.selecetddevicestateBtn.Text = state;
			}
			///编辑
			actiondevice.edit.Tag = i.ToString();
			actiondevice.edit.MouseUpEventHandler += (sender, e) =>
			{
			switch (linkType)
			@@ -1121,9 +1241,19 @@
			case 0:
			{
			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_logic");
			if (deviceinof.Type != DeviceType.ColorTemperatureLight)
			{
			var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
			this.AddChidren(flMain);
			CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_logic",int.Parse(actiondevice.edit.Tag.ToString()));
			}
			else
			{
			var nightlight = new Nightlight();
			UserView.HomePage.Instance.AddChidren(nightlight);
			UserView.HomePage.Instance.PageIndex += 1;
			nightlight.Show(deviceinof, true, "logic", actions);
			}
			}
			break;
			case 6: