~wjc/HomeApp.git

			@@ -21,7 +21,7 @@
			/// <param name="device">Device.</param>
			public static void RoomNmae(Button button, CommonDevice device)
			{
			button.Text = UserCenter.HdlRoomLogic.Current.GetRoomNameByDevice(device);
			button.Text = HdlRoomLogic.Current.GetRoomNameByDevice(device);
			}
			/// <summary>
			/// 返回楼层所有的房间的列表
			@@ -32,7 +32,7 @@
			public static List<Common.Room> GetRoomList(string type, string floorId = null)
			{
			var list = new List<Common.Room>();
			var listAllRoom = UserCenter.HdlRoomLogic.Current.GetAllListRooms();
			var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
			for (int i = 0; i < listAllRoom.Count; i++)
			{
			if (type == "action_logicscene" \|\| type == "action_lockscene")
			@@ -75,7 +75,7 @@
			var deviceUIlist = new List<CommonDevice>();
			foreach (var deviceKey in room.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(deviceKey);
			var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKey);
			if (device == null)
			{
			continue;
			@@ -84,15 +84,15 @@
			{
			//过滤掉不支持的设备
			continue;
			}
			if (device.Type == DeviceType.DoorLock)
			{
			var myInfo = LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
			if (myInfo.ConcreteType == DeviceConcreteType.IntelligentLocks_Sone)
			{
			//暂时不支持S-one门锁;
			//过滤掉不支持S-one门锁设备;
			continue;
			}
			if (device.Type == DeviceType.DoorLock)
			{
			var myInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
			if (myInfo.ConcreteType == DeviceConcreteType.IntelligentLocks_Sone)
			{
			//暂时不支持S-one门锁;
			//过滤掉不支持S-one门锁设备;
			continue;
			}
			}
			if (type == "condition_mould")
			@@ -594,7 +594,9 @@
			}; break;
			case 5:
			{
			string len = "", text = "";
			string len = "";
			string text = "";
			string weekStr = Language.StringByID(MyInternationalizationString.week1);
			List<int> listvalueInt = new List<int>();
			listvalueInt.Clear();
			var maxvalue = Convert.ToString(currentLogic.TimeAttribute.WeekDay, 2);
			@@ -610,44 +612,36 @@
			if (strvalue == "1")
			{
			listvalueInt.Add(j + 1);


			if ((j + 1) == 1)
			{
			text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.mon1) + ",";
			//text += Language.StringByID(MyInternationalizationString.mon) + ",";
			switch ((j + 1)) {
			case 1: {
			text += weekStr + Language.StringByID(MyInternationalizationString.mon1) + ",";
			}
			break;
			case 2: {
			text += weekStr + Language.StringByID(MyInternationalizationString.tue1) + ",";
			}
			break;
			case 3: {
			text += weekStr + Language.StringByID(MyInternationalizationString.wed1) + ",";
			}
			break;
			case 4: {
			text += weekStr + Language.StringByID(MyInternationalizationString.thu1) + ",";
			}
			break;
			case 5: {
			text += weekStr + Language.StringByID(MyInternationalizationString.frl1) + ",";
			}
			break;
			case 6: {
			text += weekStr + Language.StringByID(MyInternationalizationString.sat1) + ",";
			}
			break;
			case 7: {
			text += weekStr + Language.StringByID(MyInternationalizationString.sun1) + ",";
			}
			break;
			}
			else if ((j + 1) == 2)
			{
			text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.tue1) + ",";
			//text += Language.StringByID(MyInternationalizationString.tue) + ",";
			}
			else if ((j + 1) == 3)
			{
			text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.wed1) + ",";
			//text += Language.StringByID(MyInternationalizationString.wed) + ",";
			}
			else if ((j + 1) == 4)
			{
			text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.thu1) + ",";
			//text += Language.StringByID(MyInternationalizationString.thu) + ",";
			}
			else if ((j + 1) == 5)
			{
			text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.frl1) + ",";
			//text += Language.StringByID(MyInternationalizationString.frl) + ",";
			}
			else if ((j + 1) == 6)
			{
			text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.sat1) + ",";
			//text += Language.StringByID(MyInternationalizationString.sat) + ",";
			}
			else if ((j + 1) == 7)
			{
			text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.sun1) + ",";
			//text += Language.StringByID(MyInternationalizationString.sun) + ",";
			}


			}
			}
			@@ -668,8 +662,7 @@
			//{
			// btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.week1) + text.Replace(Language.StringByID(MyInternationalizationString.week1), "").TrimEnd(',');
			//}
			button.Text = Language.StringByID(MyInternationalizationString.week1) + text.Replace(Language.StringByID(MyInternationalizationString.week1), "").TrimEnd(',');
			//btndisplaycycle.Text = text.TrimEnd(',');
			button.Text = weekStr + text.Replace(weekStr, "").TrimEnd(',');
			}; break;
			}

			@@ -771,7 +764,7 @@

			if (CurrentLogic.Conditions.Count == 0 \|\| CurrentLogic.Actions.Count == 0)
			{
			var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
			var alert = new ShowMsgControl(ShowMsgType.Normal,
			Language.StringByID(MyInternationalizationString.addnull),
			Language.StringByID(MyInternationalizationString.confrim));
			alert.Show();
			@@ -780,7 +773,7 @@

			if (string.IsNullOrEmpty(name))
			{
			var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
			var alert = new ShowMsgControl(ShowMsgType.Normal,
			Language.StringByID(MyInternationalizationString.PleaseEnterLogicName),
			Language.StringByID(MyInternationalizationString.confrim));
			alert.Show();