wjc
2023-08-14 a4e9d02ce5cfc501ef9fecac0047c332b5426df2
2023年08月14日15:15:49

备份一下代码
13个文件已修改
620 ■■■■ 已修改文件
HDL_ON/DAL/Server/NewAPI.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs 89 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/CollectPage.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/DetailPage.cs 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs 62 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs 70 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs 66 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs 57 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs 166 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/Server/NewAPI.cs
@@ -563,7 +563,7 @@
        /// <summary>
        /// 影片收藏/取消收藏
        /// </summary>
        public const string Api_Post_Aks_MovieLibraryCollect = "/home-wisdom/app/device/avcc/movieLibrary/Collect";
        public const string Api_Post_Aks_MovieLibraryCollect = "/home-wisdom/app/device/avcc/movieLibrary/collect";
        /// <summary>
        /// 收藏影片分页获取
        /// </summary>
HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs
@@ -35,6 +35,7 @@
        /// </summary>
        public void ClearData() {
            movieLibraryInfoEntities.Clear();
            CollectList.Clear();
        }
        /// <summary>
        /// 影片详情列表
@@ -149,6 +150,9 @@
            return true;
        }
        /// <summary>
        /// 获取影音中控屏列表
        /// </summary>
@@ -189,11 +193,11 @@
            keypads.Add(new KeypadEntity { keypad = "play", name = "播放", localIconAddress = $"{aksIcon}bofang.png" });
            keypads.Add(new KeypadEntity { keypad = "in_out_warehouse", name = "进出仓", localIconAddress = $"{aksIcon}jinchucang.png" });
            keypads.Add(new KeypadEntity { keypad = "subtitle", name = "字幕", localIconAddress = $"{aksIcon}zimu.png" });
            keypads.Add(new KeypadEntity { keypad = "key_up", name = "上", localIconAddress = $"{aksIcon}shang.png" });
            keypads.Add(new KeypadEntity { keypad = "key_down", name = "下", localIconAddress = $"{aksIcon}xia.png" });
            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" });
            //keypads.Add(new KeypadEntity { keypad = "key_up", name = "上", localIconAddress = $"{aksIcon}shang.png" });
            //keypads.Add(new KeypadEntity { keypad = "key_down", name = "下", localIconAddress = $"{aksIcon}xia.png" });
            //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" });
            return keypads;
        }
        /// <summary>
@@ -208,7 +212,7 @@
            keypads.Add(new KeypadEntity { keypad = "off", name = "关", localIconAddress = $"{aksIcon}guan.png" });
            keypads.Add(new KeypadEntity { keypad = "volume_up", name = "音量+", localIconAddress = $"{aksIcon}yinliangjia.png" });
            keypads.Add(new KeypadEntity { keypad = "volume_down", name = "音量-", localIconAddress = $"{aksIcon}yinliangjian.png" });
            keypads.Add(new KeypadEntity { keypad = "HDMI_", name = "HDMI 1", localIconAddress = $"{aksIcon}hdmi.png" });
            keypads.Add(new KeypadEntity { keypad = "HDMI_1", name = "HDMI 1", localIconAddress = $"{aksIcon}hdmi.png" });
            keypads.Add(new KeypadEntity { keypad = "HDMI_2", name = "HDMI 2", localIconAddress = $"{aksIcon}hdmi.png" });
            keypads.Add(new KeypadEntity { keypad = "HDMI_3", name = "HDMI 3", localIconAddress = $"{aksIcon}hdmi.png" });
            keypads.Add(new KeypadEntity { keypad = "HDMI_4", name = "HDMI 4", localIconAddress = $"{aksIcon}hdmi.png" });
@@ -232,7 +236,7 @@
            keypads.Add(new KeypadEntity { keypad = "signal_source", name = "信号源", localIconAddress = $"{aksIcon}xinhaoyuan.png" });
            keypads.Add(new KeypadEntity { keypad = "curtain_up", name = "幕布升", localIconAddress = $"{aksIcon}mubusheng.png" });
            keypads.Add(new KeypadEntity { keypad = "curtain_down", name = "幕布降", localIconAddress = $"{aksIcon}mubujiang.png" });
            keypads.Add(new KeypadEntity { keypad = "HDMI_", name = "HDMI 1", localIconAddress = $"{aksIcon}hdmi.png" });
            keypads.Add(new KeypadEntity { keypad = "HDMI_1", name = "HDMI 1", localIconAddress = $"{aksIcon}hdmi.png" });
            keypads.Add(new KeypadEntity { keypad = "HDMI_2", name = "HDMI 2", localIconAddress = $"{aksIcon}hdmi.png" });
            keypads.Add(new KeypadEntity { keypad = "HDMI_3", name = "HDMI 3", localIconAddress = $"{aksIcon}hdmi.png" });
            keypads.Add(new KeypadEntity { keypad = "HDMI_4", name = "HDMI 4", localIconAddress = $"{aksIcon}hdmi.png" });
