From b4312dc4fc0b37955322058937fea6a1845de3bf Mon Sep 17 00:00:00 2001 From: WJC <wjc@hdlchina.com.cn> Date: 星期五, 25 十月 2019 17:53:45 +0800 Subject: [PATCH] 2019-10-25-3 --- ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 16 ++++--- ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs | 73 +++++++++++++++++++++++++++++++++++- ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0 ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 7 +-- ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide-wal | 0 5 files changed, 82 insertions(+), 14 deletions(-) diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml index c21bb35..39415f5 100644 --- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml +++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml @@ -2,17 +2,18 @@ <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" /> <MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.913cb77b0eef11c9119c61a02bc00fec01bf67d6" /> <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" /> - <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/Send.cs"> + <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs"> <Files> <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="14" Column="44" /> <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs" Line="354" Column="41" /> <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="181" Column="15" /> - <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="105" Column="49" /> + <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="238" Column="14" /> <File FileName="Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs" Line="151" Column="92" /> - <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddAction.cs" Line="128" Column="50" /> + <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddAction.cs" Line="193" Column="47" /> <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="1127" Column="38" /> - <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1981" Column="76" /> - <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="50" Column="48" /> + <File FileName="Shared/Phone/Device/Category/Category.cs" Line="2128" Column="19" /> + <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="518" Column="69" /> + <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs" Line="163" Column="16" /> </Files> <Pads> <Pad Id="ProjectPad"> @@ -24,8 +25,9 @@ <Node name="Device" expanded="True"> <Node name="Category" expanded="True" /> <Node name="Logic" expanded="True"> - <Node name="DoorLockLogic" expanded="True" /> - <Node name="Send.cs" selected="True" /> + <Node name="DoorLockLogic" expanded="True"> + <Node name="LockAddScene.cs" selected="True" /> + </Node> </Node> </Node> <Node name="UserCenter" expanded="True"> diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide index eed85c9..3c74d5c 100644 --- a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide +++ b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide Binary files differ diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide-wal b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide-wal index 8a47ffa..b0fdcc6 100644 --- a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide-wal +++ b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide-wal Binary files differ diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs index 56aad98..dc6e348 100644 --- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs +++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs @@ -1807,7 +1807,7 @@ /// <summary> /// 鑷姩鍖� /// </summary> - public async void ShowAutotion() + private async void ShowAutotion() { functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor; @@ -2000,7 +2000,7 @@ /// 鑷姩鍖栧垪琛ㄧ晫闈� /// </summary> /// <param name="refresview">Refresview.</param> - public async void Automationview(VerticalScrolViewLayout refresview) + private async void Automationview(VerticalScrolViewLayout refresview) { refresview.RemoveAll(); foreach (var logic in Common.Logic.LogicList) @@ -2131,8 +2131,6 @@ } - - #endregion #region 鈼� 鎺у埗鐘舵�乢________________________ @@ -2599,5 +2597,6 @@ } } } + #endregion } } diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs index 44dff81..3a1040d 100644 --- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs @@ -12,6 +12,7 @@ { Tag = "LockLogicList"; } + VerticalScrolViewLayout middle; public async void Show() { @@ -91,7 +92,7 @@ }; #endregion - var middle = new VerticalScrolViewLayout + middle = new VerticalScrolViewLayout { Y = topRowLayout.Bottom, Height = Application.GetRealHeight(1920 - 184), @@ -105,7 +106,7 @@ var Idlist = await Send.GetLogicId(1); if (Idlist.Count != 0) { - var listlogic = await Send.ReadList(Idlist.Count,1); + var listlogic = await Send.ReadList(Idlist.Count, 1); //foreach鍙兘闆嗗悎宸茶淇敼,鏋氫妇鎿嶄綔鍙兘涓嶄細鎵ц,鍙兘鍑虹幇宕╂簝(寤鸿for)銆� for (int j = 0; j < listlogic.Count; j++) { @@ -132,6 +133,13 @@ } } //鑷姩鍖� + Automationview(); + CommonPage.Loading.Hide(); + } + + void Automationview() + { + middle.RemoveAll(); for (int i = 0; i < Common.Logic.LockLogicList.Count; i++) { var logic = Common.Logic.LockLogicList[i]; @@ -169,8 +177,67 @@ }; logicRowlayout.AddChidren(logicswitchBtn); + logicswitchBtn.MouseUpEventHandler += (sender, e) => + { + logicswitchBtn.IsSelected = !logicswitchBtn.IsSelected; + if (logicswitchBtn.IsSelected) + { + //閫昏緫寮� + logic.IsEnable = 1; + } + else + { + //閫昏緫鍏� + logic.IsEnable = 0; + } + Logic.Send.LogicControlSwitch(logic); + + }; + ///缂栬緫 + var edit = new Button + { + BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1, + Text = Language.StringByID(MyInternationalizationString.edit), + TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor, + }; + logicRowlayout.AddRightView(edit); + edit.MouseUpEventHandler += (sender, e) => + { + Common.Logic.CurrentLogic = logic; + var lockLogicCommunalPage = new LockLogicCommunalPage(); + UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage); + UserView.HomePage.Instance.PageIndex += 1; + lockLogicCommunalPage.Show(() => { logicnameBtn.Text = logic.LogicName; Automationview(); }); + + }; + + + ///鍒犻櫎 + var del = new Button + { + BackgroundColor = ZigbeeColor.Current.LogicDelBlackColor1, + Text = Language.StringByID(MyInternationalizationString.del), + TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor, + }; + logicRowlayout.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.LogicList.Remove(logic); + Automationview(); + Send.DelLogic(logic.LogicId); + } + }; + alert.Show(); + + }; } - CommonPage.Loading.Hide(); + } } } -- Gitblit v1.8.0