画廊

GameClient/Assets/Game/HotUpdate/Data/PoemGalleryDataManager.cs

@@ -9,64 +9,48 @@ namespace GFGGame
 {
     public class PoemGalleryDataManager : SingletonBase<PoemGalleryDataManager>
     {
+        /// <summary>
+        /// 主题期数
+        /// </summary>
+        public long ThemeOrder { get; set; }
+        /// <summary>
+        /// 主题配置id
+        /// </summary>
+        public long ThemeId { get; set; }
 
 
-
         /// <summary>
-        /// 推荐Id数据
+        /// 推荐数据
+        /// </summary>
+        public List<PoemGalleryData> RecommendInfos = new List<PoemGalleryData>();
+        /// <summary>
+        /// 最新数据
         /// </summary>
-        public List<long> RecommendInfos = new List<long>();
+        public List<PoemGalleryData> NewestInfos = new List<PoemGalleryData>();
 
         /// <summary>
-        /// 好友Id数据
+        /// 好友数据
         /// </summary>
-        public List<long> FrinedInfos = new List<long>();
+        public List<PoemGalleryData> FrinedInfos = new List<PoemGalleryData>();
 
         /// <summary>
-        /// 收藏Id数据
+        /// 收藏数据
         /// </summary>
-        public List<long> FavoriteInfos = new List<long>();
+        public List<PoemGalleryData> FavoriteInfos = new List<PoemGalleryData>();
 
         /// <summary>
-        /// 我的作品Id数据
+        /// 我的作品数据
         /// </summary>
-        public List<long> MySelfInfos = new List<long>();
+        public List<PoemGalleryData> MySelfInfos = new List<PoemGalleryData>();
 
 
-        private Dictionary<long, PoemGalleryData> _dicGalleryInfo = new Dictionary<long, PoemGalleryData>();
         public void Clear()
         {
-            _dicGalleryInfo.Clear();
             RecommendInfos.Clear();
             FrinedInfos.Clear();
             FavoriteInfos.Clear();
             MySelfInfos.Clear();
         }
-        public void AddGalleryData(PoemGalleryData data)
-        {
-            _dicGalleryInfo.Add(data.PictureId, data);
-        }
-        public void RemoveGalleryData(PoemGalleryData data)
-        {
-            if (_dicGalleryInfo.ContainsKey(data.PictureId))
-            {
-                _dicGalleryInfo.Remove(data.PictureId);
-            }
-        }
-        public void UpdateGalleryData(PoemGalleryData data)
-        {
-            if (_dicGalleryInfo.ContainsKey(data.PictureId))
-            {
-                _dicGalleryInfo.Remove(data.PictureId);
-            }
-        }
-        public PoemGalleryData GetGalleryDataById(long pictureId)
-        {
-            if (_dicGalleryInfo.ContainsKey(pictureId))
-            {
-                return _dicGalleryInfo[pictureId];
-            }
-            return null;
-        }
+
     }
 }

GameClient/Assets/Game/HotUpdate/Data/VO/PoemGalleryData.cs

@@ -6,61 +6,49 @@ namespace GFGGame
     public class PoemGalleryData
     {
         /// <summary>
-        /// 图片id
+        /// 作品id
         /// </summary>
-        public long PictureId;
-
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public long CreationTime;
-
+        public long WorkId;
         /// <summary>
-        /// 置顶状态
+        /// 作者id
         /// </summary>
-        public bool ToppingStatus;
-
+        public long AuthorId;
         /// <summary>
-        /// 锁定状态
+        /// 作者名字
         /// </summary>
-        public bool LockingStatus;
+        public string AuthorName;
         /// <summary>
-        /// 来源
+        /// 点赞投票次数
         /// </summary>
-        public int SourceType;
-
-
+        public long VoteCount;
         /// <summary>
-        /// 个人相册_照片临时下载路径,出于流量安全,每个下载文件的路径都是限时的,暂限5MIN
+        /// 被收藏次数
         /// </summary>
-        public string PictureTempUrl;
+        public long CollectCount;
         /// <summary>
-        /// 个人相册_照片数据
+        /// 是否点赞
         /// </summary>
-        public byte[] Bytes;
+        public bool VoteOrNot;
         /// <summary>
-        /// 个人相册_照片资源
+        /// 是否收藏
         /// </summary>
-        public NTexture Ntexture;//个人相册数据
-
-
+        public bool CollectOrNot;
         /// <summary>
-        /// 万水千山_游历地点id
+        /// 创建时间，单位：毫秒
         /// </summary>
-        public int TravelLocationId;
+        public long CreateTime;
         /// <summary>
-        /// Q版套装位置,0表示无人物的风景图
+        /// 主题期数
         /// </summary>
-        public int TravelSuitId;
+        public long ThemeOrder;
         /// <summary>
-        /// Q版套装人物资源下标
+        /// 主题配置id
         /// </summary>
-        public int SuitResIndex;
+        public long ThemeId;
         /// <summary>
-        /// Q版人物位置下标
+        /// 临时下载路径
         /// </summary>
-        public int PositionIndex;
-
+        public string PictureTempUrl;
 
     }
 }

