| .vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| .vs/HDL_APP_Project/xs/sqlite3/storage.ide | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| .vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| .vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,17 +1,16 @@ <Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.D4411691-F5B8-40F4-97C1-964F33115DBC" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/DateView.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_Android/Assets/Language.ini"> <Files> <File FileName="HDL_ON/Common/R.cs" Line="456" Column="45" /> <File FileName="HDL-ON_Android/Assets/Language.ini" Line="462" Column="1" /> <File FileName="HDL_ON/Common/R.cs" Line="442" Column="33" /> <File FileName="HDL-ON_Android/Assets/Language.ini" Line="434" Column="7" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="9" Column="21" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/DeviceFunList.cs" Line="210" Column="45" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" Line="285" Column="59" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" Line="266" Column="18" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs" Line="58" Column="23" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/DateView.cs" Line="22" Column="44" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/MonView.cs" Line="1" Column="1" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs" Line="56" Column="45" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/DateView.cs" Line="26" Column="43" /> </Files> <Pads> <Pad Id="ProjectPad"> @@ -21,12 +20,11 @@ <Node name="Common" expanded="True" /> <Node name="Entity" expanded="True" /> <Node name="UI" expanded="True"> <Node name="CSS" expanded="True" /> <Node name="UI2" expanded="True"> <Node name="3-Intelligence" expanded="True"> <Node name="Automation" expanded="True"> <Node name="LogicView" expanded="True"> <Node name="DateView.cs" selected="True" /> </Node> <Node name="LogicView" expanded="True" /> </Node> </Node> <Node name="FuntionControlView" expanded="True" /> @@ -38,6 +36,7 @@ <Node name="Phone" expanded="True"> <Node name="LogicIcon" expanded="True" /> </Node> <Node name="Language.ini" selected="True" /> </Node> </Node> </Node> @@ -54,7 +53,9 @@ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android AndroidDesignerPreferredTheme="AppTheme" AndroidDesignerPreferredDevice="Nexus 4" PreferredExecutionTarget="Android.4b65c4650918" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore /> <BreakpointStore> <Breakpoint file="/Users/hdl/Desktop/wjc/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" line="262" column="1" /> </BreakpointStore> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> </Properties> .vs/HDL_APP_Project/xs/sqlite3/storage.ideBinary files differ
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shmBinary files differ
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-walBinary files differ
HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -204,7 +204,8 @@ } dateTypeView.btnText.Text = weekName; //循环类型(例如：每月，每天)点击事件 dateTypeView.btnClick.MouseUpEventHandler += (sender, e) => { dateTypeView.btnClick.MouseUpEventHandler += (sender, e) => { int clickIndex = int.Parse(dateTypeView.btnClick.Tag.ToString()); switch (clickIndex) { @@ -258,12 +259,18 @@ //确定保存 dateView.btnConfirm.MouseUpEventHandler += (sender3, e3) => { if (weekName == Language.StringByID(StringId.monthly)|| weekName!= Language.StringByID(StringId.weekly)) { //提示：还未选 return; } if (weekName == Language.StringByID(StringId.performA)) { //执行一次 Logic.currlogic.cycle.type = "once"; } else if (weekName == Language.StringByID(StringId.performA)) else if (weekName == Language.StringByID(StringId.days)) { //每天 Logic.currlogic.cycle.type = "day"; @@ -292,7 +299,7 @@ }; //定义一个局部weekList列表用来记录选中数据; List<string> weekList = new List<string>(); if (Logic.currlogic.cycle.type == "mon") if (Logic.currlogic.cycle.type == "week") { //加载之前保存的数据 weekList.AddRange(Logic.currlogic.cycle.value); @@ -388,12 +395,14 @@ } //确定点击事件 weekView.btnConfirm.MouseUpEventHandler += (sender1, e1) => { if (weekList.Count==0) { weekView.btnConfirm.MouseUpEventHandler += (sender1, e1) => { if (weekList.Count == 0) { //提示：还没选中执行周期 return; } Logic.currlogic.cycle.type = "mon"; Logic.currlogic.cycle.type = "week"; Logic.currlogic.cycle.value = weekList; button.Text = GetWeekString(weekList); fLayout.RemoveFromParent(); @@ -414,23 +423,89 @@ { monView.frameLayout.RemoveFromParent(); }; //58 //定义一个局部monList列表用来记录选中数据; List<string> monList = new List<string>(); if (Logic.currlogic.cycle.type == "mon") { //加载之前保存的数据 monList.AddRange(Logic.currlogic.cycle.value); } //定义一个变量记录行数 int lineSun = 0; for (int i = 0; i < 32; i++) for (int i = 1; i < 32; i++) { Button monTextBtn = new Button { Width = Application.GetMinRealAverage(30), Height = Application.GetMinRealAverage(30), Radius = (uint)Application.GetRealHeight(15), Text = i.ToString(), TextSize = LogicView.TextSize.text14, TextColor = CSS.CSS_Color.textColor, SelectedTextColor = CSS.CSS_Color.view, SelectedBackgroundColor = CSS.CSS_Color.textConfirmColor, BackgroundColor = CSS.CSS_Color.viewTranslucence, Tag = i, }; monView.frameLayout.AddChidren(monTextBtn); if (lineSun > 0) { monTextBtn.X = Application.GetRealWidth(16 + ((i - 1) - lineSun * 7) * 46); } else { monTextBtn.X = Application.GetRealWidth(16 + (i - 1) * 46); } monTextBtn.Y = Application.GetRealWidth(58 + 10 + lineSun * (30 + 10)); if (i % 7 == 0) { } else { } //一定执行完再判断是否要换行. lineSun = lineSun + 1; } monTextBtn.MouseUpEventHandler += (sender, e) => { string clickIndex = monTextBtn.Tag.ToString(); monTextBtn.IsSelected = !monTextBtn.IsSelected; if (monTextBtn.IsSelected) { monTextBtn.IsSelected = true; if (!monList.Contains(clickIndex)) { //添加选中数据 monList.Add(clickIndex); } } else { monTextBtn.IsSelected = false; if (monList.Contains(clickIndex)) { //移除选中数据 monList.Remove(clickIndex); } } }; if (monList.Contains(i.ToString())) { monTextBtn.IsSelected = true; } } //确定点击事件 monView.btnConfirm.MouseUpEventHandler += (sender1, e1) => { if (monList.Count == 0) { //提示：还没选中执行周期 return; } Logic.currlogic.cycle.type = "mon"; Logic.currlogic.cycle.value = monList; button.Text = GetMonString(monList); fLayout.RemoveFromParent(); }; } /// <summary> /// 获取星期的字符串 @@ -441,7 +516,8 @@ { string weekTextName = ""; if (weekList.Contains("0")) { if (weekList.Contains("0")) { weekTextName += Language.StringByID(StringId.monday)+","; } if (weekList.Contains("1")) @@ -468,10 +544,29 @@ { weekTextName += Language.StringByID(StringId.sunday) + ","; } if (weekTextName=="") { if (weekTextName == "") { return ""; } return weekTextName.TrimEnd(','); } /// <summary> /// 获取每月的字符串 /// </summary> /// <param name="monList"></param> /// <returns></returns> public string GetMonString(List<string> monList) { string monTextName = Language.StringByID(StringId.monthly); for (int i = 1; i < 32; i++) { if (monList.Contains(i.ToString())) { monTextName += i.ToString() + ","; } } return monTextName.TrimEnd(','); } } }
