From 1c4904d77f484c075080942d87785481b52b6fb2 Mon Sep 17 00:00:00 2001 From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local> Date: 星期一, 28 十月 2019 14:58:46 +0800 Subject: [PATCH] Revert "Merge branch 'dev-tzy' into DEV_GXC" --- ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs | 398 +++++++++++++------------------------------------------- 1 files changed, 95 insertions(+), 303 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs index 5f7b17b..5009ebd 100755 --- a/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs @@ -12,165 +12,68 @@ public class AddScenePage : FrameLayout { + Button roomname; public AddScenePage() { Tag = "Logic"; } - Button roombjButton = new Button(); - Button roomTextButton = new Button(); - Button clickbutton = new Button(); - HorizontalScrolViewLayout roomhorizontalScrol; - VerticalScrolViewLayout middle; - public string clickTag = "no"; - public SceneUI tempScene = null; - Dictionary<string, object> actionsInfo = new Dictionary<string, object>(); public void Show() { - UserView.HomePage.Instance.ScrollEnabled = false; - this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor; - #region 鏈�涓婇潰鐨勫竷灞�浠g爜 - var topRowLayout = new RowLayout + this.BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor; + + var topFrameLayout = new FrameLayout { - BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor, - Height = Application.GetRealHeight(184), - LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor, + Height = Application.GetRealHeight(220), + Y = Application.GetRealHeight(80), }; - this.AddChidren(topRowLayout); + + AddChidren(topFrameLayout); var titleName = new Button { - TextSize = 16, + //Text = "娣诲姞鍦烘櫙", + TextID = MyInternationalizationString.addscene, + TextSize = 17, TextColor = ZigbeeColor.Current.LogicTextBlackColor, TextAlignment = TextAlignment.CenterLeft, - X = Application.GetRealWidth(160), - Width = Application.GetRealWidth(300), - Height = Application.GetRealHeight(69), - Y = Application.GetRealHeight(92), - TextID = MyInternationalizationString.addscene, + X = Application.GetRealWidth(150), }; - topRowLayout.AddChidren(titleName); - - var clickBtn = new Button - { - Width = Application.GetRealWidth(81 + 51), - Height = Application.GetRealHeight(58 + 40), - Y = Application.GetRealHeight(98 - 40), - }; - topRowLayout.AddChidren(clickBtn); - clickBtn.MouseDownEventHandler += (sender, e) => - { - RemoveFromParent(); - UserView.HomePage.Instance.ScrollEnabled = true; - }; + topFrameLayout.AddChidren(titleName); var back = new Button { - Width = Application.GetRealWidth(30), - Height = Application.GetRealHeight(51), - X = Application.GetRealWidth(81), - Y = Application.GetRealHeight(98), - //Gravity = Gravity.CenterVertical; - UnSelectedImagePath = "ZigeeLogic/back.png", + Width = Application.GetRealWidth(110), + Height = Application.GetRealHeight(110), + X = Application.GetRealWidth(20), + Gravity = Gravity.CenterVertical, + UnSelectedImagePath = "ZigeeLogic/Back.png", }; - topRowLayout.AddChidren(back); - back.MouseDownEventHandler += (sender, e) => { + topFrameLayout.AddChidren(back); + back.MouseDownEventHandler += (sender, e) => + { RemoveFromParent(); - UserView.HomePage.Instance.ScrollEnabled = true; }; - var foolrname = new Button + roomname = new Button { - TextColor = ZigbeeColor.Current.LogicTextBlackColor, + Width = Application.GetMinRealAverage(300 + 300), + Height = Application.GetMinRealAverage(80), + X = Application.GetRealWidth(1080 - 300 - 30 - 300), + Y = Application.GetRealHeight(120), TextAlignment = TextAlignment.CenterRight, - X = Application.GetRealWidth(1080 - 400 - 120), - Width = Application.GetRealWidth(400), - Height = Application.GetRealHeight(69), - Y = Application.GetRealHeight(92), - //TextID = MyInternationalizationString.customroom, - Text = Config.Instance.Home.GetCurrentFloorName, - }; - topRowLayout.AddChidren(foolrname); - var dropdown = new Button - { + //Text = "鑷畾涔夋埧闂�", TextColor = ZigbeeColor.Current.LogicTextBlackColor, - TextAlignment = TextAlignment.CenterRight, - X = foolrname.Right, - Width = Application.GetRealWidth(72), - Height = Application.GetRealHeight(72), - Y = Application.GetRealHeight(92), - UnSelectedImagePath = "ZigeeLogic/drop-down.png", + TextID=MyInternationalizationString.customroom, }; - topRowLayout.AddChidren(dropdown); - #endregion - - ///娌℃湁鎴块棿鐩存帴杩斿洖鍘伙紱 - if (Common.Room.Lists.Count == 0) - { - return; - } - ///鎴块棿婊戝姩鎺т欢 - roomhorizontalScrol = new HorizontalScrolViewLayout() - { - Width = Application.GetRealWidth(1080 - 58), - Height = Application.GetRealHeight(200), - Y = topRowLayout.Bottom, - X = Application.GetRealWidth(58), - }; - this.AddChidren(roomhorizontalScrol); + topFrameLayout.AddChidren(roomname); - - - middle = new VerticalScrolViewLayout(); - middle.Y = roomhorizontalScrol.Bottom; - middle.Height = Application.GetRealHeight(1920 - 260 - 200 - 184); - middle.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor; + var middle = new VerticalScrolViewLayout(); + middle.Y = topFrameLayout.Bottom; + middle.Height = Application.GetRealHeight(1920 - 300); + middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor; this.AddChidren(middle); - var saveframeLayout = new FrameLayout - { - Y = middle.Bottom, - Height = Application.GetRealHeight(260), - BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor, - }; - this.AddChidren(saveframeLayout); - - var btnsave = new Button - { - X = Application.GetRealWidth(85), - Height = Application.GetRealHeight(130), - Width = Application.GetRealWidth(910), - Radius = (uint)Application.GetRealHeight(60), - BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor, - TextID = MyInternationalizationString.Save, - TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor, - }; - saveframeLayout.AddChidren(btnsave); - - btnsave.MouseUpEventHandler += (sender2, e2) => - { - if (clickTag == "no" || tempScene == null) - { - var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt), - Language.StringByID(MyInternationalizationString.selectdevicestatuscondition), - Language.StringByID(MyInternationalizationString.complete)); - alert.Show(); - return; - } - if (actionsInfo.ContainsKey("LinkType")) - { - actionsInfo.Remove("LinkType"); - } - actionsInfo.Add("LinkType", 2); - LogicIfon.AddSceneactions(tempScene, actionsInfo); - var logicCommunalPage = new LogicCommunalPage(); - UserView.HomePage.Instance.AddChidren(logicCommunalPage); - UserView.HomePage.Instance.PageIndex += 1; - logicCommunalPage.Show(() => { }); - - }; - - ///閫変腑妤煎眰 - foolrname.MouseUpEventHandler += (sender, e) => + roomname.MouseUpEventHandler += (sender, e) => { var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor }; this.AddChidren(flMain); @@ -178,228 +81,117 @@ { flMain.RemoveFromParent(); }; - var foolrbj = new VerticalScrolViewLayout + var roombj = new VerticalScrolViewLayout { Width = Application.GetRealWidth(400), Height = Application.GetRealHeight(600), X = Application.GetRealWidth(1080 - 400 - 60), - Y = Application.GetRealHeight(184 + 50), + Y = Application.GetRealHeight(220 + 30 + 80), BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor, Radius = (uint)Application.GetRealHeight(30), }; - flMain.AddChidren(foolrbj); - ///榛樿璋冭瘯 - - foreach (var foolr in Config.Instance.Home.FloorDics) + flMain.AddChidren(roombj); + List<Common.Room> roomlist = new List<Common.Room>(); + roomlist.Clear(); + Common.Room customroom = new Common.Room(); + //铏氭嫙涓�涓埧闂村姞杞芥湰鍦版墍鏈夊満鏅紱 + customroom.SceneUIList.AddRange(Common.Room.AllRoomSceneUIList); + customroom.Name =Language.StringByID(MyInternationalizationString.customroom); + roomlist.Add(customroom); + roomlist.AddRange(Common.Room.Lists); + foreach (var room in roomlist) { - var foolrRowLayout = new FrameLayout + var rowLayout = new RowLayout { Height = Application.GetRealHeight(150), }; - foolrbj.AddChidren(foolrRowLayout); + roombj.AddChidren(rowLayout); - var btnfoolrname = new Button + var btnroomname = new Button { - Width = Application.GetRealWidth(250), - Height = Application.GetRealHeight(160), - Text = foolr.Value, - TextAlignment = TextAlignment.Center, + Width = Application.GetRealWidth(300), + Text = room.Name, + TextAlignment = TextAlignment.CenterLeft, + X = Application.GetRealWidth(30), TextColor = ZigbeeColor.Current.LogicTextBlackColor, - Tag = foolr.Key, }; - foolrRowLayout.AddChidren(btnfoolrname); + rowLayout.AddChidren(btnroomname); - - EventHandler<MouseEventArgs> foolrclick = (sender13, e13) => + EventHandler<MouseEventArgs> roomclick = (sender1, e1) => { - roomhorizontalScrol.RemoveAll(); - foolrname.Text = btnfoolrname.Text; - middle.RemoveAll(); - flMain.RemoveFromParent(); - var list = Send.GetRoomList(btnfoolrname.Tag.ToString()); - AllRoomView(list); - }; - foolrRowLayout.MouseUpEventHandler += foolrclick; - btnfoolrname.MouseUpEventHandler += foolrclick; + flMain.RemoveFromParent(); + roomname.Text = room.Name; + SceneView(middle, room.SceneUIList); + + }; + rowLayout.MouseUpEventHandler += roomclick; + btnroomname.MouseUpEventHandler += roomclick; } + }; - ///绗竴娆¤繘鏉� - var roomlists = new List<Common.Room>(); - roomlists.Clear(); - if (Config.Instance.Home.FloorDics.Count < 2) - { - foolrname.Visible = false; - dropdown.Visible = false; - if (Config.Instance.Home.FloorDics.Count == 0) - { - roomlists.AddRange(Common.Room.Lists); - } - else - { - roomlists = Send.GetRoomList(Config.Instance.Home.CurrentFloorId); - } - } - else - { - roomlists = Send.GetRoomList(Config.Instance.Home.CurrentFloorId); - - } - - - ///绗竴娆¤繘鏉� - AllRoomView(roomlists); + SceneView(middle,Common.Room.AllRoomSceneUIList); } - /// <summary> - /// 鏄剧ず鎵�鏈夋埧闂寸殑鏂规硶 - /// </summary> - /// <param name="RoomList"></param> - void AllRoomView(List<Common.Room> RoomList ) { - for (int i = 0; i < RoomList.Count; i++) - { - var room = RoomList[i]; - var fra = new FrameLayout - { - Height = Application.GetRealHeight(200), - Width = Application.GetRealWidth(255), - }; - roomhorizontalScrol.AddChidren(fra); - var roombjBtn = new Button - { - Height = Application.GetRealHeight(158), - Width = Application.GetRealWidth(255), - UnSelectedImagePath = "ZigeeLogic/iconBackgroundColor.png", - SelectedImagePath = "ZigeeLogic/iconSelectedBackgroundColor.png", - Y = Application.GetRealHeight(21), - }; - fra.AddChidren(roombjBtn); - var roomnameBtn = new Button - { - - Height = Application.GetRealHeight(152 - 26 - 20), - Width = Application.GetRealWidth(255 - 20 - 50), - Text = room.Name, - TextColor = ZigbeeColor.Current.LogicBtnCancelColor, - SelectedTextColor = ZigbeeColor.Current.LogicBlankBackgroundColor, - Y = Application.GetRealHeight(21 + 13 + 10), - X = Application.GetRealWidth(10 + 25), - - }; - fra.AddChidren(roomnameBtn); - - if (i == 0) - { - roombjButton.IsSelected = false; - roombjButton = roombjBtn; - roombjBtn.IsSelected = true; - - roomTextButton.IsSelected = false; - roomTextButton = roomnameBtn; - roomnameBtn.IsSelected = true; - SceneView(room.SceneUIList); - - } - - EventHandler<MouseEventArgs> roomclick = (sender, e) => - { - roombjButton.IsSelected = false; - roombjButton = roombjBtn; - roombjBtn.IsSelected = true; - - roomTextButton.IsSelected = false; - roomTextButton = roomnameBtn; - roomnameBtn.IsSelected = true; - SceneView(room.SceneUIList); - }; - roomnameBtn.MouseUpEventHandler += roomclick; - roombjBtn.MouseUpEventHandler += roomclick; - - } - } - /// <summary> - /// 鏄剧ず鎵�鏈夌殑鍦烘櫙鐨勬柟娉� - /// </summary> - /// <param name="scenelist"></param> - void SceneView(List<SceneUI>scenelist) + void SceneView(VerticalScrolViewLayout middle,List<SceneUI>scenelist) { middle.RemoveAll(); - foreach (var scene in scenelist) + foreach (var tempScene in scenelist) { - var sceneFramelayout = new FrameLayout + var deviceRowLayout = new RowLayout { - Height = Application.GetRealHeight(160), - BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor, + Height = Application.GetRealHeight(180), }; - middle.AddChidren(sceneFramelayout); + middle.AddChidren(deviceRowLayout); - - var sceneIconBtn = new Button + var btn = new Button { - Width = Application.GetRealWidth(81), - Height = Application.GetRealHeight(81), - X = Application.GetRealWidth(58), - Y = Application.GetRealHeight(55), - UnSelectedImagePath = "ZigeeLogic/scene.png", + Height = Application.GetRealHeight(180), + Width = LayoutParams.MatchParent, }; - sceneFramelayout.AddChidren(sceneIconBtn); + deviceRowLayout.AddChidren(btn); - var sceneRow = new RowLayout + var devicetypename = new Button { - Y = Application.GetRealHeight(30), - Width = Application.GetRealWidth(850), - Height = Application.GetRealHeight(130), - X = Application.GetRealWidth(176 + 10), - LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor, - - }; - sceneFramelayout.AddChidren(sceneRow); - - var scenename = new Button - { - Text = scene.Name, + Width = Application.GetRealWidth(600), + Text = tempScene.Name, TextAlignment = TextAlignment.CenterLeft, + X = Application.GetRealWidth(40), + //SelectedBackgroundColor = 0xfffe5e00, TextColor = ZigbeeColor.Current.LogicTextBlackColor, - SelectedTextColor = ZigbeeColor.Current.LogicAddColor, }; - sceneRow.AddChidren(scenename); - - var selectedBtn = new Button - { - Width = Application.GetRealWidth(58), - Height = Application.GetRealHeight(58), - X = Application.GetRealWidth(789), - UnSelectedImagePath = "ZigeeLogic/selected.png", - Visible = false, - Gravity = Gravity.CenterVertical, - }; - sceneRow.AddChidren(selectedBtn); + deviceRowLayout.AddChidren(devicetypename); EventHandler<MouseEventArgs> sceneclick = (sender, e) => { - tempScene = scene; - clickTag = "yes"; - clickbutton.Visible = false; - clickbutton = selectedBtn; - selectedBtn.Visible = true; + Dictionary<string, object> actionsInfo = new Dictionary<string, object>(); + if (actionsInfo.ContainsKey("LinkType")) + { + actionsInfo.Remove("LinkType"); + } if (actionsInfo.ContainsKey("DeviceAddr")) { actionsInfo.Remove("DeviceAddr"); } - actionsInfo.Add("DeviceAddr", scene.Id); + actionsInfo.Add("LinkType", 2); + actionsInfo.Add("DeviceAddr", tempScene.Id); + + LogicIfon.AddSceneactions(tempScene,actionsInfo); + var logicCommunalPage = new LogicCommunalPage(); + UserView.HomePage.Instance.AddChidren(logicCommunalPage); + UserView.HomePage.Instance.PageIndex += 1; + logicCommunalPage.Show(() => { }); }; - sceneFramelayout.MouseUpEventHandler += sceneclick; - sceneIconBtn.MouseUpEventHandler += sceneclick; - sceneRow.MouseUpEventHandler += sceneclick; - scenename.MouseUpEventHandler += sceneclick; - selectedBtn.MouseUpEventHandler += sceneclick; + deviceRowLayout.MouseUpEventHandler += sceneclick; + btn.MouseUpEventHandler += sceneclick; + devicetypename.MouseUpEventHandler += sceneclick; } -- Gitblit v1.8.0