From 3f6685c77beeb12baf840733fb890860f4c26e7c Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期四, 25 七月 2024 17:25:59 +0800 Subject: [PATCH] 2024年07月25日17:24:45 --- HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs | 117 +++++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 83 insertions(+), 34 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs index 73371b2..0cd10f0 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() { @@ -73,58 +75,71 @@ //鍔熻兘閿帶鍒� cornerTopFram.selectKeyAction += (keypadEntity) => { - KeyControl(keypadEntity.keypad, keypadEntity.name); + KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked); }; //鏁板瓧閿帶鍒� numberFrame.selectKeyAction += (keypadEntity) => { - KeyControl(keypadEntity.keypad, keypadEntity.name); + KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked); }; //鑿滃崟涓婃寜閿� menuFram.SetTopClickListener((keypadEntity) => { - KeyControl(keypadEntity.keypad, keypadEntity.name); + KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked); }); //鑿滃崟涓嬫寜閿� menuFram.SetBottomClickListener((keypadEntity) => { - KeyControl(keypadEntity.keypad, keypadEntity.name); + KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked); }); //鑿滃崟宸︽寜閿� menuFram.SetLeftClickListener((keypadEntity) => { - KeyControl(keypadEntity.keypad, keypadEntity.name); + KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked); }); //鑿滃崟鍙虫寜閿� menuFram.SetRightClickListener((keypadEntity) => { - KeyControl(keypadEntity.keypad, keypadEntity.name); + KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked); }); //鑿滃崟ok鎸夐敭 menuFram.SetOkClickListener((keypadEntity) => { - KeyControl(keypadEntity.keypad, keypadEntity.name); + KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked); }); - //鏃跺簭鍣� - 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); + }); + } } @@ -140,17 +155,17 @@ TextAlignment = TextAlignment.CenterLeft, TextColor = MusicColor.TextColor, TextSize = TextSize.Text16, - TextID = StringId.dianshi, + Text= this.remoteControl.name, IsBold = true, }; this.AddChidren(btnTitle); - cornerTopFram = new CornerFramLayout(343, 368, 17); + cornerTopFram = new CornerFramLayout(343, 368-24, 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.GetTvKeypadList(),new List<int> { 5, 6 }); + cornerTopFram.LoadButtonPage(AksCommonMethod.Current.GetTvKeypadList(this.remoteControl),new List<int> { 5, 6 }); #region ----棰戦亾 鎺у埗---- FrameLayout middLayout = new FrameLayout @@ -180,6 +195,8 @@ SelectedTextColor = MusicColor.MusicTxet14SelectedColor, TextSize = TextSize.Text16, TextID = StringId.pindao, + Padding = new Padding(0, 0, 0, 0), + IsBold = true, }; leftLayout.AddChidren(leftBtnTitle); @@ -222,6 +239,8 @@ SelectedTextColor = MusicColor.MusicTxet14SelectedColor, TextSize = TextSize.Text16, TextID = StringId.kongzhi, + Padding = new Padding(0, 0, 0, 0), + IsBold = true, }; rightLayout.AddChidren(rightBtnTitle); @@ -248,21 +267,21 @@ #endregion - + //鏁板瓧鎸夐敭瀹瑰櫒 - numberFrame = new CornerFramLayout(343, 368, 17); + numberFrame = new CornerFramLayout(343, 368-24, 17); numberFrame.X = Application.GetRealWidth(16); - numberFrame.Y = middLayout.Bottom + Application.GetRealHeight(16); + numberFrame.Y = middLayout.Bottom; numberFrame.BackgroundColor = MusicColor.WhiteColor; numberFrame.SetMargin(16,0,16,0); - numberFrame.LoadNumberButtonPage(AksCommonMethod.Current.GetNumberKeypadList()); + numberFrame.LoadNumberButtonPage(AksCommonMethod.Current.GetNumberKeypadList(this.remoteControl)); this.AddChidren(numberFrame); //鑿滃崟瀹瑰櫒 - CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 292, 17); + CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 292-30, 17); cornerBottomFram.X = Application.GetRealWidth(16); - cornerBottomFram.Y = middLayout.Bottom + Application.GetRealHeight(16); + cornerBottomFram.Y = middLayout.Bottom; cornerBottomFram.BackgroundColor = MusicColor.WhiteColor; this.AddChidren(cornerBottomFram); @@ -270,10 +289,39 @@ menuFram.Y = Application.GetRealHeight(24); menuFram.AddView(cornerBottomFram); - typeMultiFramLayout = new TypeMultiFramLayout(); - typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32); - typeMultiFramLayout.AddView(cornerBottomFram); - typeMultiFramLayout.btnBottonRightName.TextID = StringId.dianshi; + + 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; + tvSingleFramLayout.CustomCalculationWidth(TypeSingleFramLayout.Orientation.right, + tvSingleFramLayout.singleFramLayout, + tvSingleFramLayout.btnName, + tvSingleFramLayout.btnRightImage, + 48, 200); + } + else + { + + + typeMultiFramLayout = new TypeMultiFramLayout(); + typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32); + typeMultiFramLayout.AddView(cornerBottomFram); + typeMultiFramLayout.btnRightName.Text = this.remoteControl.name; + } //鍒濆鍊� leftBtnTitle.IsSelected = true; @@ -323,14 +371,15 @@ /// </summary> /// <param name="keypad"><鎸夐敭鏍囪瘑/param> /// <param name="keyName"><鎸夐敭鍚嶇О(鎵撳嵃鐢ㄧ殑)/param> - private void KeyControl(string keypad, string keyName) + /// <param name="isSupport"><鏄惁鏀寔鎺у埗/param> + private void KeyControl(string keypad, string keyName,bool isSupport) { //CommonMethod.Current.Loading.Start(); CommonMethod.Current.SunThread(() => { try { - SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName); + SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName, isSupport); } catch { } finally -- Gitblit v1.8.0