2023年10月12日16:37:10

mac

2023-10-12 e4f7080639ee8cbc71172e5202f953924cedc074

2023年10月12日16:37:10

增加了不按键置灰。

 HDL-ON_Android/Resources/Resource.designer.cs

@@ -15,7 +15,7 @@
{
    
    
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.1.111")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.99")]
    public partial class Resource
    {
        

 HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs

@@ -12,6 +12,15 @@
    /// </summary>
    public class AksCommonMethod
    {
        /// <summary>
        /// 选中颜色
        /// </summary>
        public const uint seleBackgroundColor = 0xFFF2F3F7;
        /// <summary>
        /// 不支持按键颜色
        /// </summary>
        public const uint unBackgroundColor = 0xFFA3AAB7;

        private static AksCommonMethod commonMethod = null;
        /// <summary>
        /// 获取对象
@@ -33,7 +42,8 @@
        /// <summary>
        /// 清空所有缓存数据
        /// </summary>
        public void ClearData() {
        public void ClearData()
        {
            movieLibraryInfoEntities.Clear();
            CollectList.Clear();
        }
@@ -138,7 +148,7 @@
            {
                return false;
            }
            if ( string.IsNullOrEmpty(movieLibrary.movieId))
            if (string.IsNullOrEmpty(movieLibrary.movieId))
            {
                return false;
            }
@@ -156,7 +166,7 @@
        }


      


        /// <summary>
        /// 获取影音中控屏列表
@@ -177,7 +187,7 @@
        /// 获取【音乐】遥控器按键列表
        /// </summary>
        /// <returns></returns>
        public List<KeypadEntity> GetMusicKeypadList()
        public List<KeypadEntity> GetMusicKeypadList(RemoteControlEntity remoteControlEntity)
        {
            List<KeypadEntity> keypads = new List<KeypadEntity>();
            string aksIcon = "AksIcon/";
@@ -203,13 +213,14 @@
            //keypads.Add(new KeypadEntity { keypad = "key_left", name = "左", localIconAddress = $"{aksIcon}zuo.png" });
            //keypads.Add(new KeypadEntity { keypad = "key_right", name = "右", localIconAddress = $"{aksIcon}you.png" });
            //keypads.Add(new KeypadEntity { keypad = "key_ok", name = "确认", localIconAddress = $"{aksIcon}ok.png" });
            this.CheckKeyIsClick(remoteControlEntity, keypads);
            return keypads;
        }
        /// <summary>
        /// 获取【功放】遥控器按键列表
        /// </summary>
        /// <returns></returns>
        public List<KeypadEntity> GetGFKeypadList()
        public List<KeypadEntity> GetGFKeypadList(RemoteControlEntity remoteControlEntity)
        {
            List<KeypadEntity> keypads = new List<KeypadEntity>();
            string aksIcon = "AksIcon/";
@@ -225,6 +236,7 @@
            keypads.Add(new KeypadEntity { keypad = "custom_2", name = "自定义按键2", localIconAddress = $"{aksIcon}zdyanjian.png" });
            keypads.Add(new KeypadEntity { keypad = "custom_3", name = "自定义按键3", localIconAddress = $"{aksIcon}zdyanjian.png" });
            keypads.Add(new KeypadEntity { keypad = "custom_4", name = "自定义按键4", localIconAddress = $"{aksIcon}zdyanjian.png" });
            this.CheckKeyIsClick(remoteControlEntity, keypads);
            return keypads;
        }

@@ -232,7 +244,7 @@
        /// 获取【投影仪】遥控器按键列表
        /// </summary>
        /// <returns></returns>
        public List<KeypadEntity> GetTYYKeypadList()
        public List<KeypadEntity> GetTYYKeypadList(RemoteControlEntity remoteControlEntity)
        {
            List<KeypadEntity> keypads = new List<KeypadEntity>();
            string aksIcon = "AksIcon/";
@@ -253,6 +265,7 @@
            keypads.Add(new KeypadEntity { keypad = "custom_2", name = "自定义按键2", localIconAddress = $"{aksIcon}zdyanjian.png" });
            keypads.Add(new KeypadEntity { keypad = "custom_3", name = "自定义按键3", localIconAddress = $"{aksIcon}zdyanjian.png" });
            keypads.Add(new KeypadEntity { keypad = "custom_4", name = "自定义按键4", localIconAddress = $"{aksIcon}zdyanjian.png" });
            this.CheckKeyIsClick(remoteControlEntity, keypads);
            return keypads;
        }

@@ -261,7 +274,7 @@
        /// 获取【电视】遥控器按键列表
        /// </summary>
        /// <returns></returns>
        public List<KeypadEntity> GetTvKeypadList()
        public List<KeypadEntity> GetTvKeypadList(RemoteControlEntity remoteControlEntity)
        {
            List<KeypadEntity> keypads = new List<KeypadEntity>();
            string aksIcon = "AksIcon/";
@@ -279,8 +292,9 @@
            keypads.Add(new KeypadEntity { keypad = "custom_2", name = "自定义按键2", localIconAddress = $"{aksIcon}zdyanjian.png" });
            keypads.Add(new KeypadEntity { keypad = "custom_3", name = "自定义按键3", localIconAddress = $"{aksIcon}zdyanjian.png" });
            keypads.Add(new KeypadEntity { keypad = "custom_4", name = "自定义按键4", localIconAddress = $"{aksIcon}zdyanjian.png" });
            this.CheckKeyIsClick(remoteControlEntity, keypads);
            return keypads;
      

        }


@@ -288,7 +302,7 @@
        /// 获取【机顶盒】遥控器按键列表
        /// </summary>
        /// <returns></returns>
        public List<KeypadEntity> GetJdhKeypadList()
        public List<KeypadEntity> GetJdhKeypadList(RemoteControlEntity remoteControlEntity)
        {
            List<KeypadEntity> keypads = new List<KeypadEntity>();
            string aksIcon = "AksIcon/";
@@ -306,6 +320,7 @@
            keypads.Add(new KeypadEntity { keypad = "custom_2", name = "自定义按键2", localIconAddress = $"{aksIcon}zdyanjian.png" });
            keypads.Add(new KeypadEntity { keypad = "custom_3", name = "自定义按键3", localIconAddress = $"{aksIcon}zdyanjian.png" });
            keypads.Add(new KeypadEntity { keypad = "custom_4", name = "自定义按键4", localIconAddress = $"{aksIcon}zdyanjian.png" });
            this.CheckKeyIsClick(remoteControlEntity, keypads);
            return keypads;

        }
@@ -315,7 +330,7 @@
        /// 获取【数字】按键列表
        /// </summary>
        /// <returns></returns>
        public List<KeypadEntity> GetNumberKeypadList()
        public List<KeypadEntity> GetNumberKeypadList(RemoteControlEntity remoteControlEntity)
        {
            List<KeypadEntity> keypads = new List<KeypadEntity>();
            keypads.Add(new KeypadEntity { keypad = "number_1", name = "1" });
@@ -332,6 +347,7 @@
            keypads.Add(new KeypadEntity { keypad = "number_continuous", name = "-/--" });
            keypads.Add(new KeypadEntity { keypad = "none", name = "" });//这个是为了占位置
            keypads.Add(new KeypadEntity { keypad = "number_0", name = "0" });
            this.CheckKeyIsClick(remoteControlEntity, keypads);
            return keypads;
        }

@@ -339,7 +355,7 @@
        /// 获取【菜单】按键列表
        /// </summary>
        /// <returns></returns>
        public List<KeypadEntity> GetMenuKeypadList()
        public List<KeypadEntity> GetMenuKeypadList(RemoteControlEntity remoteControlEntity)
        {
            List<KeypadEntity> keypads = new List<KeypadEntity>();
            string aksIcon = "AksIcon/";
@@ -348,8 +364,42 @@
            keypads.Add(new KeypadEntity { keypad = "key_left", name = "左", localIconAddress = $"{aksIcon}zuo.png" });
            keypads.Add(new KeypadEntity { keypad = "key_right", name = "右", localIconAddress = $"{aksIcon}you.png" });
            keypads.Add(new KeypadEntity { keypad = "key_ok", name = "确认", localIconAddress = $"{aksIcon}ok.png" });
            this.CheckKeyIsClick(remoteControlEntity, keypads);
            return keypads;
        }

        /// <summary>
        /// 检查是否支持按键点击
        /// </summary>
        /// <param name="remoteControlEntity">遥控器设备</param>
        /// <param name="keypads">自定义按键列表</param>
        private void CheckKeyIsClick(RemoteControlEntity remoteControlEntity, List<KeypadEntity> keypads)
        {
            if (remoteControlEntity == null)
            {
                return;
            }

            for (int i = 0; i < keypads.Count; i++)
            {
                var keypad = keypads[i];
                if (keypad.keypad == "none")
                {
                    //特殊的
                    continue;
                }
                var findkeypad = remoteControlEntity.keypads.Find((o) => o.keypad == keypad.keypad);
                if (findkeypad == null)
                {
                    keypad.isClicked = false;
                }
                else
                {
                    keypad.isClicked = true;
                }
            }

        }

    }
}

 HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs

