Merge branch 'WJC' into NewFilePath

wxr

2020-12-17 1b42f39e34492ba8d4ce6336cc913877b9e064cb

Merge branch 'WJC' into NewFilePath

 .vs/HDL_APP_Project/xs/sqlite3/storage.ide

Binary files differ

 .vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm

Binary files differ

 .vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal

Binary files differ

 HDL-ON_Android/Assets/Language.ini

@@ -515,6 +515,8 @@
7066=离开
7067=一般
7068=时间
7069=暂未设置自动化，请前往设置！
7070=此处空空如也~


9000=请使用新的手机账号登录APP

 HDL-ON_Android/Assets/Phone/.DS_Store

Binary files differ

 HDL-ON_Android/Assets/Phone/LogicIcon/.DS_Store

Binary files differ

 HDL-ON_Android/Assets/Phone/LogicIcon/delayed.png

Binary files differ

 HDL-ON_Android/Assets/Phone/LogicIcon/time.png

 HDL-ON_Android/Assets/Phone/LogicIcon/timecondition.png

Binary files differ

 HDL-ON_Android/Assets/Phone/LogicIcon/timeicon.png

Binary files differ

 HDL-ON_iOS/Resources/Language.ini

@@ -515,6 +515,8 @@
7066=离开
7067=一般
7068=时间
7069=暂未设置自动化，请前往设置！
7070=此处空空如也~


9000=请使用新的手机账号登录APP

 HDL-ON_iOS/Resources/Phone/.DS_Store

Binary files differ

 HDL-ON_iOS/Resources/Phone/LogicIcon/.DS_Store

Binary files differ

 HDL-ON_iOS/Resources/Phone/LogicIcon/delayed.png

Binary files differ

 HDL-ON_iOS/Resources/Phone/LogicIcon/time.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/timecondition.png

Binary files differ

 HDL-ON_iOS/Resources/Phone/LogicIcon/timeicon.png

Binary files differ

 HDL_ON/Common/R.cs

@@ -509,7 +509,9 @@
        public const int leaveMode = 7066;
        public const int ordinaryMode = 7067;
        public const int timeMode = 7068;

        public const int logicnull = 7069;
        public const int secnenull = 7070;
         




 HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs

@@ -31,7 +31,7 @@
            //时间
            LogicView.SelectTypeView timeView = new LogicView.SelectTypeView();
            timeView.btnText.TextID = StringId.time;
            timeView.btnIcon.UnSelectedImagePath = "LogicIcon/timeicon.png";
            timeView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
            viewLayout.AddChidren(timeView.FLayoutView());

            //功能

 HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs

@@ -611,21 +611,5 @@
            return stateList;
        }

        /// <summary>
        /// 灰色弹框父控件
        /// </summary>
        /// <param name="frame">显示在哪个界面</param>
        /// <returns></returns>
        public FrameLayout GetFrame(FrameLayout frame, string tagKey)
        {
            FrameLayout fLayout = new FrameLayout
            {
                BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
                Tag = tagKey,

            };
            frame.AddChidren(fLayout);
            return fLayout;
        }
    }
}

 HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs

