From 5868b389a3544cf14ff65e87b554c07349badd28 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期一, 16 十月 2023 15:30:46 +0800 Subject: [PATCH] 2023年10月16日15:30:28 --- HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs | 77 +++++- HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs | 89 ++++++-- HDL_ON/UI/UI2/FuntionControlView/Aks/SxqPage.cs | 7 HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/BaseFramLayout.cs | 3 HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs | 71 +++++- HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs | 144 ++++++++++--- HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs | 76 +++++-- HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeSingleFramLayout.cs | 2 HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs | 7 HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs | 70 +++++- 10 files changed, 405 insertions(+), 141 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs index 4e23d82..e0333ce 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs @@ -192,7 +192,7 @@ { this.remoteControlList = SendMethod.Current.GetRemoteControlLits(this.device.deviceId); this.sequencerList = SendMethod.Current.GetSequencerLits(this.device.deviceId); - TestData(this.remoteControlList); + //TestData(this.remoteControlList); } catch { } finally @@ -334,6 +334,11 @@ conditionView.SingleSelectionShow(this, deviceTypeList, "璁惧閫夋嫨", ccurrnetDeviceStr , (index) => { + if (this.indexValue == index) + { + //鍚屼竴涓澶囦笉澶勭悊; + return; + } var remoteControl = deviceTypeList[index]; this.indexValue = index; this.currnetIntType = (IntType)remoteControl.type; diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/BaseFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/BaseFramLayout.cs index 375ce96..cfd3d02 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/BaseFramLayout.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/BaseFramLayout.cs @@ -60,6 +60,9 @@ } return bottomHeight; } + + + } diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeSingleFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeSingleFramLayout.cs index cc9cd29..ae48e6f 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeSingleFramLayout.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeSingleFramLayout.cs @@ -27,7 +27,7 @@ public FrameLayout singleFramLayout = new FrameLayout { BackgroundColor = MusicColor.ViewColor, - Gravity = Gravity.CenterHorizontal, + //Gravity = Gravity.CenterHorizontal, Width = Application.GetRealWidth(101), Height = Application.GetRealHeight(40), Radius = (uint)Application.GetRealHeight(20), diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs index 9eec8dd..1af1e6a 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs @@ -34,6 +34,7 @@ public Action<IntType> action; CornerFramLayout cornerFram; TypeMultiFramLayout typeMultiFramLayout; + TypeSingleFramLayout gfSingleFramLayout; public void Show() { @@ -53,24 +54,37 @@ private void EventListener() { - cornerFram.selectKeyAction += (keypadEntity) => + cornerFram.selectKeyAction += (keypadEntity) => { this.KeyControl(keypadEntity.keypad, keypadEntity.name); }; - //鏃跺簭鍣� - typeMultiFramLayout.SetLeftFlClickListener((f) => - { - SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId); - MainPage.BasePageView.AddChidren(sxqPage); - MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; - sxqPage.Show(); - }); - //璁惧鍒囨崲 - typeMultiFramLayout.SetRightFlClickListener((f) => + if (gfSingleFramLayout != null) { - action?.Invoke(IntType.HiFi); - }); + //璁惧鍒囨崲 + gfSingleFramLayout.SetClickListener((f) => + { + action?.Invoke(IntType.HiFi); + }); + } + + if (typeMultiFramLayout != null) + { + //鏃跺簭鍣� + typeMultiFramLayout.SetLeftFlClickListener((f) => + { + SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId); + MainPage.BasePageView.AddChidren(sxqPage); + MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + sxqPage.Show(); + + }); + //璁惧鍒囨崲 + typeMultiFramLayout.SetRightFlClickListener((f) => + { + action?.Invoke(IntType.HiFi); + }); + } } @@ -86,19 +100,19 @@ TextAlignment = TextAlignment.CenterLeft, TextColor = MusicColor.TextColor, TextSize = TextSize.Text16, - Text= this.remoteControl.name, + Text = this.remoteControl.name, IsBold = true, }; this.AddChidren(btnTitle); - cornerFram = new CornerFramLayout(343, 284-18, 17); + cornerFram = new CornerFramLayout(343, 284 - 18, 17); cornerFram.X = Application.GetRealWidth(16); cornerFram.Y = btnTitle.Bottom + Application.GetRealHeight(16); this.AddChidren(cornerFram); cornerFram.SetMargin(16, 0, 16, 0); - cornerFram.LoadButtonPage(AksCommonMethod.Current.GetGFKeypadList(this.remoteControl),4); + cornerFram.LoadButtonPage(AksCommonMethod.Current.GetGFKeypadList(this.remoteControl), 4); CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 72, 17); @@ -108,12 +122,47 @@ cornerBottomFram.Radius = (uint)Application.GetRealHeight(17); this.AddChidren(cornerBottomFram); - typeMultiFramLayout = new TypeMultiFramLayout(); - typeMultiFramLayout.multiFramLayout.Gravity = Gravity.Center; - typeMultiFramLayout.AddView(cornerBottomFram); - typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name; + if (sequencerList.Count == 0) + { + //娌℃湁鏃跺簭鍣� + gfSingleFramLayout = new TypeSingleFramLayout(); + gfSingleFramLayout.AddView(cornerBottomFram); + gfSingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226); + gfSingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101); + gfSingleFramLayout.singleFramLayout.Gravity = Gravity.CenterVertical; + gfSingleFramLayout.btnName.Text = this.remoteControl.name; + gfSingleFramLayout.btnName.X = Application.GetRealWidth(16); + gfSingleFramLayout.btnName.Width = Application.GetRealWidth(48); + gfSingleFramLayout.btnRightImage.X = gfSingleFramLayout.btnName.Right + Application.GetRealWidth(8); + gfSingleFramLayout.btnRightImage.Width = Application.GetRealWidth(16); + gfSingleFramLayout.btnRightImage.Height = Application.GetRealWidth(16); + gfSingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png"; + gfSingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical; + gfSingleFramLayout.btnLeftImage.Visible = false; + + if (gfSingleFramLayout.btnName.GetTextWidth() > Application.GetRealWidth(48)) + { + gfSingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101 - 48) + gfSingleFramLayout.btnName.GetTextWidth(); + gfSingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226 + 48) - gfSingleFramLayout.btnName.GetTextWidth(); + gfSingleFramLayout.btnName.Width = gfSingleFramLayout.btnName.GetTextWidth(); + gfSingleFramLayout.btnRightImage.X = gfSingleFramLayout.btnName.Right + Application.GetRealWidth(8); + } + } + else + { + //鏈夋椂搴忓櫒 + typeMultiFramLayout = new TypeMultiFramLayout(); + typeMultiFramLayout.multiFramLayout.Gravity = Gravity.Center; + typeMultiFramLayout.AddView(cornerBottomFram); + typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name; + + } this.AdjustRealHeight(16); + + + + } /// <summary> diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs index 11bb451..2cc2a11 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs @@ -50,6 +50,8 @@ /// </summary> TypeMultiFramLayout typeMultiFramLayout; + TypeSingleFramLayout jdhSingleFramLayout; + public void Show() { @@ -106,21 +108,33 @@ { this.KeyControl(keypadEntity.keypad, keypadEntity.name); }); - //鏃跺簭鍣� - typeMultiFramLayout.SetLeftFlClickListener((f) => - { - SxqPage sxqPage = new SxqPage(this.sequencerList,this.remoteControl.deviceId); - MainPage.BasePageView.AddChidren(sxqPage); - MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; - sxqPage.Show(); - }); - //璁惧鍒囨崲 - typeMultiFramLayout.SetRightFlClickListener((f) => + if (jdhSingleFramLayout != null) { - Console.WriteLine("4"); - action?.Invoke(IntType.STB); - }); + + //璁惧鍒囨崲 + jdhSingleFramLayout.SetClickListener((f) => + { + action?.Invoke(IntType.STB); + }); + } + if (typeMultiFramLayout != null) + { + //鏃跺簭鍣� + typeMultiFramLayout.SetLeftFlClickListener((f) => + { + SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId); + MainPage.BasePageView.AddChidren(sxqPage); + MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + sxqPage.Show(); + + }); + //璁惧鍒囨崲 + typeMultiFramLayout.SetRightFlClickListener((f) => + { + action?.Invoke(IntType.STB); + }); + } } @@ -270,10 +284,32 @@ menuFram.Y = Application.GetRealHeight(24); menuFram.AddView(cornerBottomFram); - typeMultiFramLayout = new TypeMultiFramLayout(); - typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32); - typeMultiFramLayout.AddView(cornerBottomFram); - typeMultiFramLayout.btnBottonRightName.Text=this.remoteControl.name; + if (sequencerList.Count == 0) + { + //娌℃湁鏃跺簭鍣� + jdhSingleFramLayout = new TypeSingleFramLayout(); + jdhSingleFramLayout.AddView(cornerBottomFram); + jdhSingleFramLayout.singleFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32); + jdhSingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226); + jdhSingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101); + jdhSingleFramLayout.btnName.Text = this.remoteControl.name; + jdhSingleFramLayout.btnName.X = Application.GetRealWidth(16); + jdhSingleFramLayout.btnName.Width = Application.GetRealWidth(48); + jdhSingleFramLayout.btnRightImage.X = jdhSingleFramLayout.btnName.Right + Application.GetRealWidth(8); + jdhSingleFramLayout.btnRightImage.Width = Application.GetRealWidth(16); + jdhSingleFramLayout.btnRightImage.Height = Application.GetRealWidth(16); + jdhSingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png"; + jdhSingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical; + jdhSingleFramLayout.btnLeftImage.Visible = false; + } + else + { + + typeMultiFramLayout = new TypeMultiFramLayout(); + typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32); + typeMultiFramLayout.AddView(cornerBottomFram); + typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name; + } //鍒濆鍊� leftBtnTitle.IsSelected = true; diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs index c44cb18..eb85390 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs @@ -33,7 +33,11 @@ private RemoteControlEntity remoteControl; public Action<IntType> action; CornerFramLayout cornerFram; - TypeSingleFramLayout typeSingleFramLayout; + /// <summary> + /// 褰卞簱 + /// </summary> + TypeSingleFramLayout ykSingleFramLayout; + TypeSingleFramLayout bfqSingleFramLayout; MenuFramLayout menuFram; TypeMultiFramLayout typeMultiFramLayout; @@ -65,14 +69,7 @@ } this.KeyControl(keypadEntity.keypad, keypadEntity.name); }; - - typeSingleFramLayout.SetClickListener((f) => - { - YkPage ykPage = new YkPage(this.remoteControl); - MainPage.BasePageView.AddChidren(ykPage); - MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; - ykPage.Show(); - }); + menuFram.SetTopClickListener((keypadEntity) => { @@ -95,18 +92,40 @@ { this.KeyControl(keypadEntity.keypad, keypadEntity.name); }); - typeMultiFramLayout.SetLeftFlClickListener((f) => - { - SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId); - MainPage.BasePageView.AddChidren(sxqPage); - MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; - sxqPage.Show(); - }); - typeMultiFramLayout.SetRightFlClickListener((f) => + + if (bfqSingleFramLayout != null) { - action?.Invoke(IntType.Player); - }); + bfqSingleFramLayout.SetClickListener((f) => + { + action?.Invoke(IntType.Player); + }); + } + if (ykSingleFramLayout != null) + { + ykSingleFramLayout.SetClickListener((f) => + { + YkPage ykPage = new YkPage(this.remoteControl); + MainPage.BasePageView.AddChidren(ykPage); + MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + ykPage.Show(); + }); + } + if (typeMultiFramLayout != null) + { + typeMultiFramLayout.SetLeftFlClickListener((f) => + { + SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId); + MainPage.BasePageView.AddChidren(sxqPage); + MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + sxqPage.Show(); + + }); + typeMultiFramLayout.SetRightFlClickListener((f) => + { + action?.Invoke(IntType.Player); + }); + } } @@ -125,11 +144,11 @@ //TextID = StringId.bofangqi, Text = this.remoteControl.name, Padding = new Padding(0, 0, 0, 0), - IsBold =true, + IsBold = true, }; this.AddChidren(btnTitle); - cornerFram = new CornerFramLayout(343, 452-30, 17); + cornerFram = new CornerFramLayout(343, 452 - 30, 17); this.AddChidren(cornerFram); cornerFram.X = Application.GetRealWidth(16); cornerFram.Y = btnTitle.Bottom + Application.GetRealHeight(16); @@ -137,31 +156,78 @@ cornerFram.LoadButtonPage(AksCommonMethod.Current.GetMusicKeypadList(this.remoteControl), 4); - CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 364-32, 17); - this.AddChidren(cornerBottomFram); - cornerBottomFram.X = Application.GetRealWidth(16); - cornerBottomFram.Y = cornerFram.Bottom + Application.GetRealHeight(16); - cornerBottomFram.BackgroundColor = MusicColor.WhiteColor; - cornerBottomFram.Radius = (uint)Application.GetRealHeight(17); + if (sequencerList.Count == 0) + { + //娌℃湁鏃跺簭鍣� + CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 364 - 32-32-40, 17); + this.AddChidren(cornerBottomFram); + cornerBottomFram.X = Application.GetRealWidth(16); + cornerBottomFram.Y = cornerFram.Bottom + Application.GetRealHeight(16); + cornerBottomFram.BackgroundColor = MusicColor.WhiteColor; + cornerBottomFram.Radius = (uint)Application.GetRealHeight(17); + + //鎾斁鍣� + bfqSingleFramLayout = new TypeSingleFramLayout(); + bfqSingleFramLayout.AddView(cornerBottomFram); + bfqSingleFramLayout.singleFramLayout.Y = Application.GetRealHeight(24); + bfqSingleFramLayout.singleFramLayout.X = Application.GetRealWidth(16); + bfqSingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101); + bfqSingleFramLayout.btnName.Text = this.remoteControl.name; + bfqSingleFramLayout.btnName.X= Application.GetRealWidth(16); + bfqSingleFramLayout.btnName.Width = Application.GetRealWidth(48); + bfqSingleFramLayout.btnRightImage.X = bfqSingleFramLayout.btnName.Right + Application.GetRealWidth(8); + bfqSingleFramLayout.btnRightImage.Width = Application.GetRealWidth(16); + bfqSingleFramLayout.btnRightImage.Height = Application.GetRealWidth(16); + bfqSingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png"; + bfqSingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical; + bfqSingleFramLayout.btnLeftImage.Visible = false; - typeSingleFramLayout = new TypeSingleFramLayout(); - typeSingleFramLayout.AddView(cornerBottomFram); - typeSingleFramLayout.singleFramLayout.Y = Application.GetRealHeight(24); - menuFram = new MenuFramLayout(); - menuFram.AddView(cornerBottomFram); - menuFram.Y = typeSingleFramLayout.singleFramLayout.Bottom + Application.GetRealHeight(32); + //褰卞簱 + ykSingleFramLayout = new TypeSingleFramLayout(); + ykSingleFramLayout.AddView(cornerBottomFram); + ykSingleFramLayout.singleFramLayout.Y = Application.GetRealHeight(24); + ykSingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226); + + menuFram = new MenuFramLayout(); + menuFram.AddView(cornerBottomFram); + menuFram.Y = ykSingleFramLayout.singleFramLayout.Bottom + Application.GetRealHeight(32); + this.AdjustRealHeight(16); + + } + else + { + //鏈夋椂搴忓櫒 + CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 364 - 32, 17); + this.AddChidren(cornerBottomFram); + cornerBottomFram.X = Application.GetRealWidth(16); + cornerBottomFram.Y = cornerFram.Bottom + Application.GetRealHeight(16); + cornerBottomFram.BackgroundColor = MusicColor.WhiteColor; + cornerBottomFram.Radius = (uint)Application.GetRealHeight(17); - typeMultiFramLayout = new TypeMultiFramLayout(); - typeMultiFramLayout.AddView(cornerBottomFram); - typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32); - //typeMultiFramLayout.btnBottonRightName.TextID = StringId.bofangqi; - typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name; + ykSingleFramLayout = new TypeSingleFramLayout(); + ykSingleFramLayout.AddView(cornerBottomFram); + ykSingleFramLayout.singleFramLayout.Y = Application.GetRealHeight(24); + ykSingleFramLayout.singleFramLayout.Gravity = Gravity.CenterHorizontal; - this.AdjustRealHeight(16); + + + menuFram = new MenuFramLayout(); + menuFram.AddView(cornerBottomFram); + menuFram.Y = ykSingleFramLayout.singleFramLayout.Bottom + Application.GetRealHeight(32); + + + typeMultiFramLayout = new TypeMultiFramLayout(); + typeMultiFramLayout.AddView(cornerBottomFram); + typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32); + //typeMultiFramLayout.btnBottonRightName.TextID = StringId.bofangqi; + typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name; + + this.AdjustRealHeight(16); + } } /// <summary> diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/SxqPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/SxqPage.cs index 2662f4d..6bcd53a 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Aks/SxqPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/SxqPage.cs @@ -47,13 +47,6 @@ public SxqPage(List<SequencerEntity> sequencerList, string deviceId) { this.sequencerList = sequencerList; - for (int i = 0; i < 12; i++) { - this.sequencerList.Add(new SequencerEntity {seqId=i.ToString(),name=i.ToString(),type=1 }); - } - for (int i = 0; i < 4; i++) - { - this.sequencerList.Add(new SequencerEntity { seqId = i.ToString(), name = i.ToString(), type = 2 }); - } this.deviceId = deviceId; } public void Show() diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs index 566d607..f1e0f1a 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs @@ -49,6 +49,8 @@ /// </summary> TypeMultiFramLayout typeMultiFramLayout; + TypeSingleFramLayout tvSingleFramLayout; + public void Show() { @@ -111,20 +113,33 @@ KeyControl(keypadEntity.keypad, keypadEntity.name); }); - //鏃跺簭鍣� - typeMultiFramLayout.SetLeftFlClickListener((f) => - { - SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId); - MainPage.BasePageView.AddChidren(sxqPage); - MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; - sxqPage.Show(); - }); - //璁惧鍒囨崲 - typeMultiFramLayout.SetRightFlClickListener((f) => + if (tvSingleFramLayout != null) { - action?.Invoke(IntType.TV); - }); + //璁惧鍒囨崲 + tvSingleFramLayout.SetClickListener((f) => + { + action?.Invoke(IntType.TV); + }); + } + + if (typeMultiFramLayout != null) + { + //鏃跺簭鍣� + typeMultiFramLayout.SetLeftFlClickListener((f) => + { + SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId); + MainPage.BasePageView.AddChidren(sxqPage); + MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + sxqPage.Show(); + + }); + //璁惧鍒囨崲 + typeMultiFramLayout.SetRightFlClickListener((f) => + { + action?.Invoke(IntType.TV); + }); + } } @@ -274,10 +289,34 @@ menuFram.Y = Application.GetRealHeight(24); menuFram.AddView(cornerBottomFram); - typeMultiFramLayout = new TypeMultiFramLayout(); - typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32); - typeMultiFramLayout.AddView(cornerBottomFram); - typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name; + + if (sequencerList.Count == 0) + { + //娌℃湁鏃跺簭鍣� + tvSingleFramLayout = new TypeSingleFramLayout(); + tvSingleFramLayout.AddView(cornerBottomFram); + tvSingleFramLayout.singleFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32); + tvSingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226); + tvSingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101); + tvSingleFramLayout.btnName.Text = this.remoteControl.name; + tvSingleFramLayout.btnName.X = Application.GetRealWidth(16); + tvSingleFramLayout.btnName.Width = Application.GetRealWidth(48); + tvSingleFramLayout.btnRightImage.X = tvSingleFramLayout.btnName.Right + Application.GetRealWidth(8); + tvSingleFramLayout.btnRightImage.Width = Application.GetRealWidth(16); + tvSingleFramLayout.btnRightImage.Height = Application.GetRealWidth(16); + tvSingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png"; + tvSingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical; + tvSingleFramLayout.btnLeftImage.Visible = false; + } + else + { + + + typeMultiFramLayout = new TypeMultiFramLayout(); + typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32); + typeMultiFramLayout.AddView(cornerBottomFram); + typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name; + } //鍒濆鍊� leftBtnTitle.IsSelected = true; diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs index d0496b5..63f2a72 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs @@ -36,6 +36,8 @@ MenuFramLayout menuFram; TypeMultiFramLayout typeMultiFramLayout; + TypeSingleFramLayout tyySingleFramLayout; + public void Show() { //鍒濆鍖朥I @@ -94,23 +96,35 @@ this.KeyControl(keypadEntity.keypad, keypadEntity.name); }); - //鏃跺簭鍣� - typeMultiFramLayout.SetLeftFlClickListener((f) => + if (typeMultiFramLayout != null) { - SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId); - MainPage.BasePageView.AddChidren(sxqPage); - MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; - sxqPage.Show(); + //鏃跺簭鍣� + typeMultiFramLayout.SetLeftFlClickListener((f) => + { + SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId); + MainPage.BasePageView.AddChidren(sxqPage); + MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + sxqPage.Show(); - }); - //璁惧鍒囨崲 - typeMultiFramLayout.SetRightFlClickListener((f) => + }); + //璁惧鍒囨崲 + typeMultiFramLayout.SetRightFlClickListener((f) => + { + action?.Invoke(IntType.Projector); + }); + } + if (tyySingleFramLayout != null) { - action?.Invoke(IntType.Projector); - }); + //璁惧鍒囨崲 + tyySingleFramLayout.SetClickListener((f) => + { + action?.Invoke(IntType.Projector); + }); + } + } - + private void InitUI() { this.BackgroundColor = MusicColor.ViewColor; @@ -123,20 +137,20 @@ TextAlignment = TextAlignment.CenterLeft, TextColor = MusicColor.TextColor, TextSize = TextSize.Text16, - Text= this.remoteControl.name, + Text = this.remoteControl.name, IsBold = true, }; this.AddChidren(btnTitle); - cornerTopFram = new CornerFramLayout(343, 452-30, 17); + cornerTopFram = new CornerFramLayout(343, 452 - 30, 17); cornerTopFram.X = Application.GetRealWidth(16); cornerTopFram.Y = btnTitle.Bottom + Application.GetRealHeight(16); this.AddChidren(cornerTopFram); cornerTopFram.SetMargin(16, 0, 16, 0); - cornerTopFram.LoadButtonPage(AksCommonMethod.Current.GetTYYKeypadList(this.remoteControl),new List<int> { 3, 4, 5 }); + cornerTopFram.LoadButtonPage(AksCommonMethod.Current.GetTYYKeypadList(this.remoteControl), new List<int> { 3, 4, 5 }); - CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 292-30, 17); + CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 292 - 30, 17); cornerBottomFram.X = Application.GetRealWidth(16); cornerBottomFram.Y = cornerTopFram.Bottom + Application.GetRealHeight(16); cornerBottomFram.BackgroundColor = MusicColor.WhiteColor; @@ -146,11 +160,31 @@ menuFram = new MenuFramLayout(); menuFram.Y = Application.GetRealHeight(24); menuFram.AddView(cornerBottomFram); - - typeMultiFramLayout = new TypeMultiFramLayout(); - typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32); - typeMultiFramLayout.AddView(cornerBottomFram); - typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name; + if (sequencerList.Count == 0) + { + //娌℃湁鏃跺簭鍣� + tyySingleFramLayout = new TypeSingleFramLayout(); + tyySingleFramLayout.AddView(cornerBottomFram); + tyySingleFramLayout.singleFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32); + tyySingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226); + tyySingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101); + tyySingleFramLayout.btnName.Text = this.remoteControl.name; + tyySingleFramLayout.btnName.X = Application.GetRealWidth(16); + tyySingleFramLayout.btnName.Width = Application.GetRealWidth(48); + tyySingleFramLayout.btnRightImage.X = tyySingleFramLayout.btnName.Right + Application.GetRealWidth(8); + tyySingleFramLayout.btnRightImage.Width = Application.GetRealWidth(16); + tyySingleFramLayout.btnRightImage.Height = Application.GetRealWidth(16); + tyySingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png"; + tyySingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical; + tyySingleFramLayout.btnLeftImage.Visible = false; + } + else + { + typeMultiFramLayout = new TypeMultiFramLayout(); + typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32); + typeMultiFramLayout.AddView(cornerBottomFram); + typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name; + } this.AdjustRealHeight(16); } diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs index 55b3559..5e49151 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs @@ -35,7 +35,8 @@ /// <summary> /// 鍒囨崲璁惧瀹瑰櫒 /// </summary> - TypeMultiFramLayout typeMultiFramLayout; + TypeMultiFramLayout typeMultiFramLayout; + TypeSingleFramLayout tyySingleFramLayout; Button switchBtn; CustomFrameLayout xinxiFL; @@ -354,22 +355,28 @@ }); - - //鏃跺簭鍣� - typeMultiFramLayout.SetLeftFlClickListener((f) => + if (typeMultiFramLayout != null) { - SxqPage sxqPage = new SxqPage(this.sequencerList,this.remoteControl.deviceId); - MainPage.BasePageView.AddChidren(sxqPage); - MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; - sxqPage.Show(); + //鏃跺簭鍣� + typeMultiFramLayout.SetLeftFlClickListener((f) => + { + SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId); + MainPage.BasePageView.AddChidren(sxqPage); + MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + sxqPage.Show(); - }); - //璁惧鍒囨崲 - typeMultiFramLayout.SetRightFlClickListener((f) => - { - Console.WriteLine("4"); - action?.Invoke(IntType.Control); - }); + }); + //璁惧鍒囨崲 + typeMultiFramLayout.SetRightFlClickListener((f) => + { + action?.Invoke(IntType.Control); + }); + } + if (tyySingleFramLayout!=null) { + tyySingleFramLayout.SetClickListener((f) => { + action?.Invoke(IntType.Control); + }); + } } /// <summary> @@ -1081,10 +1088,42 @@ cornerBottomFram.BackgroundColor = MusicColor.WhiteColor; this.AddChidren(cornerBottomFram); - typeMultiFramLayout = new TypeMultiFramLayout(); - typeMultiFramLayout.multiFramLayout.Y = Application.GetRealHeight(16); - typeMultiFramLayout.AddView(cornerBottomFram); - typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name; + + if (sequencerList.Count == 0) + { + //娌℃湁鏃跺簭鍣� + tyySingleFramLayout = new TypeSingleFramLayout(); + tyySingleFramLayout.AddView(cornerBottomFram); + tyySingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226); + tyySingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101); + tyySingleFramLayout.singleFramLayout.Gravity = Gravity.CenterVertical; + tyySingleFramLayout.btnName.Text = this.remoteControl.name; + tyySingleFramLayout.btnName.X = Application.GetRealWidth(16); + tyySingleFramLayout.btnName.Width = Application.GetRealWidth(48); + tyySingleFramLayout.btnRightImage.X = tyySingleFramLayout.btnName.Right + Application.GetRealWidth(8); + tyySingleFramLayout.btnRightImage.Width = Application.GetRealWidth(16); + tyySingleFramLayout.btnRightImage.Height = Application.GetRealWidth(16); + tyySingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png"; + tyySingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical; + tyySingleFramLayout.btnLeftImage.Visible = false; + + if (tyySingleFramLayout.btnName.GetTextWidth() > Application.GetRealWidth(48)) + { + tyySingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101 - 48) + tyySingleFramLayout.btnName.GetTextWidth(); + tyySingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226 + 48) - tyySingleFramLayout.btnName.GetTextWidth(); + tyySingleFramLayout.btnName.Width =tyySingleFramLayout.btnName.GetTextWidth(); + tyySingleFramLayout.btnRightImage.X = tyySingleFramLayout.btnName.Right + Application.GetRealWidth(8); + } + + } + else + { + + typeMultiFramLayout = new TypeMultiFramLayout(); + typeMultiFramLayout.multiFramLayout.Y = Application.GetRealHeight(16); + typeMultiFramLayout.AddView(cornerBottomFram); + typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name; + } this.AdjustRealHeight(16); } -- Gitblit v1.8.0