| ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/PublicInterface.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,15 +1,15 @@ <Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default"> <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.4b65c4650918" /> <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.4b65c4650918" /> <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/TimePoint.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicDveiceStatus.cs"> <Files> <File FileName="Shared/Phone/Device/Logic/LogicView/CompleteView.cs" Line="8" Column="18" /> <File FileName="Shared/Phone/Device/Logic/TimePoint.cs" Line="354" Column="61" /> <File FileName="Shared/Phone/Device/Logic/TimePoint.cs" Line="477" Column="29" /> <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="77" Column="23" /> <File FileName="Shared/Phone/Device/Logic/LogicView/mFunView.cs" Line="46" Column="23" /> <File FileName="Shared/Phone/Device/Logic/PublicInterface.cs" Line="19" Column="140" /> <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="337" Column="43" /> <File FileName="Shared/Phone/Device/Logic/LogicDveiceStatus.cs" Line="527" Column="55" /> <File FileName="Shared/Phone/Device/Logic/PublicInterface.cs" Line="135" Column="22" /> <File FileName="Shared/Phone/Device/Logic/LogicDveiceStatus.cs" Line="1123" Column="36" /> <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="213" Column="36" /> </Files> <Pads> <Pad Id="ProjectPad"> @@ -23,7 +23,7 @@ <Node name="Device" expanded="True"> <Node name="Logic" expanded="True"> <Node name="LogicView" expanded="True" /> <Node name="TimePoint.cs" selected="True" /> <Node name="LogicDveiceStatus.cs" selected="True" /> </Node> </Node> </Node> ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ideBinary files differ
ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.csold mode 100755 new mode 100644
@@ -110,12 +110,12 @@ Text = k.ToString().Length == 1 ? "0" + k.ToString() : k.ToString(), Y = Application.GetRealHeight(40), Height = Application.GetMinRealAverage(100), Width = Application.GetMinRealAverage(100), Height = Application.GetRealWidth(100), Width = Application.GetRealWidth(100), X = Application.GetRealWidth(35 * j) + Application.GetRealWidth(100 * (j - 1)), TextColor = ZigbeeColor.Current.LogicTextBlackColor, SelectedTextColor = ZigbeeColor.Current.LogicBlankBackgroundColor, Radius = (uint)Application.GetMinRealAverage(50), Radius = (uint)Application.GetRealWidth(50), BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor, SelectedBackgroundColor = ZigbeeColor.Current.LogicAddColor, Tag = k, ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.csold mode 100755 new mode 100644
@@ -108,7 +108,7 @@ Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim(); if (Common.Logic.CurrentLogic.Conditions.Count == 1) { new LogicDveiceStatus { }.ConditionView(false, this); new LogicDveiceStatus { }.ConditionView(false, this,null); } else { @@ -150,7 +150,7 @@ EventHandler<MouseEventArgs> editclick = (sender, e) => { Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim(); new LogicDveiceStatus { }.ConditionView(true, this); new LogicDveiceStatus { }.ConditionView(true, this, relationship); }; row.MouseUpEventHandler += editclick; relationship.MouseUpEventHandler += editclick; @@ -215,10 +215,6 @@ UserView.HomePage.Instance.PageIndex += 1; cycle.Show(); //var cyclicCycle = new CyclicCycle(() => { UpdateWeek(btnweektext); }); //UserView.HomePage.Instance.AddChidren(cyclicCycle); //UserView.HomePage.Instance.PageIndex += 1; //cyclicCycle.Show(); }; weekBtn.MouseUpEventHandler += cycleclick; weekview.clickBtn.MouseUpEventHandler += cycleclick; ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs
@@ -30,7 +30,7 @@ Common.Logic.CurrentLogic.LogicName = logicName; if (Common.Logic.CurrentLogic.Conditions.Count == 1) { ConditionView(false, frameLayout); ConditionView(false, frameLayout,null); } else { @@ -1118,90 +1118,50 @@ /// <summary> /// 与或条件布局界面的方法 /// </summary> /// <param name="edit"></param> /// <param name="frameLayout"></param> public void ConditionView(bool edit, FrameLayout frameLayout) /// <param name="edit">表示是否编辑</param> /// <param name="frameLayout">显示在哪个界面</param> /// <param name="button">显示选中文本</param> public void ConditionView(bool edit, FrameLayout frameLayout,Button button) { #region ------组合条件界面布局部分 var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor }; frameLayout.AddChidren(flMain); CompleteView completeView = new CompleteView(); flMain.AddChidren(completeView.Show(2)); completeView.Btntitle.TextID = MyInternationalizationString.condition; EventHandler<MouseEventArgs> clickcancel = (sender, e) => { UserView.HomePage.Instance.ScrollEnabled = true; flMain.RemoveFromParent(); }; flMain.MouseUpEventHandler += clickcancel; completeView.Btncancel.MouseUpEventHandler += clickcancel; //满足所有条件 mFunView allFunView = new mFunView(); allFunView.frameLayout.Y = Application.GetRealHeight(140 + 20); completeView.Show(2).AddChidren(allFunView.Show()); allFunView.titleBtn.TextID = MyInternationalizationString.Allconditions; //满足其中一个条件 mFunView ormFunview = new mFunView(); ormFunview.frameLayout.Y = allFunView.frameLayout.Bottom; completeView.Show(2).AddChidren(ormFunview.Show()); ormFunview.titleBtn.TextID = MyInternationalizationString.anycondition; ormFunview.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor; #endregion ///满足所有条件点击事件 allFunView.clickviewBtn.MouseUpEventHandler += (sedner, e) => { allFunView.selectedIconBtn.Visible = true; ormFunview.selectedIconBtn.Visible = false; allFunView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor; ormFunview.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor; }; ///满足其中一个条件点击事件 ormFunview.clickviewBtn.MouseUpEventHandler += (sedner, e) => { allFunView.selectedIconBtn.Visible = false; ormFunview.selectedIconBtn.Visible = true; allFunView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor; ormFunview.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor; }; string stateText = ""; if (edit) { if (Common.Logic.CurrentLogic.Relationship == 0) { allFunView.selectedIconBtn.Visible = true; ormFunview.selectedIconBtn.Visible = false; allFunView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor; ormFunview.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor; } else { allFunView.selectedIconBtn.Visible = false; ormFunview.selectedIconBtn.Visible = true; allFunView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor; ormFunview.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor; } } completeView.Btncomplete.MouseUpEventHandler += (sender, e) => { if (!allFunView.selectedIconBtn.Visible && !ormFunview.selectedIconBtn.Visible) { ///可以提示未选中状态； return; } flMain.RemoveFromParent(); if (allFunView.selectedIconBtn.Visible) switch (Common.Logic.CurrentLogic.Relationship) { case 0: { stateText = Language.StringByID(MyInternationalizationString.Allconditions); } break; case 1: { stateText = Language.StringByID(MyInternationalizationString.anycondition); } break; } } PublicInterface publicInterface = new PublicInterface(); var list = publicInterface.GetViewList("组合条件"); publicInterface.SingleSelectionShow(frameLayout, list, MyInternationalizationString.condition, stateText, (str) => { //显示选中文本 if (button!=null) { button.Text = Language.StringByID(MyInternationalizationString.followingconditions)+ str; } if (str == Language.StringByID(MyInternationalizationString.Allconditions)) { Common.Logic.CurrentLogic.Relationship = 0; } if (ormFunview.selectedIconBtn.Visible) else if (str == Language.StringByID(MyInternationalizationString.anycondition)) { Common.Logic.CurrentLogic.Relationship = 1; Common.Logic.CurrentLogic.Relationship = 1; } if (edit) { @@ -1209,10 +1169,6 @@ { Send.LogicControlSwitch(Common.Logic.CurrentLogic); } var logicCommunalPage = new LogicCommunalPage(); UserView.HomePage.Instance.AddChidren(logicCommunalPage); UserView.HomePage.Instance.PageIndex += 1; logicCommunalPage.Show(() => { }); } else { @@ -1221,7 +1177,12 @@ UserView.HomePage.Instance.PageIndex += 1; addLogicPage.Show(); } }; }); } } ZigbeeApp/Shared/Phone/Device/Logic/PublicInterface.cs
@@ -134,6 +134,14 @@ }; } break; case "组合条件": { list = new List<string> { Language.StringByID(MyInternationalizationString.Allconditions), Language.StringByID(MyInternationalizationString.anycondition), }; } break; } ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.csold mode 100755 new mode 100644
@@ -97,8 +97,8 @@ FunView monView = new FunView(); monView.iconBtn.UnSelectedImagePath = "ZigeeLogic/point.png"; monView.funnameBtn.Text= name; monView.funnextBtn.Width = Application.GetMinRealAverage(60); monView.funnextBtn.Height = Application.GetMinRealAverage(60); monView.funnextBtn.Width = Application.GetRealWidth(60); monView.funnextBtn.Height = Application.GetRealWidth(60); monView.funnextBtn.UnSelectedImagePath = "ZigeeLogic/selected.png"; monView.funnextBtn.Visible = false; middle.AddChidren(monView.FunFrameView());