@@ -175,7 +175,7 @@
            {
                
                //按下去改变背景颜色
                this.BackgroundColor = 0xFFF2F3F7;
                this.BackgroundColor = AksCommonMethod.seleBackgroundColor;
                action?.Invoke(this, btnImage, btnName);
            };


 HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs

@@ -74,7 +74,7 @@
        /// </summary>
        public List<KeypadEntity> GetTestList()
        {
            return AksCommonMethod.Current.GetTYYKeypadList();
            return AksCommonMethod.Current.GetTYYKeypadList(null);
        }

        /// <summary>
@@ -125,9 +125,17 @@
                    line++;
                    xCount = 0;
                }
                //不支持按键点击背景颜色
                if (!keypad.isClicked)
                {
                    buttonFram.Enable = false;
                    buttonFram.GetImageButton().Enable = false;
                    buttonFram.GetNameButton().Enable = false;
                    buttonFram.BackgroundColor = AksCommonMethod.unBackgroundColor;
                }
                buttonFram.SetClickListener((fl, btnIcon, btnName) =>
                {
                    if (buttonFram.Tag != null&& buttonFram.Tag is KeypadEntity)
                    if (buttonFram.Tag != null && buttonFram.Tag is KeypadEntity)
                    {
                        selectKeyAction?.Invoke((KeypadEntity)buttonFram.Tag);
                    }
@@ -205,7 +213,14 @@
                    currnetheightValue += ButtonFramLayout.heightFrameLayout;
                    currnetWidthValue = 0;
                }

                //不支持按键点击背景颜色
                if (!keypad.isClicked)
                {
                    buttonFram.Enable = false;
                    buttonFram.GetImageButton().Enable = false;
                    buttonFram.GetNameButton().Enable = false;
                    buttonFram.BackgroundColor = AksCommonMethod.unBackgroundColor;
                }
                buttonFram.SetClickListener((fl, btnIcon, btnName) =>
                {
                    if (buttonFram.Tag != null&& buttonFram.Tag is KeypadEntity)
@@ -270,6 +285,12 @@
                    currnetheightValue += heightMaxValue;
                    currnetWidthValue = 0;
                }
                //不支持按键点击背景颜色
                if (!keypad.isClicked)
                {
                    button.Enable = false;
                    button.BackgroundColor = AksCommonMethod.unBackgroundColor;
                }
                button.MouseDownEventHandler += (sen, e) =>
                {
                    if (button.Tag == null || ((KeypadEntity)button.Tag).keypad == "none")

 HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ImageFramlayout.cs

@@ -89,7 +89,7 @@
            EventHandler<MouseEventArgs> DownClick = (sender, e) =>
            {
                //按下去改变背景颜色
                //this.BackgroundColor = 0xff454635;
                //this.BackgroundColor = AksCommonMethod.seleBackgroundColor;
                action?.Invoke(this);
            };
            this.MouseUpEventHandler += DownClick;

 HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs

@@ -7,7 +7,7 @@
    {

        private uint UpBackgroundColor = MusicColor.ViewColor;
        private uint DownBackgroundColor = 0xFFEFEFEF;
        private uint DownBackgroundColor = AksCommonMethod.seleBackgroundColor;

        /// <summary>
        /// 多个类型容器
@@ -176,7 +176,7 @@
            EventHandler<MouseEventArgs> DownClick = (sender, e) =>
            {
                //按下去改变背景颜色
                //rightFramLayout.BackgroundColor = this.DownBackgroundColor;
                //rightFramLayout.BackgroundColor =AksCommonMethod.seleBackgroundColor;
                action?.Invoke(rightFramLayout);
            };
            rightFramLayout.MouseDownEventHandler += DownClick;

 HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeSingleFramLayout.cs

@@ -8,7 +8,7 @@
    {

        private uint UpBackgroundColor = MusicColor.ViewColor;
        private uint DownBackgroundColor = 0xFFEFEFEF;
        private uint DownBackgroundColor = AksCommonMethod.seleBackgroundColor;
        /// <summary>
        /// 单个类型容器
        /// </summary>

 HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/RemoteControlEntity.cs

@@ -21,7 +21,7 @@
        ///5 = 投影仪
        ///6 = 万能遥控器
        /// </summary>
public int type;
        public int type;
        /// <summary>
        /// 遥控器id
        /// </summary>

 HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs

@@ -98,7 +98,7 @@
            cornerFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
            this.AddChidren(cornerFram);
            cornerFram.SetMargin(16, 0, 16, 0);
            cornerFram.LoadButtonPage(AksCommonMethod.Current.GetGFKeypadList(),4);
            cornerFram.LoadButtonPage(AksCommonMethod.Current.GetGFKeypadList(this.remoteControl),4);


            CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 72, 17);

 HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs

@@ -146,7 +146,7 @@
            cornerTopFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
            this.AddChidren(cornerTopFram);
            cornerTopFram.SetMargin(16, 0, 16, 0);
            cornerTopFram.LoadButtonPage(AksCommonMethod.Current.GetJdhKeypadList(),new List<int> { 5, 6 });
            cornerTopFram.LoadButtonPage(AksCommonMethod.Current.GetJdhKeypadList(this.remoteControl),new List<int> { 5, 6 });

            #region  ----频道 控制----
            FrameLayout middLayout = new FrameLayout
@@ -253,7 +253,7 @@
            numberFrame.Y = middLayout.Bottom + Application.GetRealHeight(16);
            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);



 HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs

@@ -134,7 +134,7 @@
            cornerFram.X = Application.GetRealWidth(16);
            cornerFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
            cornerFram.SetMargin(16, 0, 16, 0);
            cornerFram.LoadButtonPage(AksCommonMethod.Current.GetMusicKeypadList(), 4);
            cornerFram.LoadButtonPage(AksCommonMethod.Current.GetMusicKeypadList(this.remoteControl), 4);


            CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 364-32, 17);

 HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs

@@ -150,7 +150,7 @@
            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
@@ -257,7 +257,7 @@
            numberFrame.Y = middLayout.Bottom + Application.GetRealHeight(16);
            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);
          


 HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs

@@ -133,7 +133,7 @@
            cornerTopFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
            this.AddChidren(cornerTopFram);
            cornerTopFram.SetMargin(16, 0, 16, 0);
            cornerTopFram.LoadButtonPage(AksCommonMethod.Current.GetTYYKeypadList(),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);