GameClient/Assets/Game/HotUpdate/ServerProxy/PoemGallerySProxy.cs

@@ -0,0 +1,70 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using ET;
+using FairyGUI;
+using UnityEngine;
+using UnityEngine.Networking;
+
+namespace GFGGame
+{
+    public static class PoemGallerySProxy
+    {
+        //请求画廊主题
+        public static async ETTask<bool> ReqGalleryTheme()
+        {
+            S2C_GetGalleryTheme response = null;
+            response = (S2C_GetGalleryTheme)await MessageHelper.SendToServer(new C2S_GetGalleryTheme());
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    PoemGalleryDataManager.Instance.ThemeOrder = response.ThemeOrder;
+                    PoemGalleryDataManager.Instance.ThemeId = response.ThemeId;
+
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        //请求画廊列表,startIndex为0,则更新列表
+        public static async ETTask<bool> ReqGalleryList(int sortType, int startIndex, int Count)
+        {
+            S2C_GetGalleryRecommendList response = null;
+            response = (S2C_GetGalleryRecommendList)await MessageHelper.SendToServer(new C2S_GetGalleryRecommendList());
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    List<PoemGalleryData> list = new List<PoemGalleryData>();
+                    switch (response.SortType)
+                    {
+                        case (int)GallerySortType.Recommend:
+
+                            break;
+                        case (int)GallerySortType.Newest:
+
+                            break;
+                        case (int)GallerySortType.Friend:
+
+                            break;
+                        case (int)GallerySortType.MyCollect:
+
+                            break;
+                        case (int)GallerySortType.MyWorks:
+
+                            break;
+                    }
+
+
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+}
+

GameClient/Assets/Game/HotUpdate/ServerProxy/PoemGallerySProxy.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0f5f9e471d11e68408396deb79b5bdac
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/ServerProxy/PoemPhotoSProxy.cs

@@ -33,7 +33,7 @@ namespace GFGGame
                         ET.Log.Debug("PictureId0:" + photoData.PictureId);
                         Timers.inst.StartCoroutine(PictureStorageHelper.DownloadFile(photoData.PictureTempUrl, (Texture2D texture) =>
                         {
-                            ET.Log.Debug("PictureId1:" + photoData.PictureId);
+                            ET.Log.Debug("PictureId1:" + photoData);
 
                             photoData.Bytes = texture.EncodeToJPG();
                             photoData.Ntexture = new NTexture(texture);

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryView.cs

@@ -9,7 +9,7 @@ namespace GFGGame
     public class PoemGalleryView : BaseWindow
     {
         private UI_PoemGalleryUI _ui;
-        private List<long> _galleryIds = new List<long>();
+        private List<PoemGalleryData> _galleryDatas = new List<PoemGalleryData>();
         private int _infoType = 0;//0推荐1好友2收藏3我的
 
         public override void Dispose()
@@ -120,13 +120,13 @@ namespace GFGGame
                 if (_ui.m_comNormal.m_c1.selectedIndex == 0)
                 {
                     // _infoType = GalleryType.Recommend;
-                    _galleryIds = PoemGalleryDataManager.Instance.RecommendInfos;
+                    // _galleryIds = PoemGalleryDataManager.Instance.RecommendInfos;
                     _ui.m_comNormal.m_listRecommend.numItems = 5;
                 }
                 else if (_ui.m_comNormal.m_c1.selectedIndex == 1)
                 {
                     // _infoType = GalleryType.Friend;
-                    _galleryIds = PoemGalleryDataManager.Instance.FrinedInfos;
+                    // _galleryIds = PoemGalleryDataManager.Instance.FrinedInfos;
                 }
             }
         }
@@ -138,12 +138,12 @@ namespace GFGGame
             if (_ui.m_comFavorites.m_c1.selectedIndex == 0)
             {
                 // _infoType = GalleryType.Favorite;
-                _galleryIds = PoemGalleryDataManager.Instance.FavoriteInfos;
+                // _galleryIds = PoemGalleryDataManager.Instance.FavoriteInfos;
             }
             else if (_ui.m_comFavorites.m_c1.selectedIndex == 1)
             {
                 // _infoType = GalleryType.MySelf;
-                _galleryIds = PoemGalleryDataManager.Instance.MySelfInfos;
+                // _galleryIds = PoemGalleryDataManager.Instance.MySelfInfos;
             }
         }
 
@@ -184,7 +184,8 @@ namespace GFGGame
 
         private void RenderListItem(int index, GObject obj)
         {
-            PoemGalleryData data = PoemGalleryDataManager.Instance.GetGalleryDataById(_galleryIds[index]);
+            // PoemGalleryData data = PoemGalleryDataManager.Instance.GetGalleryDataById(_galleryIds[index]);
+            PoemGalleryData data = _galleryDatas[index];
             UI_ListItem item = UI_ListItem.Proxy(obj);