@@ -245,6 +249,60 @@
            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" });
            return keypads;
        }
        /// <summary>
        /// 获取【电视】遥控器按键列表
        /// </summary>
        /// <returns></returns>
        public List<KeypadEntity> GetTvKeypadList()
        {
            List<KeypadEntity> keypads = new List<KeypadEntity>();
            string aksIcon = "AksIcon/";
            keypads.Add(new KeypadEntity { keypad = "on", name = "开", localIconAddress = $"{aksIcon}kai.png" });
            keypads.Add(new KeypadEntity { keypad = "off", name = "关", localIconAddress = $"{aksIcon}guan.png" });
            keypads.Add(new KeypadEntity { keypad = "signal_source", name = "信号源", localIconAddress = $"{aksIcon}xinhaoyuan.png" });
            keypads.Add(new KeypadEntity { keypad = "mute", name = "静音", localIconAddress = $"{aksIcon}jingyin.png" });
            keypads.Add(new KeypadEntity { keypad = "volume_up", name = "音量+", localIconAddress = $"{aksIcon}yinliangjia.png" });
            keypads.Add(new KeypadEntity { keypad = "volume_down", name = "音量-", localIconAddress = $"{aksIcon}yinliangjian.png" });
            keypads.Add(new KeypadEntity { keypad = "menu", name = "菜单", localIconAddress = $"{aksIcon}caidan.png" });
            keypads.Add(new KeypadEntity { keypad = "return", name = "返回", localIconAddress = $"{aksIcon}fanhui.png" });
            keypads.Add(new KeypadEntity { keypad = "look_back", name = "回看", localIconAddress = $"{aksIcon}huikan.png" });
            keypads.Add(new KeypadEntity { keypad = "cancel", name = "取消", localIconAddress = $"{aksIcon}quxiao.png" });
            keypads.Add(new KeypadEntity { keypad = "custom_1", name = "自定义按键1", localIconAddress = $"{aksIcon}zdyanjian.png" });
            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" });
            return keypads;
        }
        /// <summary>
        /// 获取【机顶盒】遥控器按键列表
        /// </summary>
        /// <returns></returns>
        public List<KeypadEntity> GetJdhKeypadList()
        {
            List<KeypadEntity> keypads = new List<KeypadEntity>();
            string aksIcon = "AksIcon/";
            keypads.Add(new KeypadEntity { keypad = "on", name = "开", localIconAddress = $"{aksIcon}kai.png" });
            keypads.Add(new KeypadEntity { keypad = "off", name = "关", localIconAddress = $"{aksIcon}guan.png" });
            keypads.Add(new KeypadEntity { keypad = "menu", name = "菜单", localIconAddress = $"{aksIcon}caidan.png" });
            keypads.Add(new KeypadEntity { keypad = "mute", name = "静音", localIconAddress = $"{aksIcon}jingyin.png" });
            keypads.Add(new KeypadEntity { keypad = "volume_up", name = "音量+", localIconAddress = $"{aksIcon}yinliangjia.png" });
            keypads.Add(new KeypadEntity { keypad = "volume_down", name = "音量-", localIconAddress = $"{aksIcon}yinliangjian.png" });
            keypads.Add(new KeypadEntity { keypad = "look_back", name = "回看", localIconAddress = $"{aksIcon}huikan.png" });
            keypads.Add(new KeypadEntity { keypad = "cancel", name = "取消", localIconAddress = $"{aksIcon}quxiao.png" });
            keypads.Add(new KeypadEntity { keypad = "amplifier_volume_up", name = "功放音量 +", localIconAddress = $"{aksIcon}gongfang1.png" });
            keypads.Add(new KeypadEntity { keypad = "amplifier_volume_down", name = "功放音量 -", localIconAddress = $"{aksIcon}gongfang2.png" });
            keypads.Add(new KeypadEntity { keypad = "custom_1", name = "自定义按键1", localIconAddress = $"{aksIcon}zdyanjian.png" });
            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" });
            return keypads;
        }
@@ -271,5 +329,22 @@
            keypads.Add(new KeypadEntity { keypad = "number_0", name = "0" });
            return keypads;
        }
        /// <summary>
        /// 获取【菜单】按键列表
        /// </summary>
        /// <returns></returns>
        public List<KeypadEntity> GetMenuKeypadList()
        {
            List<KeypadEntity> keypads = new List<KeypadEntity>();
            string aksIcon = "AksIcon/";
            keypads.Add(new KeypadEntity { keypad = "key_up", name = "上", localIconAddress = $"{aksIcon}shang.png" });
            keypads.Add(new KeypadEntity { keypad = "key_down", name = "下", localIconAddress = $"{aksIcon}xia.png" });
            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" });
            return keypads;
        }
    }
}
HDL_ON/UI/UI2/FuntionControlView/Aks/CollectPage.cs
@@ -16,12 +16,13 @@
        {
            this.remoteControl = remoteControlEntity;
            //读缓存数据
            this.mMovieLibraryList.AddRange(AksCommonMethod.Current.CollectList);
            var collectList = AksCommonMethod.Current.CollectList;
            this.mMovieLibraryList.AddRange(collectList);
        }
        /// <summary>
        /// 影片列表
        /// </summary>
        private List<MovieLibrary> mMovieLibraryList;
        private List<MovieLibrary> mMovieLibraryList=new List<MovieLibrary>();
        /// <summary>
        /// 当前的遥控器对象
        /// </summary>
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
@@ -145,7 +145,7 @@
        /// 动态加载按键界面
        /// </summary>
        /// <param name="mList">列表</param>
        /// <param name="list">列表中索引,表示某一条宽度加宽</param>
        /// <param name="list"> 列表中索引,表示某一条宽度加宽,没有默认(new List<int>)</param>
        /// <param name="defaultIndex">默认值索引范围[0,mList.count-1],大于范围,该值视为无效</param>
        public void LoadButtonPage(List<KeypadEntity> mList, List<int> list,int defaultIndex=-1)
        {
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs
@@ -1,5 +1,6 @@
using System;
using HDL_ON.UI.Music;
using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
using Shared;
namespace HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView
{
@@ -26,6 +27,7 @@
            Width = Application.GetRealWidth(24),
            Height = Application.GetRealHeight(20),
            UnSelectedImagePath = "AksIcon/shang.png",
            Name= "上",
        };
        Button btnBottom = new Button
        {
@@ -34,6 +36,7 @@
            Width = Application.GetRealWidth(24),
            Height = Application.GetRealHeight(20),
            UnSelectedImagePath = "AksIcon/xia.png",
            Name = "下",
        };
        Button btnLeft = new Button
        {
@@ -42,6 +45,7 @@
            Width = Application.GetRealWidth(20),
            Height = Application.GetRealHeight(24),
            UnSelectedImagePath = "AksIcon/zuo.png",
            Name = "左",
        };
        Button btnRight = new Button
@@ -51,6 +55,7 @@
            Width = Application.GetRealWidth(20),
            Height = Application.GetRealHeight(24),
            UnSelectedImagePath = "AksIcon/you.png",
            Name = "右",
        };
