wjc
2023-08-03 fd1f19e8479c764fa28b0da3a2f9b34a3debe772
2023年08月03日21:47:02
2个文件已添加
1 文件已重命名
5个文件已修改
362 ■■■■■ 已修改文件
HDL-ON_Android/Assets/Phone/AksIcon/pindao2.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/HDL-ON_Android.csproj 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/HDL_ON.projitems 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/NumberFrameLayout.cs 208 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/TYYPage.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs 134 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/Phone/AksIcon/pindao2.png

HDL-ON_Android/HDL-ON_Android.csproj
@@ -478,7 +478,6 @@
    <AndroidAsset Include="Assets\Phone\AksIcon\mubujiang.png" />
    <AndroidAsset Include="Assets\Phone\AksIcon\mubusheng.png" />
    <AndroidAsset Include="Assets\Phone\AksIcon\pindao1.png" />
    <AndroidAsset Include="Assets\Phone\AksIcon\pingdao2.png" />
    <AndroidAsset Include="Assets\Phone\AksIcon\quxiao.png" />
    <AndroidAsset Include="Assets\Phone\AksIcon\shang.png" />
    <AndroidAsset Include="Assets\Phone\AksIcon\shangyibu.png" />
@@ -510,6 +509,7 @@
    <AndroidAsset Include="Assets\Phone\AksIcon\zdyzuo2.png" />
    <AndroidAsset Include="Assets\Phone\AksIcon\zimu.png" />
    <AndroidAsset Include="Assets\Phone\AksIcon\zuo.png" />
    <AndroidAsset Include="Assets\Phone\AksIcon\pindao2.png" />
  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\values\colors.xml" />
HDL_ON/HDL_ON.projitems
@@ -581,6 +581,8 @@
    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\DetailPage.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\GFPage.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\TYYPage.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\TvPage.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Aks\CommonView\NumberFrameLayout.cs" />
  </ItemGroup>
  <ItemGroup>
    <Folder Include="$(MSBuildThisFileDirectory)Entity\Device\" />
HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs
@@ -221,7 +221,16 @@
                        };
                    } break;
                case IntType.TV: { } break;
                case IntType.TV: {
                        TvPage tvPage = new TvPage();
                        this.vv.AddChidren(tvPage);
                        tvPage.Show();
                        tvPage.action += (type) =>
                        {
                            SelectedType();
                        };
                    } break;
                case IntType.STB: { } break;
                case IntType.Projector: {
                        TYYPage tYYPage = new TYYPage();
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs
@@ -19,6 +19,7 @@
            this.Width = Application.GetRealWidth(width);
            this.Height = Application.GetRealHeight(height);
            this.Radius = (uint)Application.GetRealHeight(cornerValue);
            this.BackgroundColor = 0XFF457625;
        }
        Button btnImage = new Button
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/NumberFrameLayout.cs
New file
@@ -0,0 +1,208 @@
using System;
using HDL_ON.UI.Music;
using Shared;
namespace HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView
{
    public class NumberFrameLayout
    {
        public NumberFrameLayout()
        {
        }
        public FrameLayout layout = new FrameLayout
        {
            Height = Application.GetRealHeight(368),
            Width = Application.GetRealWidth(343),
            Radius = (uint)Application.GetRealHeight(17),
            BackgroundColor = MusicColor.WhiteColor,
        };
        Button btn1 = new Button
        {
            Width = Application.GetRealWidth(78),
            Height = Application.GetRealHeight(84),
            Text = "1",
            TextSize = TextSize.Text20,
            TextColor = MusicColor.TextColor,
            TextAlignment = TextAlignment.Center,
            IsBold = true,
        };
        Button btn2 = new Button
        {
            Width = Application.GetRealWidth(78),
            Height = Application.GetRealHeight(84),
            Text = "2",
            TextSize = TextSize.Text20,
            TextColor = MusicColor.TextColor,
            TextAlignment = TextAlignment.Center,
            IsBold = true,
        };
        Button btn3 = new Button
        {
            Width = Application.GetRealWidth(78),
            Height = Application.GetRealHeight(84),
            Text = "3",
            TextSize = TextSize.Text20,
            TextColor = MusicColor.TextColor,
            TextAlignment = TextAlignment.Center,
            IsBold = true,
        };
        Button btn4 = new Button
        {
            Width = Application.GetRealWidth(78),
            Height = Application.GetRealHeight(84),
            Text = "4",
            TextSize = TextSize.Text20,
            TextColor = MusicColor.TextColor,
            TextAlignment = TextAlignment.Center,
            IsBold = true,
        };
        Button btn5 = new Button
        {
            Width = Application.GetRealWidth(78),
            Height = Application.GetRealHeight(84),
            Text = "5",
            TextSize = TextSize.Text20,
            TextColor = MusicColor.TextColor,
            TextAlignment = TextAlignment.Center,
            IsBold = true,
        };
        Button btn6 = new Button
        {
            Width = Application.GetRealWidth(78),
            Height = Application.GetRealHeight(84),
            Text = "6",
            TextSize = TextSize.Text20,
            TextColor = MusicColor.TextColor,
            TextAlignment = TextAlignment.Center,
            IsBold = true,
        };
        Button btn7 = new Button
        {
            Width = Application.GetRealWidth(78),
            Height = Application.GetRealHeight(84),
            Text = "7",
            TextSize = TextSize.Text20,
            TextColor = MusicColor.TextColor,
            TextAlignment = TextAlignment.Center,
            IsBold = true,
        };
        Button btn8 = new Button
        {
            Width = Application.GetRealWidth(78),
            Height = Application.GetRealHeight(84),
            Text = "8",
            TextSize = TextSize.Text20,
            TextColor = MusicColor.TextColor,
            TextAlignment = TextAlignment.Center,
            IsBold = true,
        };
        Button btn9 = new Button
        {
            Width = Application.GetRealWidth(78),
            Height = Application.GetRealHeight(84),
            Text = "9",
            TextSize = TextSize.Text20,
            TextColor = MusicColor.TextColor,
            TextAlignment = TextAlignment.Center,
            IsBold = true,
        };
        Button btn0 = new Button
        {
            Width = Application.GetRealWidth(78),
            Height = Application.GetRealHeight(84),
            Text = "0",
            TextSize = TextSize.Text20,
            TextColor = MusicColor.TextColor,
            TextAlignment = TextAlignment.Center,
            IsBold = true,
        };
        Button btn = new Button
        {
            Width = Application.GetRealWidth(78),
            Height = Application.GetRealHeight(84),
            Text = "-/--",
            TextSize = TextSize.Text20,
            TextColor = MusicColor.TextColor,
            TextAlignment = TextAlignment.Center,
            IsBold = true,
        };
        ButtonFramLayout pdjiaFramLayout = new ButtonFramLayout();
        ButtonFramLayout pdjianFramLayout = new ButtonFramLayout();
        /// <summary>
        /// 添加布局
        /// </summary>
        /// <param name="parent"></param>
        public void AddView(FrameLayout parent)
        {
            parent.AddChidren(layout);
            layout.AddChidren(btn1);
            layout.AddChidren(btn2);
            layout.AddChidren(btn3);
            layout.AddChidren(btn4);
            layout.AddChidren(btn5);
            layout.AddChidren(btn6);
            layout.AddChidren(btn7);
            layout.AddChidren(btn8);
            layout.AddChidren(btn9);
            layout.AddChidren(btn0);
            layout.AddChidren(btn);
            layout.AddChidren(pdjiaFramLayout);
            layout.AddChidren(pdjianFramLayout);
            btn1.Y = Application.GetRealHeight(16);
            btn1.X = Application.GetRealWidth(16);
            btn2.Y = Application.GetRealHeight(16);
            btn2.X = btn1.Right;
            btn3.Y = Application.GetRealHeight(16);
            btn3.X = btn2.Right;
            pdjiaFramLayout.AddImageView();
            pdjiaFramLayout.AddNameView();
            pdjiaFramLayout.Y = Application.GetRealHeight(16);
            pdjiaFramLayout.GetImageButton().Height = Application.GetRealHeight(32);
            pdjiaFramLayout.GetImageButton().Width = Application.GetRealWidth(32);
            pdjiaFramLayout.GetImageButton().UnSelectedImagePath = "AksIcon/pindao1.png";
            pdjiaFramLayout.GetNameButton().TextID = StringId.pindaojia;
            pdjiaFramLayout.X = btn3.Right;
            btn4.Y = btn1.Bottom;
            btn4.X = Application.GetRealWidth(16);
            btn5.Y = btn2.Bottom;
            btn5.X = btn4.Right;
            btn6.Y = btn3.Bottom;
            btn6.X = btn5.Right;
            pdjianFramLayout.AddImageView();
            pdjianFramLayout.AddNameView();
            pdjianFramLayout.Y = pdjiaFramLayout.Bottom;
            pdjianFramLayout.GetImageButton().Height = Application.GetRealHeight(32);
            pdjianFramLayout.GetImageButton().Width = Application.GetRealWidth(32);
            pdjianFramLayout.GetImageButton().UnSelectedImagePath = "AksIcon/pindao2.png";
            pdjianFramLayout.GetNameButton().TextID = StringId.pindaojian;
            pdjianFramLayout.X = btn6.Right;
            btn7.Y = btn6.Bottom;
            btn7.X = Application.GetRealWidth(16);
            btn8.Y = btn5.Bottom;
            btn8.X = btn7.Right;
            btn9.Y = btn6.Bottom;
            btn9.X = btn8.Right;
            btn.Y = pdjianFramLayout.Bottom;
            btn.X = btn9.Right;
            btn0.Y = btn8.Bottom;
            btn0.X = Application.GetRealWidth(16 + 78);
        }
    }
}
HDL_ON/UI/UI2/FuntionControlView/Aks/TYYPage.cs
@@ -77,7 +77,7 @@
            typeMultiFramLayout.SetRightFlClickListener((f) =>
            {
                Console.WriteLine("4");
                action?.Invoke(IntType.HiFi);
                action?.Invoke(IntType.Projector);
            });
        }