@@ -92,59 +92,114 @@
        /// <param name="fLayout">弹框主控件</param>
        public void SceneMethod(FrameLayout fLayout)
        {
            LogicView.DateView dateView = new LogicView.DateView();
            dateView.btnTitle.TextID = StringId.addSceneLogic;
            dateView.FLayoutView(fLayout, 5);
            dateView.btnCancel.MouseUpEventHandler += (sender2, e2) =>
            int line = 0;
            var sceneList = LogicMethod.GetSceneList();
            if (sceneList.Count == 0|| sceneList.Count>5)
            {
                line = 5;
            }
            else {
                line = sceneList.Count;
            }
            LogicView.DateView view = new LogicView.DateView();
            view.btnTitle.TextID = StringId.addSceneLogic;
            view.FLayoutView(fLayout, line);

            view.btnCancel.MouseUpEventHandler += (sender2, e2) =>
            {
                fLayout.RemoveFromParent();
            };
            FrameLayout frameL = new FrameLayout
            {
                Y = Application.GetRealHeight(56),
                Height = Application.GetRealHeight(50 * line),
            };

            VerticalRefreshLayout verticalRefresh = new VerticalRefreshLayout
            {
                Y = Application.GetRealHeight(56),
                Height = Application.GetRealHeight(50 * 5),

            };
            dateView.frameLayout.AddChidren(verticalRefresh);
            //定义一个局部变量记录选中状态
            Button buttonClick = new Button();
            HDL_ON.Entity.Scene sceneSelecetd = null;
            var sceneList = LogicMethod.GetSceneList();
            verticalRefresh.BeginHeaderRefreshingAction += () =>
            {
                //关闭刷新View；
                verticalRefresh.EndHeaderRefreshing();
            };

            if (sceneList.Count == 0)
            {
                Button btnTipNot = new Button
                {
                    X=Application.GetRealWidth(93),
                    Y = Application.GetRealHeight(80),
                    Width = Application.GetRealWidth(158),
                    Height = Application.GetRealWidth(158),
                    UnSelectedImagePath = "TipNot.png",
                    
                };
                view.frameLayout.AddChidren(btnTipNot);

                Button btnTipNotText = new Button()
                {
                    Y = btnTipNot.Bottom+ Application.GetRealHeight(16),
                    Height = Application.GetRealHeight(20),
                    TextID = StringId.secnenull,
                    TextColor = CSS.CSS_Color.textColor,
                    TextSize =LogicView.TextSize.text14,
                    TextAlignment = TextAlignment.Center,
                };
                view.frameLayout.AddChidren(btnTipNotText);
            }
            else if (sceneList.Count <=5 ) {
                view.frameLayout.AddChidren(frameL);
            }
            else if(sceneList.Count>5) {
                view.frameLayout.AddChidren(verticalRefresh);

            }


            //定义一个局部变量记录选中状态
            Button buttonClick = new Button();
            HDL_ON.Entity.Scene sceneSelecetd = null;
            verticalRefresh.BeginHeaderRefreshingAction += () =>
            {
                //关闭刷新View；
                verticalRefresh.EndHeaderRefreshing();
            };

            for (int i = 0; i < sceneList.Count; i++)
            {
                var scene = sceneList[i];
                LogicView.SelectTypeView sceneView = new LogicView.SelectTypeView();
                sceneView.frameLayout.BackgroundColor = CSS.CSS_Color.viewTranslucence;
                sceneView.btnIcon.Visible = false;
                sceneView.btnText.X = Application.GetRealWidth(20);
                LogicView.CheckView sceneView = new LogicView.CheckView();
                sceneView.btnText.Text = scene.name;
                sceneView.btnLine.X = Application.GetRealWidth(20);
                sceneView.btnLine.Width = Application.GetRealWidth(303);
                sceneView.btnNextIcon.X = Application.GetRealWidth(303);
                sceneView.btnNextIcon.Width = Application.GetRealWidth(28);
                sceneView.btnNextIcon.Height = Application.GetRealWidth(28);
                sceneView.btnNextIcon.UnSelectedImagePath = "LogicIcon/weekoff.png";
                sceneView.btnNextIcon.SelectedImagePath = "LogicIcon/weekon.png";
                verticalRefresh.AddChidren(sceneView.FLayoutView());
                sceneView.btnText.TextSize = LogicView.TextSize.text14;
                if (sceneList.Count <= 5)
                {
                    sceneView.frameLayout.Y = Application.GetRealWidth(i*50);
                    frameL.AddChidren(sceneView.FLayoutView());
                    if (sceneList.Count-1==i) {
                        sceneView.btnLine.BackgroundColor = CSS.CSS_Color.view;
                    }
                }
                else
                {
                    verticalRefresh.AddChidren(sceneView.FLayoutView());
                }
                sceneView.btnClick.Tag = scene;//标记索引

                //场景的点击事件
                sceneView.btnClick.MouseUpEventHandler += (sender, e) =>
                {
                    buttonClick.IsSelected = false;
                    sceneView.btnNextIcon.IsSelected = true;
                    buttonClick = sceneView.btnNextIcon;
                    sceneSelecetd =sceneView.btnClick.Tag as HDL_ON.Entity.Scene;
                    sceneView.btnCheckIcon.IsSelected = true;
                    buttonClick = sceneView.btnCheckIcon;
                    sceneSelecetd = sceneView.btnClick.Tag as HDL_ON.Entity.Scene;
                };

            }
            //确认点击事件
            dateView.btnConfirm.MouseUpEventHandler += (sender1, e1) =>
            view.btnConfirm.MouseUpEventHandler += (sender1, e1) =>
            {
                if (sceneSelecetd == null)
                {
@@ -154,7 +209,7 @@
                Output outputDevice = new Output();
                outputDevice.target_type = "2";
                outputDevice.sid = sceneSelecetd.sid;
                //没啥作用，为了数据格式统一,发送时不再判断
                //没啥作用，为了发送数据格式统一;
                outputDevice.status = new List<Dictionary<string, string>> { new Dictionary<string, string> { { "key", "scene"},{ "value", "0" } } };
                AddOutput(outputDevice);
                fLayout.RemoveFromParent();
@@ -201,7 +256,7 @@
                    foreach (var dic in dicList)
                    {
                        string timeValue = dic["value"];
                        int hIndex = timePointView.GetValueIndex(timeValue, 0, 1, timePointView.GethIntList0());
                        int hIndex = timePointView.GetValueIndex(timeValue, 0, 1, timePointView.GethIntList());
                        int mIndex = timePointView.GetValueIndex(timeValue, 1, 0, timePointView.GetmIntList());
                        //更新初始状态
                        timePointView.mUIPickerView.setCurrentItems(hIndex, mIndex, 0);

 HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs

@@ -29,7 +29,7 @@
                {
                    case "1":
                        {
                            inputView.btnIcon.UnSelectedImagePath = "LogicIcon/timecondition.png";
                            inputView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
                            foreach (var dic in dicList)
                            {
                                string value = dic["value"];
@@ -40,7 +40,7 @@
                        break;
                    case "2":
                        {
                            inputView.btnIcon.UnSelectedImagePath = "LogicIcon/timecondition.png";
                            inputView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
                            foreach (var dic in dicList)
                            {
                                string value = dic["value"];

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs

@@ -88,7 +88,7 @@
        {
            //初始化列表
            var hList = new List<string>();
            for (int i = 1; i < 24; i++)
            for (int i = 0; i < 24; i++)
            {
                if (i < 10)
                {
@@ -165,28 +165,11 @@
        /// 获取023小时列表
        /// </summary>
        /// <returns></returns>
        public List<int> GethIntList0()
        {
            //初始化列表
            var hList = new List<int>();
            for (int i = 1; i < 24; i++)
            {
                //添加数据
                hList.Add(i);
            }
            return hList;


        }
        /// <summary>
        /// 获取24小时列表
        /// </summary>
        /// <returns></returns>
        public List<int> GethIntList()
        {
            //初始化列表
            var hList = new List<int>();
            for (int i = 1; i < 24; i++)
            for (int i = 0; i < 24; i++)
            {
                //添加数据
                hList.Add(i);
@@ -195,6 +178,7 @@


        }
        
        /// <summary>
        /// 获取60分钟列表
        /// </summary>

 HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs

@@ -34,8 +34,8 @@
            };
            //获取自动化列表
            GetLogicList();
            // for (int i = Logic.LogicList.Count-1; i >= 0; i--)降序排列
            for (int i = 0; i < Logic.LogicList.Count; i++)
             for (int i = Logic.LogicList.Count-1; i >= 0; i--)//降序排列
            //for (int i = 0; i < Logic.LogicList.Count; i++)
            {
                var currLogic = Logic.LogicList[i];
                ///上下间隔12像素
@@ -81,8 +81,8 @@
                    { IsBackground = true }.Start();
                };
                GetSelectIcon(logicView.frameLayout, currLogic);
                //if (i==0)降序排列
                if (Logic.LogicList.Count - 1 == i)
                if (i==0)//降序排列
                //if (Logic.LogicList.Count - 1 == i)
                {
                    ///最后一个距离最底部12,界面显示效果作用;
                    vv.AddChidren(new FrameLayout { Height = Application.GetRealHeight(12) });
@@ -110,12 +110,12 @@
                automationPage.AddChidren(btnTipNot);
                Button btnTipNotText = new Button()
                {
                    Y = btnTipNot.Bottom,
                    Height = Application.GetRealWidth(100),
                    TextID = StringId.ContentIsEmpty,
                    Y = btnTipNot.Bottom + Application.GetRealHeight(16),
                    Height = Application.GetRealHeight(20),
                    TextID = StringId.logicnull,
                    TextAlignment = TextAlignment.Center,
                    TextColor = CSS.CSS_Color.TextualColor,
                    TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
                    TextSize = LogicView.TextSize.text14,
                    TextColor = CSS.CSS_Color.textConfirmColor,
                };
                automationPage.AddChidren(btnTipNotText);
            }

 HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs

@@ -14,7 +14,7 @@
        /// <param name="stateText">之前状态文本</param>
        /// <param name="action">返回值</param>
        /// <param name="textSize">显示文本字体大小</param>
        public void SingleSelectionShow(FrameLayout frameLayout, List<string> list, string titleText, string stateText,Action<string> action, int textSize=LogicView.TextSize.text14)
        public void SingleSelectionShow(FrameLayout frameLayout, List<string> list, string titleText, string stateText, Action<string> action, int textSize = LogicView.TextSize.text14)
        {
            LogicView.DateView view = new LogicView.DateView();
            view.btnTitle.Text = titleText;
@@ -69,6 +69,7 @@
            };

        }
       
        /// <summary>
        /// 多选择
        /// </summary>
@@ -149,7 +150,7 @@
        /// </summary>
        /// <param name="frameLayout">父控件</param>
        /// <param name="action">显示文本字体大小</param>
        public void MonSelectShow(FrameLayout frameLayout,Logic logic, Action<List<string>> action)
        public void MonSelectShow(FrameLayout frameLayout, Logic logic, Action<List<string>> action)
        {
            LogicView.MonView monView = new LogicView.MonView();
            monView.btnTitle.TextID = StringId.monthly;
@@ -237,12 +238,14 @@
                    //提示：还没选中执行周期
                    return;
                }
       


                action(monList);
                frameLayout.RemoveFromParent();
            };

        }

      
    }
}

 HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs

@@ -278,7 +278,7 @@
                                speedTypeView.btnText.Text = speedStr[i];
                                speedTypeView.btnClick.Tag = speedStr[i];//标记

                                if (acModehView.btnState.Text == speedStr[i])
                                if (acSpeedView.btnState.Text == speedStr[i])
                                {
                                    //显示之前的选中状态
                                    checkBtn.IsSelected = false;

 HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs

@@ -107,9 +107,9 @@
            var systeMinute = DateTime.Now.Minute;//获取分钟
            int systemHourIndex = 0;
            int systeMinuteIndex = 0;
            for (int i = 0; i < timePointView.GethIntList0().Count; i++)
            for (int i = 0; i < timePointView.GethIntList().Count; i++)
            {
                var currhour = timePointView.GethIntList0()[i];
                var currhour = timePointView.GethIntList()[i];
                if (systemHour == currhour)
                {
                    systemHourIndex = i;
@@ -160,7 +160,7 @@
                        int hIndex = timePointView.GetValueIndex(timeValue, 0, 1, timePointView.GethIntList());
                        int mIndex = timePointView.GetValueIndex(timeValue, 1, 0, timePointView.GetmIntList());
                        //更新初始状态
                        timePointView.mUIPickerView.setCurrentItems(hIndex - 1, mIndex, 0);
                        timePointView.mUIPickerView.setCurrentItems(hIndex, mIndex, 0);
                        timepoint = timeValue;
                    }
                }
@@ -378,9 +378,9 @@
            var systeMinute = DateTime.Now.Minute;//获取分钟
            int systemHourIndex = 0;
            int systeMinuteIndex = 0;
            for (int i = 0; i < timePointView.GethIntList0().Count; i++)
            for (int i = 0; i < timePointView.GethIntList().Count; i++)
            {
                var currhour = timePointView.GethIntList0()[i];
                var currhour = timePointView.GethIntList()[i];
                if (systemHour == currhour)
                {
                    systemHourIndex = i;
@@ -447,7 +447,7 @@
                int hourIndex = timePointView.GetValueIndex(timepoint, 0, 1, timePointView.GethIntList());
                int minuteIndex = timePointView.GetValueIndex(timepoint, 1, 0, timePointView.GetmIntList());
                //更新状态
                timePointView.mUIPickerView.setCurrentItems(hourIndex - 1, minuteIndex, 0);
                timePointView.mUIPickerView.setCurrentItems(hourIndex, minuteIndex, 0);
            }

            //选中时间回调方法,时间变化一次回调一次

 HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveList.cs

@@ -67,8 +67,8 @@
                {
                    X = Application.GetRealWidth(16),
                    Y = Application.GetRealHeight(8),
                    Width = Application.GetMinRealAverage(88),
                    Height = Application.GetMinRealAverage(88),
                    Width = Application.GetRealWidth(88),
                    Height = Application.GetRealWidth(88),

                };
                addFlieRow.AddChidren(fileIconBtn);
@@ -77,8 +77,8 @@
                {
                    X = Application.GetRealWidth(78),
                    Y = Application.GetRealHeight(70),
                    Width = Application.GetMinRealAverage(24),
                    Height = Application.GetMinRealAverage(24),
                    Width = Application.GetRealWidth(24),
                    Height = Application.GetRealWidth(24),
                    UnSelectedImagePath = "MusicIcon/filePause.png",
                    SelectedImagePath = "MusicIcon/filePlay.png",
                };

 HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveRadioList.cs

@@ -80,8 +80,8 @@
                {
                    X = Application.GetRealWidth(16),
                    Y = Application.GetRealHeight(18),
                    Width = Application.GetMinRealAverage(32),
                    Height = Application.GetMinRealAverage(32),
                    Width = Application.GetRealWidth(32),
                    Height = Application.GetRealWidth(32),
                    UnSelectedImagePath = "MusicIcon/radioIcon.png",
                };
                radioViewFl.AddChidren(radioIconBtn);
@@ -104,8 +104,8 @@
                {
                    X = Application.GetRealWidth(335),
                    Y = Application.GetRealHeight(20),
                    Width = Application.GetMinRealAverage(28),
                    Height = Application.GetMinRealAverage(28),
                    Width = Application.GetRealWidth(28),
                    Height = Application.GetRealWidth(28),
                    UnSelectedImagePath = "MusicIcon/loveSelected.png",
                };
                radioViewFl.AddChidren(loveIcon);

 HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs

@@ -64,8 +64,8 @@
            areaText.FrameLayoutView(fL1, false);
            areaText.nextLevelBtn.X = Application.GetRealWidth(339);
            areaText.nextLevelBtn.Y = Application.GetRealHeight(17);
            areaText.nextLevelBtn.Width = Application.GetMinRealAverage(16);
            areaText.nextLevelBtn.Height = Application.GetMinRealAverage(16);
            areaText.nextLevelBtn.Width = Application.GetRealWidth(16);
            areaText.nextLevelBtn.Height = Application.GetRealWidth(16);
            areaText.nextLevelBtn.UnSelectedImagePath = "MusicIcon/sourceNetx.png";
            areaText.lineBtn.BackgroundColor = MusicColor.WhiteColor;
            areaText.textBtn.X = Application.GetRealWidth(16);

 HDL_ON/UI/UI2/FuntionControlView/Music/A31MyList.cs

@@ -40,8 +40,8 @@
            {
                X = Application.GetRealWidth(336),
                Y = Application.GetRealHeight(30),
                Width = Application.GetMinRealAverage(28),
                Height = Application.GetMinRealAverage(28),
                Width = Application.GetRealWidth(28),
                Height = Application.GetRealWidth(28),
                UnSelectedImagePath = "MusicIcon/addMusic.png",
            };
            topView.TopFLayoutView().AddChidren(addIconBtn);
@@ -96,8 +96,8 @@
                {
                    X = Application.GetRealWidth(16),
                    Y = Application.GetRealHeight(8),
                    Width = Application.GetMinRealAverage(88),
                    Height = Application.GetMinRealAverage(88),
                    Width = Application.GetRealWidth(88),
                    Height = Application.GetRealWidth(88),
                    UnSelectedImagePath = "MusicIcon/fileList.png",
                };
                addFlieRow.AddChidren(fileIconBtn);
@@ -106,8 +106,8 @@
                {
                    X = Application.GetRealWidth(78),
                    Y = Application.GetRealHeight(70),
                    Width = Application.GetMinRealAverage(24),
                    Height = Application.GetMinRealAverage(24),
                    Width = Application.GetRealWidth(24),
                    Height = Application.GetRealWidth(24),
                    UnSelectedImagePath = "MusicIcon/filePause.png",
                    SelectedImagePath = "MusicIcon/filePlay.png",
                    Tag= list,

 HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs

@@ -39,7 +39,6 @@
       
        public void Show()
        {
            
            ///1秒定时更新状态
            timerUpdateStatus();
            #region   ---界面布局---

 HDL_ON/UI/UI2/FuntionControlView/Music/A31Radio.cs

@@ -64,8 +64,8 @@
                {
                    X = Application.GetRealWidth(16),
                    Y = Application.GetRealHeight(8),
                    Width = Application.GetMinRealAverage(62),
                    Height = Application.GetMinRealAverage(62),
                    Width = Application.GetRealWidth(62),
                    Height = Application.GetRealWidth(62),
                    UnSelectedImagePath = "MusicIcon/file.png",
                };
                addFlieRow.AddChidren(fileIconBtn);

 HDL_ON/UI/UI2/FuntionControlView/Music/A31RadioList.cs

@@ -71,8 +71,8 @@
                    {
                        X = Application.GetRealWidth(16),
                        Y = Application.GetRealHeight(18),
                        Width = Application.GetMinRealAverage(32),
                        Height = Application.GetMinRealAverage(32),
                        Width = Application.GetRealWidth(32),
                        Height = Application.GetRealWidth(32),
                        UnSelectedImagePath = "MusicIcon/radioIcon.png",
                    };
                    radioViewFl.AddChidren(radioIconBtn);
@@ -96,8 +96,8 @@
                    {
                        X = Application.GetRealWidth(335),
                        Y = Application.GetRealHeight(20),
                        Width = Application.GetMinRealAverage(28),
                        Height = Application.GetMinRealAverage(28),
                        Width = Application.GetRealWidth(28),
                        Height = Application.GetRealWidth(28),
                        UnSelectedImagePath = "MusicIcon/love.png",
                        SelectedImagePath = "MusicIcon/loveSelected.png",
                    };
@@ -185,8 +185,8 @@
                    {
                        X = Application.GetRealWidth(16),
                        Y = Application.GetRealHeight(8),
                        Width = Application.GetMinRealAverage(62),
                        Height = Application.GetMinRealAverage(62),
                        Width = Application.GetRealWidth(62),
                        Height = Application.GetRealWidth(62),
                        UnSelectedImagePath = "MusicIcon/file.png",
                    };
                    addFlieRow.AddChidren(fileIconBtn);

 HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs

@@ -80,8 +80,8 @@
            {
                X = Application.GetRealWidth(304),
                Y = Application.GetRealHeight(20),
                Width = Application.GetMinRealAverage(28),
                Height = Application.GetMinRealAverage(28),
                Width = Application.GetRealWidth(28),
                Height = Application.GetRealWidth(28),
                UnSelectedImagePath = "MusicIcon/addMusic.png",
            };
            topFra.AddChidren(addIconBtn);
@@ -132,8 +132,8 @@
                {
                    X = Application.GetRealWidth(12),
                    Y = Application.GetRealHeight(8),
                    Width = Application.GetMinRealAverage(62),
                    Height = Application.GetMinRealAverage(62),
                    Width = Application.GetRealWidth(62),
                    Height = Application.GetRealWidth(62),
                    UnSelectedImagePath = "MusicIcon/file.png",
                };
                addFlieRow.AddChidren(fileIconBtn);
@@ -352,8 +352,8 @@
                {
                    X = Application.GetRealWidth(303),
                    Y = Application.GetRealHeight(11),
                    Width = Application.GetMinRealAverage(28),
                    Height = Application.GetMinRealAverage(28),
                    Width = Application.GetRealWidth(28),
                    Height = Application.GetRealWidth(28),
                    UnSelectedImagePath = "MusicIcon/noSelectedIcon.png",
                    SelectedImagePath = "MusicIcon/selectedIcon.png",
                };
@@ -626,8 +626,8 @@
                {
                    X = Application.GetRealWidth(303),
                    Y = Application.GetRealHeight(11),
                    Width = Application.GetMinRealAverage(28),
                    Height = Application.GetMinRealAverage(28),
                    Width = Application.GetRealWidth(28),
                    Height = Application.GetRealWidth(28),
                    UnSelectedImagePath = "MusicIcon/noSelectedIcon.png",
                    SelectedImagePath = "MusicIcon/selectedIcon.png",
                    Tag = player,
@@ -812,8 +812,8 @@
                {
                    X = Application.GetRealWidth(303),
                    Y = Application.GetRealHeight(11),
                    Width = Application.GetMinRealAverage(28),
                    Height = Application.GetMinRealAverage(28),
                    Width = Application.GetRealWidth(28),
                    Height = Application.GetRealWidth(28),
                    UnSelectedImagePath = "MusicIcon/noSelectedIcon.png",
                    SelectedImagePath = "MusicIcon/selectedIcon.png",
                };
@@ -1284,8 +1284,8 @@
                IsClickable = true,//进度条是否滑动
                ProgressBarColor = MusicColor.SelectedColor,//选中进度条颜色
                ThumbImagePath = "MusicIcon/progressIcon.png",//进度条按钮图标
                ThumbImageHeight = Application.GetMinRealAverage(54),//进度条按钮图标的高度（默认正方形：宽和高一样）
                SeekBarViewHeight = Application.GetMinRealAverage(8),//进度条的高度
                ThumbImageHeight = Application.GetRealWidth(54),//进度条按钮图标的高度（默认正方形：宽和高一样）
                SeekBarViewHeight = Application.GetRealWidth(8),//进度条的高度
                Progress = int.Parse(a31player.A31PlayStatus.vol),
                SeekBarPadding = Application.GetRealWidth(20),
                //ProgressChangeDelayTime=
@@ -1347,8 +1347,8 @@
                    IsClickable = true,//进度条是否滑动
                    ProgressBarColor = MusicColor.SelectedColor,//选中进度条颜色
                    ThumbImagePath = "MusicIcon/progressIcon.png",//进度条按钮图标
                    ThumbImageHeight = Application.GetMinRealAverage(54),//进度条按钮图标的高度（默认正方形：宽和高一样）
                    SeekBarViewHeight = Application.GetMinRealAverage(8),//进度条的高度
                    ThumbImageHeight = Application.GetRealWidth(54),//进度条按钮图标的高度（默认正方形：宽和高一样）
                    SeekBarViewHeight = Application.GetRealWidth(8),//进度条的高度
                    Progress = int.Parse(player.A31PlayStatus.vol),
                        SeekBarPadding = Application.GetRealWidth(20),
                    //ProgressChangeDelayTime=

 HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicSourceView.cs

@@ -20,8 +20,8 @@
        {
            X = Application.GetRealWidth(16),
            Y = Application.GetRealHeight(13),
            Width = Application.GetMinRealAverage(24),
            Height = Application.GetMinRealAverage(24),
            Width = Application.GetRealWidth(24),
            Height = Application.GetRealWidth(24),
        };
        /// <summary>
        ///文本
@@ -58,8 +58,8 @@
        {
            X = Application.GetRealWidth(339),
            Y = Application.GetRealHeight(17),
            Width = Application.GetMinRealAverage(16),
            Height = Application.GetMinRealAverage(16),
            Width = Application.GetRealWidth(16),
            Height = Application.GetRealWidth(16),
            UnSelectedImagePath = "MusicIcon/sourceNetx.png",

        };
@@ -104,8 +104,8 @@
                fLayout.AddChidren(inputTextBtn);
                nextLevelBtn.X = Application.GetRealWidth(333);
                nextLevelBtn.Y = Application.GetRealHeight(11);
                nextLevelBtn.Width = Application.GetMinRealAverage(28);
                nextLevelBtn.Height = Application.GetMinRealAverage(28);
                nextLevelBtn.Width = Application.GetRealWidth(28);
                nextLevelBtn.Height = Application.GetRealWidth(28);
                nextLevelBtn.UnSelectedImagePath = "MusicIcon/edit.png";
            }
            fLayout.AddChidren(textBtn);

 HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs

@@ -32,8 +32,8 @@
        {
            X = Application.GetRealWidth(10),
            Y = Application.GetRealHeight(15),
            Width = Application.GetMinRealAverage(32),
            Height = Application.GetMinRealAverage(32),
            Width = Application.GetRealWidth(32),
            Height = Application.GetRealWidth(32),
            UnSelectedImagePath = "MusicIcon/playStatus.png",
        };
        /// <summary>
@@ -55,8 +55,8 @@
        {
            X = Application.GetRealWidth(214 + 13),
            Y = Application.GetRealHeight(18 + 5),
            Width = Application.GetMinRealAverage(16),
            Height = Application.GetMinRealAverage(16),
            Width = Application.GetRealWidth(16),
            Height = Application.GetRealWidth(16),
            UnSelectedImagePath = "MusicIcon/Merge.png",
        };
        /// <summary>
@@ -80,8 +80,8 @@
        {
            X = Application.GetRealWidth(299),
            Y = Application.GetRealHeight(10),
            Width = Application.GetMinRealAverage(40),
            Height = Application.GetMinRealAverage(40),
            Width = Application.GetRealWidth(40),
            Height = Application.GetRealWidth(40),
            UnSelectedImagePath = "MusicIcon/collect.png",
            SelectedImagePath = "MusicIcon/collectSelected.png",
        };
@@ -157,8 +157,8 @@
        {
            X = Application.GetRealWidth(163),
            Y = Application.GetRealHeight(101),
            Width = Application.GetMinRealAverage(32),
            Height = Application.GetMinRealAverage(32),
            Width = Application.GetRealWidth(32),
            Height = Application.GetRealWidth(32),
            UnSelectedImagePath = "MusicIcon/prev.png",
            SelectedImagePath = "MusicIcon/prevSeletced.png",
        };
@@ -169,8 +169,8 @@
        {
            X = Application.GetRealWidth(233),
            Y = Application.GetRealHeight(101),
            Width = Application.GetMinRealAverage(32),
            Height = Application.GetMinRealAverage(32),
            Width = Application.GetRealWidth(32),
            Height = Application.GetRealWidth(32),
            UnSelectedImagePath = "MusicIcon/pause.png",
            SelectedImagePath = "MusicIcon/play.png",
        };
@@ -181,8 +181,8 @@
        {
            X = Application.GetRealWidth(303),
            Y = Application.GetRealHeight(101),
            Width = Application.GetMinRealAverage(32),
            Height = Application.GetMinRealAverage(32),
            Width = Application.GetRealWidth(32),
            Height = Application.GetRealWidth(32),
            UnSelectedImagePath = "MusicIcon/next.png",
            SelectedImagePath = "MusicIcon/nextSelected.png",
        };

 HDL_ON/UI/UI2/FuntionControlView/Music/View/MyListView.cs

@@ -40,8 +40,8 @@
        {
            X = Application.GetRealWidth(16),
            Y = Application.GetRealHeight(11),
            Width = Application.GetMinRealAverage(28),
            Height = Application.GetMinRealAverage(28),
            Width = Application.GetRealWidth(28),
            Height = Application.GetRealWidth(28),
        };
        /// <summary>
        /// 模式文本控件

 HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs

@@ -51,8 +51,8 @@
        {
            X = Application.GetRealWidth(273),
            Y = Application.GetRealHeight(14),
            Width = Application.GetMinRealAverage(40),
            Height = Application.GetMinRealAverage(40),
            Width = Application.GetRealWidth(40),
            Height = Application.GetRealWidth(40),
            UnSelectedImagePath = "MusicIcon/collect.png",
            SelectedImagePath = "MusicIcon/collectSelected.png",
        };
@@ -61,20 +61,18 @@
        /// </summary>
        public FrameLayout fra = new FrameLayout
        {
            X = Application.GetRealWidth(63 + 2),
            X = Application.GetRealWidth(57),
            Y = Application.GetRealHeight(72),
            Width = Application.GetRealWidth(202+12),
            Height = Application.GetRealHeight(202+12),
            Height = Application.GetRealWidth(202+12),
        };
        /// <summary>
        ///显示播放音乐图标
        /// </summary>
        public Button musicIconBtn = new Button
        {
            //X = Application.GetRealWidth(63 + 2+20),
            //Y = Application.GetRealHeight(72 + 6+20),
            Width = Application.GetMinRealAverage(158),
            Height = Application.GetMinRealAverage(158),
            Width = Application.GetRealWidth(158),
            Height = Application.GetRealWidth(158),
            UnSelectedImagePath = "MusicIcon/musicIcon.png",
            Gravity = Gravity.Center,
        };
@@ -83,8 +81,8 @@
        /// </summary>
        public DiyArcSeekBar diyArcSeekBar = new DiyArcSeekBar
        {
            Width = Application.GetMinRealAverage(202),
            Height = Application.GetMinRealAverage(202),
            Width = Application.GetRealWidth(202),
            Height = Application.GetRealWidth(202),
            ProgressBarColor = MusicColor.SelectedColor,
            OpenAngle = 0,//开口角度
            ArcWidth = Application.GetRealWidth(4),//进度宽度
@@ -156,8 +154,8 @@
        {
            X = Application.GetRealWidth(70),
            Y = Application.GetRealHeight(355),
            Width = Application.GetMinRealAverage(28),
            Height = Application.GetMinRealAverage(28),
            Width = Application.GetRealWidth(28),
            Height = Application.GetRealWidth(28),
            UnSelectedImagePath = "MusicIcon/list.png",
        };
        /// <summary>
@@ -167,8 +165,8 @@
        {
            X = Application.GetRealWidth(150),
            Y = Application.GetRealHeight(355),
            Width = Application.GetMinRealAverage(28),
            Height = Application.GetMinRealAverage(28),
            Width = Application.GetRealWidth(28),
            Height = Application.GetRealWidth(28),
            UnSelectedImagePath = "MusicIcon/love1.png",
            SelectedImagePath = "MusicIcon/loveSelected1.png",
        };
@@ -179,8 +177,8 @@
        {
            X = Application.GetRealWidth(230),
            Y = Application.GetRealHeight(355),
            Width = Application.GetMinRealAverage(28),
            Height = Application.GetMinRealAverage(28),
            Width = Application.GetRealWidth(28),
            Height = Application.GetRealWidth(28),
            UnSelectedImagePath = "MusicIcon/playList.png",
        };
        /// <summary>
@@ -190,8 +188,8 @@
        {
            X = Application.GetRealWidth(24),
            Y = Application.GetRealHeight(414),
            Width = Application.GetMinRealAverage(24),
            Height = Application.GetMinRealAverage(24),
            Width = Application.GetRealWidth(24),
            Height = Application.GetRealWidth(24),
            UnSelectedImagePath = "MusicIcon/vol.png",
        };
        /// <summary>
@@ -207,8 +205,8 @@
            IsClickable = true,//进度条是否滑动
            ProgressBarColor = MusicColor.SelectedColor,//选中进度条颜色
            ThumbImagePath = "MusicIcon/progressIcon.png",//进度条按钮图标
            ThumbImageHeight = Application.GetMinRealAverage(54),//进度条按钮图标的高度（默认正方形：宽和高一样）
            SeekBarViewHeight = Application.GetMinRealAverage(8),//进度条的高度
            ThumbImageHeight = Application.GetRealWidth(54),//进度条按钮图标的高度（默认正方形：宽和高一样）
            SeekBarViewHeight = Application.GetRealWidth(8),//进度条的高度
            ProgressChangeDelayTime = 300,//0.3秒发送一次
            SeekBarPadding = Application.GetRealWidth(20),
        };
@@ -233,8 +231,8 @@
        {
            X = Application.GetRealWidth(64),
            Y = Application.GetRealHeight(466),
            Width = Application.GetMinRealAverage(40),
            Height = Application.GetMinRealAverage(40),
            Width = Application.GetRealWidth(40),
            Height = Application.GetRealWidth(40),
            UnSelectedImagePath = "MusicIcon/prve1.png",
            SelectedImagePath = "MusicIcon/prve1Selected.png",
        };
@@ -245,8 +243,8 @@
        {
            X = Application.GetRealWidth(144),
            Y = Application.GetRealHeight(466),
            Width = Application.GetMinRealAverage(40),
            Height = Application.GetMinRealAverage(40),
            Width = Application.GetRealWidth(40),
            Height = Application.GetRealWidth(40),
            UnSelectedImagePath = "MusicIcon/pause1.png",
            SelectedImagePath = "MusicIcon/play1.png",
        };
@@ -257,8 +255,8 @@
        {
            X = Application.GetRealWidth(224),
            Y = Application.GetRealHeight(466),
            Width = Application.GetMinRealAverage(40),
            Height = Application.GetMinRealAverage(40),
            Width = Application.GetRealWidth(40),
            Height = Application.GetRealWidth(40),
            UnSelectedImagePath = "MusicIcon/next1.png",
            SelectedImagePath = "MusicIcon/next1Selected.png",
        };

 HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs

@@ -21,8 +21,8 @@
        {
            X = Application.GetRealWidth(16),
            Y = Application.GetRealHeight(10),
            Width = Application.GetMinRealAverage(24),
            Height = Application.GetMinRealAverage(24),
            Width = Application.GetRealWidth(24),
            Height = Application.GetRealWidth(24),
            UnSelectedImagePath = "MusicIcon/playStatus.png",
            Visible = false,
            Name = "playStatus",
@@ -64,8 +64,8 @@
        {
            X = Application.GetRealWidth(291),
            Y = Application.GetRealHeight(8),
            Width = Application.GetMinRealAverage(28),
            Height = Application.GetMinRealAverage(28),
            Width = Application.GetRealWidth(28),
            Height = Application.GetRealWidth(28),
            UnSelectedImagePath = "MusicIcon/love.png",
            SelectedImagePath = "MusicIcon/loveSelected.png",
        };
@@ -77,8 +77,8 @@
        {
            X = Application.GetRealWidth(335),
            Y = Application.GetRealHeight(8),
            Width = Application.GetMinRealAverage(28),
            Height = Application.GetMinRealAverage(28),
            Width = Application.GetRealWidth(28),
            Height = Application.GetRealWidth(28),
            UnSelectedImagePath = "MusicIcon/addMusic1.png",
        };
        /// <summary>

 HDL_ON/UI/UI2/FuntionControlView/Music/View/TipView.cs

@@ -92,8 +92,8 @@
            {
                X = Application.GetRealWidth(194),
                Y = Application.GetRealHeight(8),
                Width = Application.GetMinRealAverage(24),
                Height = Application.GetMinRealAverage(24),
                Width = Application.GetRealWidth(24),
                Height = Application.GetRealWidth(24),
                UnSelectedImagePath = "MusicIcon/clear.png",
            };
            editBjView.AddChidren(clearIconBtn);
@@ -264,8 +264,8 @@
            {
                X = Application.GetRealWidth(194),
                Y = Application.GetRealHeight(8),
                Width = Application.GetMinRealAverage(24),
                Height = Application.GetMinRealAverage(24),
                Width = Application.GetRealWidth(24),
                Height = Application.GetRealWidth(24),
                UnSelectedImagePath = "MusicIcon/clear.png",
            };
            editBjView.AddChidren(clearIconBtn);