@@ -73,6 +78,7 @@
            Height = Application.GetMinRealAverage(28),
            Radius = (uint)Application.GetRealHeight(14),
            BackgroundColor = MusicColor.SelectedColor,
            Name= "确定"
        };
        public void AddView(FrameLayout layout)
@@ -91,13 +97,16 @@
        /// 上
        /// </summary>
        /// <param name="action"></param>
        public void SetTopClickListener(Action<Button> action)
        public void SetTopClickListener(Action<KeypadEntity> action)
        {
            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
            {
                //btnTop.BackgroundColor = this.UpBackgroundColor;
                btnTop.IsSelected = false;
                action?.Invoke(btnTop);
                KeypadEntity keypadEntity = new KeypadEntity();
                keypadEntity.name = btnTop.Name;
                keypadEntity.keypad = "key_up";
                action?.Invoke(keypadEntity);
                //弹起来还原背景颜色
            };
            btnTop.MouseUpEventHandler += UpClick;
@@ -115,13 +124,16 @@
        /// 下
        /// </summary>
        /// <param name="action"></param>
        public void SetBottomClickListener(Action<Button> action)
        public void SetBottomClickListener(Action<KeypadEntity> action)
        {
            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
            {
                //btnBottom.BackgroundColor = this.UpBackgroundColor;
                btnBottom.IsSelected = false;
                action?.Invoke(btnBottom);
                KeypadEntity keypadEntity = new KeypadEntity();
                keypadEntity.name = btnBottom.Name;
                keypadEntity.keypad = "key_down";
                action?.Invoke(keypadEntity);
                //弹起来还原背景颜色
            };
            btnBottom.MouseUpEventHandler += UpClick;
@@ -138,13 +150,16 @@
        /// 左
        /// </summary>
        /// <param name="action"></param>
        public void SetLeftClickListener(Action<Button> action)
        public void SetLeftClickListener(Action<KeypadEntity> action)
        {
            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
            {
                //btnLeft.BackgroundColor = this.UpBackgroundColor;
                btnLeft.IsSelected = false;
                action?.Invoke(btnLeft);
                KeypadEntity keypadEntity = new KeypadEntity();
                keypadEntity.name = btnLeft.Name;
                keypadEntity.keypad = "key_left";
                action?.Invoke(keypadEntity);
                //弹起来还原背景颜色
            };
            btnLeft.MouseUpEventHandler += UpClick;
@@ -161,13 +176,16 @@
        /// 右
        /// </summary>
        /// <param name="action"></param>
        public void SetRightClickListener(Action<Button> action)
        public void SetRightClickListener(Action<KeypadEntity> action)
        {
            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
            {
                //btnRight.BackgroundColor = this.UpBackgroundColor;
                btnRight.IsSelected = false;
                action?.Invoke(btnRight);
                KeypadEntity keypadEntity = new KeypadEntity();
                keypadEntity.name = btnRight.Name;
                keypadEntity.keypad = "key_right";
                action?.Invoke(keypadEntity);
                //弹起来还原背景颜色
            };
            btnRight.MouseUpEventHandler += UpClick;
@@ -187,12 +205,15 @@
        /// ok
        /// </summary>
        /// <param name="action"></param>
        public void SetOkClickListener(Action<Button> action)
        public void SetOkClickListener(Action<KeypadEntity> action)
        {
            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
            {
                btnOk.BackgroundColor = MusicColor.SelectedColor;// this.UpBackgroundColor;
                action?.Invoke(btnOk);
                KeypadEntity keypadEntity = new KeypadEntity();
                keypadEntity.name = btnOk.Name;
                keypadEntity.keypad = "key_ok";
                action?.Invoke(keypadEntity);
                //弹起来还原背景颜色
            };
            btnOk.MouseUpEventHandler += UpClick;
HDL_ON/UI/UI2/FuntionControlView/Aks/DetailPage.cs
@@ -198,7 +198,7 @@
                Y = btnYear.Bottom + Application.GetRealHeight(20),
                Width = Application.GetRealWidth(45),
                Height = Application.GetRealHeight(43),
                Text = movieLibrary.rating,
                Text = movieLibraryInfo == null ? "" : movieLibraryInfo.rating,
                TextSize = 32,
                TextColor = MusicColor.TextColor,
                TextAlignment = TextAlignment.CenterLeft,
@@ -218,7 +218,6 @@
                TextColor = 0xffA5AEBC,
                TextSize = TextSize.Text12,
                TextAlignment = TextAlignment.CenterLeft,
                Text = movieLibraryInfo == null ? "" : movieLibraryInfo.rating,
            };
            baseFramLayout.AddChidren(btnScore);
@@ -234,6 +233,7 @@
                IsSelected = movieLibraryInfo == null ? false : movieLibraryInfo.collect,
            };
            baseFramLayout.AddChidren(btnCollectImage);
            btnCollectText = new Button
            {
@@ -395,7 +395,7 @@
            //返回
            this.topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
            {
                action(isOldState != btnCollectImage.IsSelected);
                action?.Invoke(isOldState != btnCollectImage.IsSelected);
                this.RemoveFromParent();
            };
            //立即播放
@@ -438,18 +438,29 @@
                         var isBool = SendMethod.Current.IsCollect(remoteControl.deviceId, remoteControl.rcId, movieLibrary.movieId, btnCollectImage.IsSelected);
                         if (isBool)
                         {
                             //更新缓存数据
                             movieLibraryInfo.collect = btnCollectImage.IsSelected;
                             //成功后才更新缓存数据
                             if (btnCollectImage.IsSelected)
                             {
                                 AksCommonMethod.Current.AddCollectMovie(movieLibrary);
                             }
                             else
                             {
                                 AksCommonMethod.Current.DelCollectMovie(movieLibrary);
                             }
                         }
                     }
                     catch { }
                     finally
                     {
                         CommonMethod.Current.MainThread(() =>
                         {
                             CommonMethod.Current.Loading.Hide();
                         });
                     }
                 });
             };
            btnCollectImage.MouseUpEventHandler += CollectClick;
HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
@@ -3,6 +3,7 @@
using HDL_ON.UI.Music;
using HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView;
using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
using Shared;
using static HDL_ON.UI.UI2.FuntionControlView.Aks.AksPage;
namespace HDL_ON.UI.UI2.FuntionControlView.Aks
@@ -52,9 +53,9 @@
        private void EventListener()
        {
            cornerFram.selectKeyAction += (value) =>
            cornerFram.selectKeyAction += (keypadEntity) =>
            {
                Console.WriteLine("1");
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            };
            //时序器
            typeMultiFramLayout.SetLeftFlClickListener((f) =>
@@ -68,7 +69,6 @@
            //设备切换
            typeMultiFramLayout.SetRightFlClickListener((f) =>
            {
                Console.WriteLine("4");
                action?.Invoke(IntType.HiFi);
            });
@@ -90,7 +90,9 @@
            };
            this.AddChidren(btnTitle);
            cornerFram = new CornerFramLayout(343, 452, 17);
            cornerFram = new CornerFramLayout(343, 284, 17);
            cornerFram.X = Application.GetRealWidth(16);
            cornerFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
            this.AddChidren(cornerFram);
@@ -112,5 +114,31 @@
            this.AdjustRealHeight(16);
        }
        /// <summary>
        /// 按键控制
        /// </summary>
        /// <param name="keypad"><按键标识/param>
        /// <param name="keyName"><按键名称(打印用的)/param>
        private void KeyControl(string keypad, string keyName)
        {
            //CommonMethod.Current.Loading.Start();
            CommonMethod.Current.SunThread(() =>
            {
                try
                {
                    SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName);
                }
                catch { }
                finally
                {
                    CommonMethod.Current.MainThread(() =>
                    {
                        //CommonMethod.Current.Loading.Hide();
                    });
                }
            });
        }
    }
}
HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
@@ -3,6 +3,7 @@
using HDL_ON.UI.Music;
using HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView;
using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
using Shared;
using static HDL_ON.UI.UI2.FuntionControlView.Aks.AksPage;
namespace HDL_ON.UI.UI2.FuntionControlView.Aks
@@ -71,40 +72,39 @@
        private void EventListener()
        {
            //功能键控制
            cornerTopFram.selectKeyAction += (value) =>
            cornerTopFram.selectKeyAction += (keypadEntity) =>
            {
                Console.WriteLine("1");
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            };
            //数字键控制
            numberFrame.selectKeyAction += (s) =>
            numberFrame.selectKeyAction += (keypadEntity) =>
            {
                Console.WriteLine("打印====" + s);
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            };
            //菜单上按键
            menuFram.SetTopClickListener((b) =>
            menuFram.SetTopClickListener((keypadEntity) =>
            {
                Console.WriteLine("5");
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            });
            //菜单下按键
            menuFram.SetBottomClickListener((b) =>
            menuFram.SetBottomClickListener((keypadEntity) =>
            {
                Console.WriteLine("6");
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            });
            //菜单左按键
            menuFram.SetLeftClickListener((b) =>
            menuFram.SetLeftClickListener((keypadEntity) =>
            {
                Console.WriteLine("7");
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            });
            //菜单右按键
            menuFram.SetRightClickListener((b) =>
            menuFram.SetRightClickListener((keypadEntity) =>
            {
                Console.WriteLine("8");
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            });
            //菜单ok按键
            menuFram.SetOkClickListener((b) =>
            menuFram.SetOkClickListener((keypadEntity) =>
            {
                Console.WriteLine("9");
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            });
            //时序器
            typeMultiFramLayout.SetLeftFlClickListener((f) =>
@@ -136,16 +136,16 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = MusicColor.TextColor,
                TextSize = TextSize.Text16,
                TextID = StringId.jidinghe,
                TextID = StringId.touyingyi,
            };
            this.AddChidren(btnTitle);
            cornerTopFram = new CornerFramLayout(343, 452, 17);
            cornerTopFram = new CornerFramLayout(343, 368, 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(),new List<int> { 5, 6 });
            cornerTopFram.LoadButtonPage(AksCommonMethod.Current.GetJdhKeypadList(),new List<int> { 5, 6 });
            #region  ----频道 控制----
            FrameLayout middLayout = new FrameLayout
@@ -311,5 +311,31 @@
            this.AdjustRealHeight(16);
        }
        /// <summary>
        /// 按键控制
        /// </summary>
        /// <param name="keypad"><按键标识/param>
        /// <param name="keyName"><按键名称(打印用的)/param>
        private void KeyControl(string keypad, string keyName)
        {
            //CommonMethod.Current.Loading.Start();
            CommonMethod.Current.SunThread(() =>
            {
                try
                {
                    SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName);
                }
                catch { }
                finally
                {
                    CommonMethod.Current.MainThread(() =>
                    {
                        //CommonMethod.Current.Loading.Hide();
                    });
                }
            });
        }
    }
}
HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
@@ -3,6 +3,7 @@
using HDL_ON.UI.Music;
using HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView;
using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
using Shared;
using static HDL_ON.UI.UI2.FuntionControlView.Aks.AksPage;
namespace HDL_ON.UI.UI2.FuntionControlView.Aks
@@ -54,9 +55,15 @@
        private void EventListener()
        {
            cornerFram.selectKeyAction += (value) =>
            cornerFram.selectKeyAction += (keypadEntity) =>
            {
                Console.WriteLine("1");
                //SendMethod.Current.Log(keypad.);
                if (keypadEntity == null)
                {
                    return;
                }
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            };
            typeSingleFramLayout.SetClickListener((f) =>
@@ -67,28 +74,27 @@
                ykPage.Show();
            });
            menuFram.SetTopClickListener((b) =>
            menuFram.SetTopClickListener((keypadEntity) =>
            {
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            });
            menuFram.SetBottomClickListener((keypadEntity) =>
            {
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            });
            menuFram.SetLeftClickListener((keypadEntity) =>
            {
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            });
            menuFram.SetRightClickListener((keypadEntity) =>
            {
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
                Console.WriteLine("5");
            });
            menuFram.SetBottomClickListener((b) =>
            menuFram.SetOkClickListener((keypadEntity) =>
            {
                Console.WriteLine("6");
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            });
            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(this.sequencerList, this.remoteControl.deviceId);
@@ -97,10 +103,8 @@
                sxqPage.Show();
            });
            typeMultiFramLayout.SetRightFlClickListener((f) =>
            {
                Console.WriteLine("4");
                action?.Invoke(IntType.Player);
            });
@@ -158,7 +162,31 @@
            this.AdjustRealHeight(16);
        }
        /// <summary>
        /// 按键控制
        /// </summary>
        /// <param name="keypad"><按键标识/param>
        /// <param name="keyName"><按键名称(打印用的)/param>
        private void KeyControl(string keypad, string keyName)
        {
            //CommonMethod.Current.Loading.Start();
            CommonMethod.Current.SunThread(() =>
            {
                try
                {
                    SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName);
                }
                catch { }
                finally
                {
                    CommonMethod.Current.MainThread(() =>
                    {
                        //CommonMethod.Current.Loading.Hide();
                    });
                }
            });
        }
    }
}
HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs
@@ -128,8 +128,9 @@
        /// <param name="deviceId">设备id</param>
        /// <param name="rcId">遥控器id</param>
        /// <param name="keypad"><按键标识/param>
        /// <param name="keyName"><按键名称(打印用的)/param>
        /// <param name="tipType">是否需要提示,默认提示</param>
        public bool KeypadExecute(string deviceId, string rcId, string keypad, TipType tipType = TipType.flicker)
        public bool KeypadExecute(string deviceId, string rcId, string keypad,string keyName, TipType tipType = TipType.flicker)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