@@ -98,7 +98,7 @@
            };
            this.AddChidren(btnTitle);
            cornerTopFram = new CornerFramLayout(343, 452 + 84, 4, 17);
            cornerTopFram = new CornerFramLayout(343, 452, 4, 17);
            cornerTopFram.X = Application.GetRealWidth(16);
            cornerTopFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
            this.AddChidren(cornerTopFram);
HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
New file
@@ -0,0 +1,134 @@
using System;
using System.Collections.Generic;
using HDL_ON.UI.Music;
using HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView;
using Shared;
using static HDL_ON.UI.UI2.FuntionControlView.Aks.AksPage;
namespace HDL_ON.UI.UI2.FuntionControlView.Aks
{
    /// <summary>
    /// 电视界面
    /// </summary>
    public class TvPage : BaseFramLayout
    {
        public TvPage()
        {
        }
        public Action<IntType> action;
        CornerFramLayout cornerTopFram;
        MenuFramLayout menuFram;
        TypeMultiFramLayout typeMultiFramLayout;
        public void Show()
        {
            //初始化UI
            this.InitUI();
            //初始化事件
            //this.EventListener();
            //读取数据
            this.ReadData();
        }
        private void ReadData()
        {
        }
        private void EventListener()
        {
            cornerTopFram.selectAction += (value) =>
            {
                Console.WriteLine("1");
            };
            menuFram.SetTopClickListener((b) =>
            {
                Console.WriteLine("5");
            });
            menuFram.SetBottomClickListener((b) =>
            {
                Console.WriteLine("6");
            });
            menuFram.SetLeftClickListener((b) =>
            {
                Console.WriteLine("7");
            });
            menuFram.SetRightClickListener((b) =>
            {
                Console.WriteLine("8");
            });
            menuFram.SetOkClickListener((b) =>
            {
                Console.WriteLine("9");
            });
            typeMultiFramLayout.SetLeftFlClickListener((f) =>
            {
                SxqPage sxqPage = new SxqPage();
                MainPage.BasePageView.AddChidren(sxqPage);
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                sxqPage.Show();
            });
            typeMultiFramLayout.SetRightFlClickListener((f) =>
            {
                Console.WriteLine("4");
                action?.Invoke(IntType.TV);
            });
        }
        private void InitUI()
        {
            this.BackgroundColor = MusicColor.ViewColor;
            Button btnTitle = new Button
            {
                Y = Application.GetRealHeight(16),
                X = Application.GetRealWidth(16),
                Height = Application.GetRealHeight(22),
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = MusicColor.TextColor,
                TextSize = TextSize.Text16,
                TextID = StringId.dianshi,
            };
            this.AddChidren(btnTitle);
            cornerTopFram = new CornerFramLayout(343, 452, 4, 17);
            cornerTopFram.X = Application.GetRealWidth(16);
            cornerTopFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
            this.AddChidren(cornerTopFram);
            cornerTopFram.SetList(cornerTopFram.GetTestList(17));
            cornerTopFram.SetMargin(16, 0, 16, 0);
            cornerTopFram.LoadButtonPage(new List<int> { 5, 6 });
            NumberFrameLayout numberFrame = new NumberFrameLayout();
            numberFrame.layout.X = Application.GetRealWidth(16);
            numberFrame.layout.Y = cornerTopFram.Bottom + Application.GetRealHeight(16);
            numberFrame.AddView(this);
            //CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 292, 0, 17);
            //cornerBottomFram.X = Application.GetRealWidth(16);
            //cornerBottomFram.Y = cornerTopFram.Bottom + Application.GetRealHeight(16);
            //cornerBottomFram.BackgroundColor = MusicColor.WhiteColor;
            //cornerBottomFram.Radius = (uint)Application.GetRealHeight(17);
            //this.AddChidren(cornerBottomFram);
            //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.TextID =StringId.dianshi;
            this.AdjustRealHeight(16);
        }
    }
}