~wxr/HDL_APP_Project.git

old mode 100644 new mode 100755

			@@ -103,7 +103,7 @@
			LogicView.LogicTypeTitleView cyclicTitle = new LogicView.LogicTypeTitleView();
			cyclicTitle.frameLayout.Height = Application.GetRealHeight(50);
			cyclicTitle.frameLayout.Radius = (uint)Application.GetRealHeight(12);
			cyclicTitle.btnText.Text = MainView.GetWeekText(Logic.currlogic);
			cyclicTitle.btnText.Text = MainView.GetCyclicText(Logic.currlogic);
			viewLayout.AddChidren(cyclicTitle.FLayoutView());

			#endregion
			@@ -160,7 +160,7 @@
			this.AddChidren(fLayout);
			AndOrMethod(fLayout, titleCondition.btnText);
			};
			///条件点击事件
			///条件添加点击事件
			addInputIcon.btnClick.MouseUpEventHandler += (sen, e) =>
			{
			var addInputType = new AddInputType();
			@@ -168,7 +168,7 @@
			addInputType.Show();
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			};
			///目标点击事件
			///目标添加点击事件
			addOutputIcon.btnClick.MouseUpEventHandler += (sen, e) =>
			{
			var addTarget = new AddTarget();
			@@ -184,6 +184,21 @@
			///保存点击事件
			saveView.btnClick.MouseUpEventHandler += (sender, e) =>
			{
			if (Logic.currlogic.input.Count == 0&& Logic.currlogic.output.Count == 0)
			{
			new LogicView.TipPopView().TipBox(StringId.tip, StringId.conditioncNullOrtargetNull);
			return;
			}
			if (Logic.currlogic.input.Count == 0)
			{
			new LogicView.TipPopView().TipBox(StringId.tip, StringId.conditioncNull);
			return;
			}
			if (Logic.currlogic.output.Count == 0)
			{
			new LogicView.TipPopView().TipBox(StringId.tip, StringId.targetNull);
			return;
			}
			Loading loading = new Loading();
			this.AddChidren(loading);
			HDL_ON.DAL.Server.ResponsePackNew responsePackNew = null;
			@@ -194,7 +209,7 @@
			{
			list.Add(logic.name);
			}
			new LogicView.TipPopView().InputBox(StringId.editName, Logic.currlogic.name, StringId.nameNull, StringId.NameAlreadyExists, list, (logicName) =>
			new LogicView.TipPopView().InputBox(StringId.editName, InterfaceDsplaysLogic.GetLogicName(Logic.currlogic), StringId.nameNull, StringId.NameAlreadyExists, list, (logicName) =>
			{
			Logic.currlogic.name = logicName;
			Logic.currlogic.sid = LogicMethod.NewSid();
			@@ -226,7 +241,7 @@
			//数据返序列化为Logic对象
			var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay);
			var logic = Newtonsoft.Json.JsonConvert.DeserializeObject<Logic>(str);
			if (logic.userLogicId!="")
			if (logic.userLogicId != "")
			{
			//更新云端唯一自动化id;
			Logic.currlogic.userLogicId = logic.userLogicId;
			@@ -242,6 +257,10 @@
			Logic.LogicList.Add(Logic.currlogic);
			LogicMethod.RemoveAllView();
			MainView.MainShow();
			}
			else if (responsePackNew != null && responsePackNew.Code == "14005")
			{
			new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.gatewayNotOnline));
			}
			else
			{
			@@ -279,7 +298,11 @@
			LogicMethod.RemoveAllView();
			MainView.MainShow();
			}
			else
			else if (responsePackNew != null && responsePackNew.Code == "14005")
			{
			new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.gatewayNotOnline));
			}
			else
			{
			new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.saveFail));
			}
			@@ -454,7 +477,7 @@
			weekStateList.Clear();
			if (Logic.currlogic.cycle.type == "week")
			{
			var list = GetWeekString(Logic.currlogic.cycle.value, "int");
			var list = InterfaceDsplaysLogic.GetWeekString(Logic.currlogic.cycle.value, "int");
			//加载之前保存的数据
			weekStateList.AddRange(list);
			}
			@@ -462,7 +485,7 @@
			weekView.MultiSelectShow(fLayout, weekStr, Language.StringByID(StringId.cyclic), weekStateList
			, (list) =>
			{
			var statelist = GetWeekString(list, "str");
			var statelist = InterfaceDsplaysLogic.GetWeekString(list, "str");
			Logic.currlogic.cycle.type = "week";
			Logic.currlogic.cycle.value = statelist;
			button.Text = MainView.GetWeekString(statelist);
			@@ -518,114 +541,8 @@


			}
			/// <summary>
			/// 星期周期转换值的方法
			/// </summary>
			/// <param name="list"></param>
			/// <param name="str_or_int"></param>
			/// <returns></returns>
			public List<string> GetWeekString(List<string> list, string str_or_int)
			{
			string weekTextName = "";
			List<string> stateList = new List<string>();
			for (int i = 0; i < list.Count; i++)
			{
			var s = list[i];
			if (str_or_int == "int")
			{
			switch (s)
			{
			case "1":
			{
			weekTextName = Language.StringByID(StringId.monday);
			}
			break;
			case "2":
			{
			weekTextName = Language.StringByID(StringId.tuesday);
			}
			break;
			case "3":
			{
			weekTextName = Language.StringByID(StringId.wednesday);
			}
			break;
			case "4":
			{
			weekTextName = Language.StringByID(StringId.thursday);
			}
			break;
			case "5":
			{
			weekTextName = Language.StringByID(StringId.friday);
			}
			break;
			case "6":
			{
			weekTextName = Language.StringByID(StringId.saturday);
			}
			break;
			case "0":
			{
			weekTextName = Language.StringByID(StringId.sunday);
			}
			break;
			}



			}
			else
			{
			if (Language.StringByID(StringId.monday) == s)
			{
			weekTextName = "1";
			}
			else if (Language.StringByID(StringId.tuesday) == s)
			{
			weekTextName = "2";
			}
			else if (Language.StringByID(StringId.wednesday) == s)
			{
			weekTextName = "3";
			}
			else if (Language.StringByID(StringId.thursday) == s)
			{
			weekTextName = "4";
			}
			else if (Language.StringByID(StringId.friday) == s)
			{
			weekTextName = "5";
			}
			else if (Language.StringByID(StringId.saturday) == s)
			{
			weekTextName = "6";
			}
			else if (Language.StringByID(StringId.sunday) == s)
			{
			weekTextName = "0";
			}
			}
			stateList.Add(weekTextName);

			}

			return stateList;
			}

			/// <summary>
			/// 灰色弹框父控件
			/// </summary>
			/// <param name="frame">显示在哪个界面</param>
			/// <returns></returns>
			public FrameLayout GetFrame(FrameLayout frame, string tagKey)
			{
			FrameLayout fLayout = new FrameLayout
			{
			BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
			Tag = tagKey,

			};
			frame.AddChidren(fLayout);
			return fLayout;
			}
			}
			}