@@ -137,7 +138,7 @@
            d.Add("rcId", rcId);//遥控器id
            d.Add("keypad", keypad);//按键标识
            //d.Add("zoneType", deviceId);//区域
            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d,NewAPI.Api_Post_Aks_KeypadExecute, "遥控器按键执行");
            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d,NewAPI.Api_Post_Aks_KeypadExecute, $"遥控器【{keyName}】按键执行");
            if (!this.DataChecking(responsePackNew, tipType))
            {
                return false;
@@ -288,7 +289,7 @@
            jObject.Add("collect", collect);//影片id
            //d.Add("zoneType", deviceId);//区域
            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(jObject.ToString(), NewAPI.Api_Post_Aks_MovieLibraryCollect, "影片收藏");
            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(jObject, NewAPI.Api_Post_Aks_MovieLibraryCollect, "影片收藏");
            if (!this.DataChecking(responsePackNew, tipType))
            {
                return false;
HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
@@ -3,6 +3,7 @@
using HDL_ON.UI.Music;
using HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView;
using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
using Shared;
using static HDL_ON.UI.UI2.FuntionControlView.Aks.AksPage;
namespace HDL_ON.UI.UI2.FuntionControlView.Aks
@@ -70,40 +71,45 @@
        private void EventListener()
        {
            //功能键控制
            cornerTopFram.selectKeyAction += (value) =>
            cornerTopFram.selectKeyAction += (keypadEntity) =>
            {
                Console.WriteLine("1");
                KeyControl(keypadEntity.keypad, keypadEntity.name);
            };
            //数字键控制
            numberFrame.selectKeyAction += (s) =>
            numberFrame.selectKeyAction += (keypadEntity) =>
            {
                Console.WriteLine("打印====" + s);
                KeyControl(keypadEntity.keypad, keypadEntity.name);
            };
            //菜单上按键
            menuFram.SetTopClickListener((b) =>
            menuFram.SetTopClickListener((keypadEntity) =>
            {
                Console.WriteLine("5");
                KeyControl(keypadEntity.keypad, keypadEntity.name);
            });
            //菜单下按键
            menuFram.SetBottomClickListener((b) =>
            menuFram.SetBottomClickListener((keypadEntity) =>
            {
                Console.WriteLine("6");
                KeyControl(keypadEntity.keypad, keypadEntity.name);
            });
            //菜单左按键
            menuFram.SetLeftClickListener((b) =>
            menuFram.SetLeftClickListener((keypadEntity) =>
            {
                Console.WriteLine("7");
                KeyControl(keypadEntity.keypad, keypadEntity.name);
            });
            //菜单右按键
            menuFram.SetRightClickListener((b) =>
            menuFram.SetRightClickListener((keypadEntity) =>
            {
                Console.WriteLine("8");
                KeyControl(keypadEntity.keypad, keypadEntity.name);
            });
            //菜单ok按键
            menuFram.SetOkClickListener((b) =>
            menuFram.SetOkClickListener((keypadEntity) =>
            {
                Console.WriteLine("9");
                KeyControl(keypadEntity.keypad, keypadEntity.name);
            });
            //时序器
            typeMultiFramLayout.SetLeftFlClickListener((f) =>
@@ -117,7 +123,6 @@
            //设备切换
            typeMultiFramLayout.SetRightFlClickListener((f) =>
            {
                Console.WriteLine("4");
                action?.Invoke(IntType.TV);
            });
@@ -139,12 +144,12 @@
            };
            this.AddChidren(btnTitle);
            cornerTopFram = new CornerFramLayout(343, 452, 17);
            cornerTopFram = new CornerFramLayout(343, 368, 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(),new List<int> { 5, 6 });
            cornerTopFram.LoadButtonPage(AksCommonMethod.Current.GetTvKeypadList(),new List<int> { 5, 6 });
            #region  ----频道 控制----
            FrameLayout middLayout = new FrameLayout
@@ -310,5 +315,32 @@
            this.AdjustRealHeight(16);
        }
        /// <summary>
        /// 按键控制
        /// </summary>
        /// <param name="keypad"><按键标识/param>
        /// <param name="keyName"><按键名称(打印用的)/param>
        private void KeyControl(string keypad, string keyName)
        {
            //CommonMethod.Current.Loading.Start();
            CommonMethod.Current.SunThread(() =>
            {
                try
                {
                    SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName);
                }
                catch { }
                finally
                {
                    CommonMethod.Current.MainThread(() =>
                    {
                        //CommonMethod.Current.Loading.Hide();
                    });
                }
            });
        }
    }
}
HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
@@ -3,6 +3,7 @@
using HDL_ON.UI.Music;
using HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView;
using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
using Shared;
using static HDL_ON.UI.UI2.FuntionControlView.Aks.AksPage;
namespace HDL_ON.UI.UI2.FuntionControlView.Aks
@@ -59,36 +60,39 @@
            //功能键控制
            cornerTopFram.selectKeyAction += (value) =>
            cornerTopFram.selectKeyAction += (keypadEntity) =>
            {
                Console.WriteLine("1");
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            };
            //菜单上按键
            menuFram.SetTopClickListener((b) =>
            menuFram.SetTopClickListener((keypadEntity) =>
            {
                Console.WriteLine("5");
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            });
            //菜单下按键
            menuFram.SetBottomClickListener((b) =>
            menuFram.SetBottomClickListener((keypadEntity) =>
            {
                Console.WriteLine("6");
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            });
            //菜单左按键
            menuFram.SetLeftClickListener((b) =>
            menuFram.SetLeftClickListener((keypadEntity) =>
            {
                Console.WriteLine("7");
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            });
            //菜单右按键
            menuFram.SetRightClickListener((b) =>
            menuFram.SetRightClickListener((keypadEntity) =>
            {
                Console.WriteLine("8");
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            });
            //菜单ok按键
            menuFram.SetOkClickListener((b) =>
            menuFram.SetOkClickListener((keypadEntity) =>
            {
                Console.WriteLine("9");
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            });
            //时序器
            typeMultiFramLayout.SetLeftFlClickListener((f) =>
@@ -102,7 +106,6 @@
            //设备切换
            typeMultiFramLayout.SetRightFlClickListener((f) =>
            {
                Console.WriteLine("4");
                action?.Invoke(IntType.Projector);
            });
@@ -150,5 +153,31 @@
            this.AdjustRealHeight(16);
        }
        /// <summary>
        /// 按键控制
        /// </summary>
        /// <param name="keypad"><按键标识/param>
        /// <param name="keyName"><按键名称(打印用的)/param>
        private void KeyControl(string keypad, string keyName)
        {
            //CommonMethod.Current.Loading.Start();
            CommonMethod.Current.SunThread(() =>
            {
                try
                {
                    SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName);
                }
                catch { }
                finally
                {
                    CommonMethod.Current.MainThread(() =>
                    {
                        //CommonMethod.Current.Loading.Hide();
                    });
                }
            });
        }
    }
}
HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
@@ -3,6 +3,7 @@
using HDL_ON.UI.Music;
using HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView;
using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
using Shared;
using static HDL_ON.UI.UI2.FuntionControlView.Aks.AksPage;
namespace HDL_ON.UI.UI2.FuntionControlView.Aks
@@ -62,14 +63,14 @@
        CustomFrameLayout zhuyeFL;
        FrameLayout okFl;
        Button btnLeft;
        Button btnQian;
        Button btnRight;
        Button btnHou;
        Button btnOk;
        Button btnJia;
        Button btnJian;
        Button btnShang;
        Button btnRight;
        Button btnXia;
        Button btnOk;
        Button btnYingliangjia;
        Button btnYingliangjian;
        Button btnPindaojia;
        Button btnPindaojian;
        CustomFrameLayout caidanFL;
        CustomFrameLayout fanhuiFL;
        CustomFrameLayout shanyibuFL;
@@ -106,133 +107,145 @@
            //开关
            switchBtn.MouseDownEventHandler += (senser, e) =>
            {
                KeyControl("on_off", "开/关");
            };
            //信息
            xinxiFL.SetClickListener(() =>
            {
                KeyControl("info", "信息");
            });
            //收藏
            shoucangFL.SetClickListener(() =>
            {
                KeyControl("collect", "收藏");
            });
            //电影
            dianyingFL.SetClickListener(() =>
            {
                KeyControl("movie", "电影");
            });
            //娱乐
            yuleFL.SetClickListener(() =>
            {
                KeyControl("recreation", "娱乐");
            });
            //电视
            dianshiFL.SetClickListener(() =>
            {
                KeyControl("tv", "电视");
            });
            //红色
            redFL.SetClickListener(() =>
            {
                KeyControl("red", "红色");
            });
            //黄色
            yellowFL.SetClickListener(() =>
            {
                KeyControl("yellow", "黄色");
            });
            //蓝色
            blueFL.SetClickListener(() =>
            {
                KeyControl("blue", "蓝色");
            });
            //1
            number1FL.SetClickListener(() =>
            {
                 KeyControl("number_1", "1");
            });
            //2
            number2FL.SetClickListener(() =>
            {
                KeyControl("number_2", "2");
            });
            //3
            number3FL.SetClickListener(() =>
            {
                KeyControl("number_3", "3");
            });
            //4
            number4FL.SetClickListener(() =>
            {
                KeyControl("number_4", "4");
            });
            //5
            number5FL.SetClickListener(() =>
            {
                KeyControl("number_5", "5");
            });
            //6
            number6FL.SetClickListener(() =>
            {
                KeyControl("number_6", "6");
            });
            //7
            number7FL.SetClickListener(() =>
            {
                KeyControl("number_7", "7");
            });
            //8
            number8FL.SetClickListener(() =>
            {
                KeyControl("number_8", "8");
            });
            //9
            number9FL.SetClickListener(() =>
            {
                KeyControl("number_9", "9");
            });
            //音轨
            yinguiFL.SetClickListener(() =>
            {
                KeyControl("audio_track", "音轨");
            });
            //0
            number0FL.SetClickListener(() =>
            {
                KeyControl("number_0", "0");
            });
            //字幕
            zimuFL.SetClickListener(() =>
            {
                KeyControl("subtitle", "字幕");
            });
            //静音
            jingyinFL.SetClickListener(() =>
            {
                KeyControl("mute", "静音");
            });
            //投屏
            toupingFL.SetClickListener(() =>
            {
                KeyControl("main", "投屏");
            });
            //主页
            zhuyeFL.SetClickListener(() =>
            {
                KeyControl("home", "主页");
            });
            //左
            btnLeft.MouseDownEventHandler += (sender, e) =>
            {
                okFl.BackgroundImagePath = "AksIcon/ykq_left_selected.png";
                KeyControl("key_left", "左");
            };
            //前
            btnQian.MouseDownEventHandler += (sender, e) =>
            //上
            btnShang.MouseDownEventHandler += (sender, e) =>
            {
                okFl.BackgroundImagePath = "AksIcon/ykq_qian_selected.png";
                KeyControl("key_up", "上");
            };
@@ -240,81 +253,99 @@
            btnRight.MouseDownEventHandler += (sender, e) =>
            {
                okFl.BackgroundImagePath = "AksIcon/ykq_right_selected.png";
                KeyControl("key_right", "右");
            };
            //后
            btnHou.MouseDownEventHandler += (sender, e) =>
            //下
            btnXia.MouseDownEventHandler += (sender, e) =>
            {
                okFl.BackgroundImagePath = "AksIcon/ykq_hou_selected.png";
                KeyControl("key_down", "下");
            };
            //OK
            btnOk.MouseDownEventHandler += (sender, e) =>
            {
                okFl.BackgroundImagePath = "AksIcon/ykq_ok_selected.png";
                KeyControl("key_ok", "确定");
            };
            //加
            btnJia.MouseDownEventHandler += (sen, e) => { };
            //减
            btnJian.MouseDownEventHandler += (sen, e) => { };
            //上
            btnShang.MouseDownEventHandler += (sen, e) => { };
            //下
            btnXia.MouseDownEventHandler += (sen, e) => { };
            //音量+
            btnYingliangjia.MouseDownEventHandler += (sen, e) => {
                KeyControl("volume_up", "音量+");
            };
            //音量-
            btnYingliangjian.MouseDownEventHandler += (sen, e) => {
                KeyControl("volume_down", "音量-");
            };
            //频道+
            btnPindaojia.MouseDownEventHandler += (sen, e) => {
                KeyControl("ch_up", "频道+");
            };
            //频道-
            btnPindaojian.MouseDownEventHandler += (sen, e) => {
                KeyControl("ch_down", "频道-");
            };
            //菜单
            caidanFL.SetClickListener(() =>
            {
                KeyControl("menu", "菜单");
            });
            //返回
            fanhuiFL.SetClickListener(() =>
            {
                KeyControl("return", "返回");
            });
            //上一部
            shanyibuFL.SetClickListener(() =>
            {
                KeyControl("part_up", "上一部");
            });
            //播放
            bofangFL.SetClickListener(() =>
            {
                KeyControl("play", "播放");
            });
            //下一部
            xiayibuFL.SetClickListener(() =>
            {
                KeyControl("part_down", "下一部");
            });
            //快退
            kuaituiFL.SetClickListener(() =>
            {
                KeyControl("fast_rewind", "快退");
            });
            //暂停
            zantingFL.SetClickListener(() =>
            {
                KeyControl("pause", "暂停");
            });
            //快进
            kusinjinFL.SetClickListener(() =>
            {
                KeyControl("fast_forward", "快进");
            });
            //灯关
            dengguanFL.SetClickListener(() =>
            {
                KeyControl("lamp", "灯关");
            });
            //停止
            tingzhiFL.SetClickListener(() =>
            {
                KeyControl("stop", "停止");
            });
            //单控灯
            dankongdengFL.SetClickListener(() =>
            {
                KeyControl("lamp_plc", "单控灯");
            });
@@ -692,7 +723,7 @@
            layout.AddChidren(baseFl);
            btnJia = new Button
            btnYingliangjia = new Button
            {
                Y = Application.GetRealHeight(32),
                X = Application.GetRealWidth(26),
@@ -700,21 +731,21 @@
                Height = Application.GetRealWidth(36),
                UnSelectedImagePath = "AksIcon/ykq_jia.png",
            };
            baseFl.AddChidren(btnJia);
            baseFl.AddChidren(btnYingliangjia);
            btnJian = new Button
            btnYingliangjian = new Button
            {
                Y = btnJia.Bottom + Application.GetRealHeight(71),
                Y = btnYingliangjia.Bottom + Application.GetRealHeight(71),
                X = Application.GetRealWidth(26),
                Width = Application.GetRealWidth(36),
                Height = Application.GetRealWidth(36),
                UnSelectedImagePath = "AksIcon/ykq_jian.png",
            };
            baseFl.AddChidren(btnJian);
            baseFl.AddChidren(btnYingliangjian);
            btnShang = new Button
            btnPindaojia = new Button
            {
                Y = Application.GetRealHeight(32),
                X = Application.GetRealWidth(170),
@@ -722,18 +753,18 @@
                Height = Application.GetRealWidth(36),
                UnSelectedImagePath = "AksIcon/ykq_shang.png",
            };
            baseFl.AddChidren(btnShang);
            baseFl.AddChidren(btnPindaojia);
            btnXia = new Button
            btnPindaojian = new Button
            {
                Y = btnShang.Bottom + Application.GetRealHeight(71),
                Y = btnPindaojia.Bottom + Application.GetRealHeight(71),
                X = Application.GetRealWidth(170),
                Width = Application.GetRealWidth(36),
                Height = Application.GetRealWidth(36),
                UnSelectedImagePath = "AksIcon/ykq_xia.png",
            };
            baseFl.AddChidren(btnXia);
            baseFl.AddChidren(btnPindaojian);
@@ -760,14 +791,14 @@
            btnQian = new Button
            btnShang = new Button
            {
                Width = Application.GetRealWidth(40),
                Height = Application.GetRealHeight(30),
                Gravity = Gravity.CenterHorizontal,
            };
            okFl.AddChidren(btnQian);
            okFl.AddChidren(btnShang);
            btnRight = new Button
            {
@@ -778,13 +809,13 @@
            okFl.AddChidren(btnRight);
            btnHou = new Button
            btnXia = new Button
            {
                Width = Application.GetRealWidth(40),
                Height = Application.GetRealHeight(30),
                Gravity = Gravity.BottomCenter,
            };
            okFl.AddChidren(btnHou);
            okFl.AddChidren(btnXia);
@@ -803,7 +834,7 @@
                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
            };
            btnQian.MouseUpEventHandler += (sender, e) =>
            btnShang.MouseUpEventHandler += (sender, e) =>
            {
                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
@@ -813,7 +844,7 @@
                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
            };
            btnHou.MouseUpEventHandler += (sender, e) =>
            btnXia.MouseUpEventHandler += (sender, e) =>
            {
                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
@@ -1003,6 +1034,32 @@
            this.AdjustRealHeight(16);
        }
        /// <summary>
        /// 按键控制
        /// </summary>
        /// <param name="keypad"><按键标识/param>
        /// <param name="keyName"><按键名称(打印用的)/param>
        private void KeyControl(string keypad, string keyName)
        {
            //CommonMethod.Current.Loading.Start();
            CommonMethod.Current.SunThread(() =>
            {
                try
                {
                    SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName);
                }
                catch { }
                finally
                {
                    CommonMethod.Current.MainThread(() =>
                    {
                        //CommonMethod.Current.Loading.Hide();
                    });
                }
            });
        }
    }
    /// <summary>
@@ -1110,15 +1167,14 @@
        {
            clickFl.MouseDownEventHandler += (sender, e) =>
            {
                //this.BackgroundColor = 0xff484378;
                this.BackgroundColor = 0xff798394;
                action?.Invoke();
            };
            clickFl.MouseUpEventHandler += (sender, e) =>
            {
                //this.BackgroundColor = 0xff484378;
                this.BackgroundColor = 0x00000000;
            };
        }