派生自 ~xm/HomeApp
| ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/GateWay.Droid/Assets/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Home.Ios/Resources/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Category/Category.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,9 +1,14 @@ <Properties StartupConfiguration="{F1296E2C-3777-4385-85B2-DA77617E3178}|Default"> <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" /> <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.SelectDevice" /> <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/AddLogicPage.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/TemplatePage.cs"> <Files> <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="1222" Column="15" /> <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs" Line="381" Column="25" /> <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="459" Column="18" /> <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="1043" Column="97" /> <File FileName="Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs" Line="471" Column="9" /> <File FileName="Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs" Line="133" Column="25" /> <File FileName="Shared/Phone/Device/Logic/TemplatePage.cs" Line="1" Column="1" /> </Files> <Pads> <Pad Id="ProjectPad"> @@ -23,7 +28,16 @@ <Node name="Category" expanded="True" /> <Node name="Logic" expanded="True"> <Node name="DoorLockLogic" expanded="True" /> <Node name="AddLogicPage.cs" selected="True" /> <Node name="TemplatePage.cs" selected="True" /> </Node> </Node> <Node name="UserCenter" expanded="True"> <Node name="CommonBase" expanded="True"> <Node name="Common" expanded="True" /> <Node name="Controls" expanded="True"> <Node name="ClickButtonControls" expanded="True" /> <Node name="MessageControls" expanded="True" /> </Node> </Node> </Node> </Node> ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -417,13 +417,13 @@ 5150=工作日 5151=周末 5152=星期 5153=星期一 5154=星期二 5155=星期三 5156=星期四 5157=星期五 5158=星期六 5159=星期日 5153=周一 5154=周二 5155=周三 5156=周四 5157=周五 5158=周六 5159=周日 5160=日期 5161=开始日期 5162=结束日期 ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -417,13 +417,13 @@ 5150=工作日 5151=周末 5152=星期 5153=星期一 5154=星期二 5155=星期三 5156=星期四 5157=星期五 5158=星期六 5159=星期日 5153=周一 5154=周二 5155=周三 5156=周四 5157=周五 5158=周六 5159=周日 5160=日期 5161=开始日期 5162=结束日期 ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -2013,7 +2013,8 @@ Height = Application.GetRealHeight(190 + 30), Width = Application.GetRealWidth(1080-58), LineColor = ZigbeeColor.Current.LogicBackgroundColor, BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor, BackgroundColor =ZigbeeColor.Current.LogicBackgroundColor, }; refresview.AddChidren(logicRowlayout);
@@ -280,185 +280,97 @@ }; lockRow.AddChidren(Btncomplete); #endregion bool @false = false; lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * membershipIfon.UserIdMode.Count) - 20 - 50); lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * membershipIfon.UserIdMode.Count) + 20 + 50); if (membershipIfon.UserIdMode.Count > 10) { @false = false;// ///元素超出10个，暂时默认显示10; lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * 10) - 20 - 50); lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * 10) + 20 + 50); } else { @false = false; lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * membershipIfon.UserIdMode.Count) - 20 - 50); lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * membershipIfon.UserIdMode.Count) + 20 + 50); } string SelectedLockStatus = ""; ///定义两个变量记录选中状态； string attriButeId = ""; string attriButeData2 = ""; string modeName = ""; if (!@false) for (int j = 0; j < membershipIfon.UserIdMode.Count; j++) { for (int j = 0; j < membershipIfon.UserIdMode.Count; j++) var userIdmode = membershipIfon.UserIdMode[j]; var doorlockfra = new FrameLayout { var userIdmode = membershipIfon.UserIdMode[j]; var doorlockfra = new FrameLayout { Height = Application.GetRealHeight(160), Y = lockRow.Bottom + Application.GetRealHeight(20 + 160 * j), }; lockcolorfra1.AddChidren(doorlockfra); Height = Application.GetRealHeight(160), Y = lockRow.Bottom + Application.GetRealHeight(20 + 160 * j), }; lockcolorfra1.AddChidren(doorlockfra); var doorlockRow = new RowLayout { Y = Application.GetRealHeight(30), Width = Application.GetRealWidth(920), Height = Application.GetRealHeight(130), X = Application.GetRealWidth(80), LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor, }; doorlockfra.AddChidren(doorlockRow); var doorlockRow = new RowLayout { Y = Application.GetRealHeight(30), Width = Application.GetRealWidth(920), Height = Application.GetRealHeight(130), X = Application.GetRealWidth(80), LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor, }; doorlockfra.AddChidren(doorlockRow); var doorlockBtn = new Button { Width = Application.GetRealWidth(600), TextAlignment = TextAlignment.CenterLeft, TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor, Text = userIdmode.ModeName, TextSize = 14, }; doorlockRow.AddChidren(doorlockBtn); var doorlockBtn = new Button { Width = Application.GetRealWidth(600), TextAlignment = TextAlignment.CenterLeft, TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor, Text = userIdmode.ModeName, TextSize = 14, }; doorlockRow.AddChidren(doorlockBtn); var doorlockSelected = new Button { X = Application.GetRealWidth(860), Width = Application.GetMinRealAverage(60), Height = Application.GetMinRealAverage(60), UnSelectedImagePath = "ZigeeLogic/selected.png", Visible = false, Gravity = Gravity.CenterVertical, var doorlockSelected = new Button { X = Application.GetRealWidth(860), Width = Application.GetMinRealAverage(60), Height = Application.GetMinRealAverage(60), UnSelectedImagePath = "ZigeeLogic/selected.png", Visible = false, Gravity = Gravity.CenterVertical, }; doorlockRow.AddChidren(doorlockSelected); if ((membershipIfon.UserIdMode.Count - 1) == j) }; doorlockRow.AddChidren(doorlockSelected); if ((membershipIfon.UserIdMode.Count - 1) == j) { doorlockRow.LineColor = ZigbeeColor.Current.LogicBackgroundColor; } EventHandler<MouseEventArgs> doorlockclick = (sender2, e2) => { SelectedLockStatus = "DoorLock"; selectedIcon.Visible = false; selectedIcon = doorlockSelected; doorlockSelected.Visible = true; //doorlockBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor; attriButeId = userIdmode.OpenMode.ToString(); attriButeData2 = userIdmode.UserId; modeName = userIdmode.ModeName; }; doorlockRow.MouseUpEventHandler += doorlockclick; doorlockBtn.MouseUpEventHandler += doorlockclick; doorlockSelected.MouseUpEventHandler += doorlockclick; doorlockfra.MouseUpEventHandler += doorlockclick; ///显示之前的状态 if (conditionsIndex != -1) { var s = Common.Logic.CurrentLogic.Conditions[conditionsIndex]; if (s["AttriButeId"] == userIdmode.OpenMode.ToString() && s["AttriButeData2"] == userIdmode.UserId) { doorlockRow.LineColor = ZigbeeColor.Current.LogicBackgroundColor; } EventHandler<MouseEventArgs> doorlockclick = (sender2, e2) => { SelectedLockStatus = "DoorLock"; selectedIcon.Visible = false; selectedIcon = doorlockSelected; doorlockSelected.Visible = true; //doorlockBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor; attriButeId = userIdmode.OpenMode.ToString(); attriButeData2 = userIdmode.UserId; modeName = userIdmode.ModeName; }; doorlockRow.MouseUpEventHandler += doorlockclick; doorlockBtn.MouseUpEventHandler += doorlockclick; doorlockSelected.MouseUpEventHandler += doorlockclick; doorlockfra.MouseUpEventHandler += doorlockclick; ///显示之前的状态 if (conditionsIndex != -1) { var s = Common.Logic.CurrentLogic.Conditions[conditionsIndex]; if (s["AttriButeId"] == userIdmode.OpenMode.ToString() && s["AttriButeData2"] == userIdmode.UserId) { selectedIcon.Visible = false; selectedIcon = doorlockSelected; doorlockSelected.Visible = true; } } } } else { for (int j = 0; j < membershipIfon.UserIdMode.Count; j++) { var userIdmode = membershipIfon.UserIdMode[j]; var vv = new VerticalScrolViewLayout { Height = Application.GetRealHeight(160 * 8), Y = lockRow.Bottom, }; lockcolorfra1.AddChidren(vv); var doorlockfra = new FrameLayout { Height = Application.GetRealHeight(160), Y = Application.GetRealHeight(160 * j), }; vv.AddChidren(doorlockfra); var doorlockRow = new RowLayout { Y = Application.GetRealHeight(30), Width = Application.GetRealWidth(920), Height = Application.GetRealHeight(130), X = Application.GetRealWidth(80), LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor, }; doorlockfra.AddChidren(doorlockRow); var doorlockBtn = new Button { Width = Application.GetRealWidth(600), TextAlignment = TextAlignment.CenterLeft, TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor, Text = userIdmode.ModeName, TextSize = 14, }; doorlockRow.AddChidren(doorlockBtn); var doorlockSelected = new Button { X = Application.GetRealWidth(860), Width = Application.GetMinRealAverage(60), Height = Application.GetMinRealAverage(60), UnSelectedImagePath = "ZigeeLogic/selected.png", Visible = false, Gravity = Gravity.CenterVertical, }; doorlockRow.AddChidren(doorlockSelected); if ((membershipIfon.UserIdMode.Count - 1) == j) { doorlockRow.LineColor = ZigbeeColor.Current.LogicBackgroundColor; } EventHandler<MouseEventArgs> doorlockclick = (sender2, e2) => { SelectedLockStatus = "DoorLock"; selectedIcon.Visible = false; selectedIcon = doorlockSelected; doorlockSelected.Visible = true; //doorlockBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor; attriButeId = userIdmode.OpenMode.ToString(); attriButeData2 = userIdmode.UserId; modeName = userIdmode.ModeName; }; doorlockRow.MouseUpEventHandler += doorlockclick; doorlockBtn.MouseUpEventHandler += doorlockclick; doorlockSelected.MouseUpEventHandler += doorlockclick; doorlockfra.MouseUpEventHandler += doorlockclick; ///显示之前的状态 if (conditionsIndex != -1) { var s = Common.Logic.CurrentLogic.Conditions[conditionsIndex]; if (s["AttriButeId"] == userIdmode.OpenMode.ToString() && s["AttriButeData2"] == userIdmode.UserId) { selectedIcon.Visible = false; selectedIcon = doorlockSelected; doorlockSelected.Visible = true; } } } } Btncomplete.MouseUpEventHandler += (sender, e) => { ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
@@ -374,20 +374,18 @@ conditionsRowLayout.AddRightView(del); del.MouseUpEventHandler += (sender, e) => { var alert = new Alert(Language.StringByID(MyInternationalizationString.tip), Language.StringByID(MyInternationalizationString.doyouwanttodelete), Language.StringByID(MyInternationalizationString.cancel), Language.StringByID(MyInternationalizationString.confrim)); alert.ResultEventHandler += (sender1, e1) => { if (e1) { Common.Logic.CurrentLogic.Conditions.Remove(conditions); var lockLogicCommunalPage = new LockLogicCommunalPage(); UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage); UserView.HomePage.Instance.PageIndex += 1; lockLogicCommunalPage.Show(() => { }); } }; var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm, Language.StringByID(MyInternationalizationString.doyouwanttodelete), Language.StringByID(MyInternationalizationString.confrim)); alert.Show(); alert.ConfirmClickEvent += () => { Common.Logic.CurrentLogic.Conditions.Remove(conditions); var lockLogicCommunalPage = new LockLogicCommunalPage(); UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage); UserView.HomePage.Instance.PageIndex += 1; lockLogicCommunalPage.Show(() => { }); }; }; @@ -940,20 +938,19 @@ del.MouseUpEventHandler += (sender, e) => { var alert = new Alert(Language.StringByID(MyInternationalizationString.tip), Language.StringByID(MyInternationalizationString.doyouwanttodelete), Language.StringByID(MyInternationalizationString.cancel), Language.StringByID(MyInternationalizationString.confrim)); alert.ResultEventHandler += (sender1, e1) => { if (e1) { Common.Logic.CurrentLogic.Actions.Remove(actions); var lockLogicCommunalPage = new LockLogicCommunalPage(); UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage); UserView.HomePage.Instance.PageIndex += 1; lockLogicCommunalPage.Show(() => { }); } }; var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm, Language.StringByID(MyInternationalizationString.doyouwanttodelete), Language.StringByID(MyInternationalizationString.confrim)); alert.Show(); alert.ConfirmClickEvent += () => { Common.Logic.CurrentLogic.Actions.Remove(actions); var lockLogicCommunalPage = new LockLogicCommunalPage(); UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage); UserView.HomePage.Instance.PageIndex += 1; lockLogicCommunalPage.Show(() => { }); }; }; @@ -1115,7 +1112,10 @@ var name = logicTextBox.Text.Trim(); if (string.IsNullOrEmpty(logicTextBox.Text.Trim())) { new Alert(Language.StringByID(MyInternationalizationString.Tip), Language.StringByID(MyInternationalizationString.PleaseEnterLogicName), Language.StringByID(MyInternationalizationString.Close)).Show(); var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal, Language.StringByID(MyInternationalizationString.PleaseEnterLogicName), Language.StringByID(MyInternationalizationString.confrim)); alert.Show(); return; } //var logicname = Common.Logic.LockLogicList.Find((logic) => Common.Logic.CurrentLogic.LogicId != logic.LogicId && logic.LogicName == name); ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -1040,20 +1040,19 @@ del.MouseUpEventHandler += (sender, e) => { var alert = new Alert(Language.StringByID(MyInternationalizationString.tip), Language.StringByID(MyInternationalizationString.doyouwanttodelete), Language.StringByID(MyInternationalizationString.cancel), Language.StringByID(MyInternationalizationString.confrim)); alert.ResultEventHandler += (sender1, e1) => { if (e1) { Common.Logic.CurrentLogic.Conditions.Remove(conditions); var logicCommunalPage = new LogicCommunalPage(); UserView.HomePage.Instance.AddChidren(logicCommunalPage); UserView.HomePage.Instance.PageIndex += 1; logicCommunalPage.Show(() => { }); } }; var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm, Language.StringByID(MyInternationalizationString.doyouwanttodelete), Language.StringByID(MyInternationalizationString.confrim)); alert.Show(); alert.ConfirmClickEvent += () => { Common.Logic.CurrentLogic.Conditions.Remove(conditions); var logicCommunalPage = new LogicCommunalPage(); UserView.HomePage.Instance.AddChidren(logicCommunalPage); UserView.HomePage.Instance.PageIndex += 1; logicCommunalPage.Show(() => { }); }; }; @@ -1790,21 +1789,19 @@ del.MouseUpEventHandler += (sender, e) => { var alert = new Alert(Language.StringByID(MyInternationalizationString.tip), Language.StringByID(MyInternationalizationString.doyouwanttodelete), Language.StringByID(MyInternationalizationString.cancel), Language.StringByID(MyInternationalizationString.confrim)); alert.ResultEventHandler += (sender1, e1) => var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm, Language.StringByID(MyInternationalizationString.doyouwanttodelete), Language.StringByID(MyInternationalizationString.confrim)); alert.Show(); alert.ConfirmClickEvent += () => { if (e1) { Common.Logic.CurrentLogic.Actions.Remove(actions); // devicesFrameLayout.RemoveFromParent(); var logicCommunalPage = new LogicCommunalPage(); UserView.HomePage.Instance.AddChidren(logicCommunalPage); UserView.HomePage.Instance.PageIndex += 1; logicCommunalPage.Show(() => { }); } Common.Logic.CurrentLogic.Actions.Remove(actions); // devicesFrameLayout.RemoveFromParent(); var logicCommunalPage = new LogicCommunalPage(); UserView.HomePage.Instance.AddChidren(logicCommunalPage); UserView.HomePage.Instance.PageIndex += 1; logicCommunalPage.Show(() => { }); }; alert.Show(); };
@@ -296,6 +296,13 @@ string SelectedDeviceStatuscondition = ""; lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * user.UserIdMode.Count) - 20 - 50); lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * user.UserIdMode.Count) + 20 + 50); if (user.UserIdMode.Count > 10) { ///元素超出10个，暂时默认显示10; lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * 10) - 20 - 50); lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * 10) + 20 + 50); } for (int i = 0; i < user.UserIdMode.Count; i++) { var userifon = user.UserIdMode[i]; ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
@@ -494,21 +494,18 @@ del.MouseUpEventHandler += (sender, e) => { var alert = new Alert(Language.StringByID(MyInternationalizationString.tip), Language.StringByID(MyInternationalizationString.doyouwanttodelete), Language.StringByID(MyInternationalizationString.cancel), Language.StringByID(MyInternationalizationString.confrim)); alert.ResultEventHandler += (sender1, e1) => { if (e1) { Common.Logic.CurrentLogic.Conditions.Remove(conditions); var templatePage = new TemplatePage(); UserView.HomePage.Instance.AddChidren(templatePage); UserView.HomePage.Instance.PageIndex += 1; templatePage.Show(); } }; var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm, Language.StringByID(MyInternationalizationString.doyouwanttodelete), Language.StringByID(MyInternationalizationString.confrim)); alert.Show(); alert.ConfirmClickEvent += () => { Common.Logic.CurrentLogic.Conditions.Remove(conditions); var templatePage = new TemplatePage(); UserView.HomePage.Instance.AddChidren(templatePage); UserView.HomePage.Instance.PageIndex += 1; templatePage.Show(); }; }; @@ -996,20 +993,19 @@ del.MouseUpEventHandler += (sender, e) => { var alert = new Alert(Language.StringByID(MyInternationalizationString.tip), Language.StringByID(MyInternationalizationString.doyouwanttodelete), Language.StringByID(MyInternationalizationString.cancel), Language.StringByID(MyInternationalizationString.confrim)); alert.ResultEventHandler += (sender1, e1) => { if (e1) { Common.Logic.CurrentLogic.Actions.Remove(actions); var templatePage = new TemplatePage(); UserView.HomePage.Instance.AddChidren(templatePage); UserView.HomePage.Instance.PageIndex += 1; templatePage.Show(); } }; var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm, Language.StringByID(MyInternationalizationString.doyouwanttodelete), Language.StringByID(MyInternationalizationString.confrim)); alert.Show(); alert.ConfirmClickEvent += () => { Common.Logic.CurrentLogic.Actions.Remove(actions); var templatePage = new TemplatePage(); UserView.HomePage.Instance.AddChidren(templatePage); UserView.HomePage.Instance.PageIndex += 1; templatePage.Show(); }; };
@@ -282,10 +282,9 @@ } if (weekvalue == 0) { var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt), Language.StringByID(MyInternationalizationString.selectweek), Language.StringByID(MyInternationalizationString.confrim)); var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal, Language.StringByID(MyInternationalizationString.selectweek), Language.StringByID(MyInternationalizationString.confrim)); alert.Show(); return; }
