From 0c216014c649090d765902301cbfc9157f8f1ee4 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期二, 15 八月 2023 16:19:40 +0800 Subject: [PATCH] 2023年08月15日16:19:37 --- HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs | 4 ++-- HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs | 4 ++-- HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs | 2 +- HDL_ON/UI/UI2/FuntionControlView/Aks/YkPage.cs | 2 +- HDL_ON/UI/UI2/FuntionControlView/Aks/CollectPage.cs | 27 ++++++++++++++++----------- HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs | 5 +++++ HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs | 4 ++-- 7 files changed, 29 insertions(+), 19 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs index c4a56ea..ececc69 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs @@ -113,6 +113,11 @@ { return; } + if (CollectList.Count == 0) + { + CollectList.Add(movieLibrary); + return; + } for (int i = 0; i < CollectList.Count; i++) { if (CollectList[i].movieId == movieLibrary.movieId) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CollectPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CollectPage.cs index 6ad5cc9..a73fea7 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CollectPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CollectPage.cs @@ -17,12 +17,12 @@ this.remoteControl = remoteControlEntity; //璇荤紦瀛樻暟鎹� var collectList = AksCommonMethod.Current.CollectList; - this.mMovieLibraryList.AddRange(collectList); + this.mMovieCollectList .AddRange(collectList); } /// <summary> - /// 褰辩墖鍒楄〃 + /// 褰辩墖鏀惰棌鍒楄〃 /// </summary> - private List<MovieLibrary> mMovieLibraryList=new List<MovieLibrary>(); + private List<MovieLibrary> mMovieCollectList =new List<MovieLibrary>(); /// <summary> /// 褰撳墠鐨勯仴鎺у櫒瀵硅薄 /// </summary> @@ -90,18 +90,19 @@ return; } vv.RemoveAll(); - int count = this.mMovieLibraryList == null ? 0 : this.mMovieLibraryList.Count; + int count = this.mMovieCollectList == null ? 0 : this.mMovieCollectList .Count; imageFLayout = new CornerFramLayout(343, count * 168, 0); vv.AddChidren(imageFLayout); imageFLayout.X = Application.GetRealWidth(16); - imageFLayout.LoadImagePage(this.mMovieLibraryList); + imageFLayout.LoadImagePage(this.mMovieCollectList ); imageFLayout.AdjustRealHeight(16); vv.BeginHeaderRefreshingAction += () => { //鍏抽棴鍒锋柊View锛� vv.EndHeaderRefreshing(); - mMovieLibraryList.Clear(); + //寮哄埗鏇存柊 + mMovieCollectList .Clear(); ReadData(); }; imageFLayout.selectImageAction += (movieLibrary) => @@ -114,9 +115,11 @@ detailPage.Show(); detailPage.action += (isUpdate) => { + //鏄惁瑕佹洿鏂� if (isUpdate) { - this.mMovieLibraryList = AksCommonMethod.Current.CollectList; + + this.mMovieCollectList = AksCommonMethod.Current.CollectList; InitMiddle(); } }; @@ -130,7 +133,7 @@ /// </summary> private void ReadData() { - if (mMovieLibraryList.Count > 0) + if (mMovieCollectList .Count > 0) { CommonMethod.Current.MainThread(() => { @@ -144,12 +147,14 @@ { try { - this.mMovieLibraryList = SendMethod.Current.GetcollectPage(this.remoteControl.deviceId, this.remoteControl.rcId, pageNo, SendMethod.pageSize); - for (int i = 0; i < this.mMovieLibraryList.Count; i++) + this.mMovieCollectList = SendMethod.Current.GetcollectPage(this.remoteControl.deviceId, this.remoteControl.rcId, pageNo, SendMethod.pageSize); + for (int i = 0; i < this.mMovieCollectList .Count; i++) { - var mMovieLibrary = this.mMovieLibraryList[i]; + var mMovieLibrary = this.mMovieCollectList [i]; var bytes = SendMethod.Current.GetImage(mMovieLibrary.posterUrl); mMovieLibrary.imageBytes = bytes; + //缂撳瓨鏁版嵁 + AksCommonMethod.Current.AddCollectMovie(mMovieLibrary); } } catch { } diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs index 0f84133..bf51486 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs @@ -135,7 +135,7 @@ { EventHandler<MouseEventArgs> UpClick = (sender, e) => { - leftFramLayout.BackgroundColor = this.UpBackgroundColor; + //leftFramLayout.BackgroundColor = this.UpBackgroundColor; //寮硅捣鏉ヨ繕鍘熻儗鏅鑹� }; @@ -147,7 +147,7 @@ EventHandler<MouseEventArgs> DownClick = (sender, e) => { //鎸変笅鍘绘敼鍙樿儗鏅鑹� - leftFramLayout.BackgroundColor = this.DownBackgroundColor; + //leftFramLayout.BackgroundColor = this.DownBackgroundColor; action?.Invoke(leftFramLayout); }; leftFramLayout.MouseDownEventHandler += DownClick; diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs index b33dc79..ad0a05c 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs @@ -136,7 +136,7 @@ TextAlignment = TextAlignment.CenterLeft, TextColor = MusicColor.TextColor, TextSize = TextSize.Text16, - TextID = StringId.touyingyi, + TextID = StringId.jidinghe, }; this.AddChidren(btnTitle); @@ -268,7 +268,7 @@ typeMultiFramLayout = new TypeMultiFramLayout(); typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32); typeMultiFramLayout.AddView(cornerBottomFram); - typeMultiFramLayout.btnBottonRightName.TextID = StringId.shixuqi; + typeMultiFramLayout.btnBottonRightName.TextID = StringId.jidinghe; //鍒濆鍊� leftBtnTitle.IsSelected = true; diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs index b5d4558..b6070f9 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs @@ -110,7 +110,7 @@ }); } - + private void InitUI() { this.BackgroundColor = MusicColor.ViewColor; diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkPage.cs index f2d5ab6..d7406b4 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkPage.cs @@ -227,7 +227,7 @@ } /// <summary> - /// 椤甸潰澶勭悊閫昏緫 + /// 椤甸潰鏁版嵁澶勭悊閫昏緫 /// </summary> /// <param name="newList">鏂板垪琛ㄦ暟鎹�</param> private void DataTreating(List<MovieLibrary> newList) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs index 29ad756..75534f2 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs @@ -993,7 +993,7 @@ kuaituiFL.AddImageView(); kuaituiFL.AddTextButtonView(); kuaituiFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_kuaitui.png"; - kuaituiFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_kuaitui_selected.png"; + kuaituiFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_kuaijin_selected.png"; kuaituiFL.GetTextButton().Text = "蹇��"; kuaituiFL.AddClickView(); @@ -1019,7 +1019,7 @@ kusinjinFL.AddImageView(); kusinjinFL.AddTextButtonView(); kusinjinFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_kuaijin.png"; - kusinjinFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_kuaijin_selected.png"; + kusinjinFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_kuaitui_selected.png"; kusinjinFL.GetTextButton().Text = "蹇繘"; kusinjinFL.AddClickView(); -- Gitblit v1.8.0