下载模块支持下载超过2GB的文件

Jiang Yin · Jiang Yin · commit 466d772b39d1 · 2021-01-23T15:40:23.000+08:00
diff --git a/GameFramework/Download/DownloadAgentHelperCompleteEventArgs.cs b/GameFramework/Download/DownloadAgentHelperCompleteEventArgs.cs
@@ -17,13 +17,13 @@ public sealed class DownloadAgentHelperCompleteEventArgs : GameFrameworkEventArg
         /// </summary>
         public DownloadAgentHelperCompleteEventArgs()
         {
-            Length = 0;
+            Length = 0L;
         }
 
         /// <summary>
         /// 获取下载的数据大小。
         /// </summary>
-        public int Length
+        public long Length
         {
             get;
             private set;
@@ -34,9 +34,9 @@ public int Length
         /// </summary>
         /// <param name="length">下载的数据大小。</param>
         /// <returns>创建的下载代理辅助器完成事件。</returns>
-        public static DownloadAgentHelperCompleteEventArgs Create(int length)
+        public static DownloadAgentHelperCompleteEventArgs Create(long length)
         {
-            if (length < 0)
+            if (length < 0L)
             {
                 throw new GameFrameworkException("Length is invalid.");
             }
@@ -51,7 +51,7 @@ public static DownloadAgentHelperCompleteEventArgs Create(int length)
         /// </summary>
         public override void Clear()
         {
-            Length = 0;
+            Length = 0L;
         }
     }
 }
diff --git a/GameFramework/Download/DownloadAgentHelperUpdateLengthEventArgs.cs b/GameFramework/Download/DownloadAgentHelperUpdateLengthEventArgs.cs
@@ -17,13 +17,13 @@ public sealed class DownloadAgentHelperUpdateLengthEventArgs : GameFrameworkEven
         /// </summary>
         public DownloadAgentHelperUpdateLengthEventArgs()
         {
-            DeltaLength = 0;
+            DeltaLength = 0L;
         }
 
         /// <summary>
         /// 获取下载的增量数据大小。
         /// </summary>
-        public int DeltaLength
+        public long DeltaLength
         {
             get;
             private set;
@@ -34,9 +34,9 @@ public int DeltaLength
         /// </summary>
         /// <param name="deltaLength">下载的增量数据大小。</param>
         /// <returns>创建的下载代理辅助器更新数据大小事件。</returns>
-        public static DownloadAgentHelperUpdateLengthEventArgs Create(int deltaLength)
+        public static DownloadAgentHelperUpdateLengthEventArgs Create(long deltaLength)
         {
-            if (deltaLength <= 0)
+            if (deltaLength <= 0L)
             {
                 throw new GameFrameworkException("Delta length is invalid.");
             }
@@ -51,7 +51,7 @@ public static DownloadAgentHelperUpdateLengthEventArgs Create(int deltaLength)
         /// </summary>
         public override void Clear()
         {
-            DeltaLength = 0;
+            DeltaLength = 0L;
         }
     }
 }
diff --git a/GameFramework/Download/DownloadManager.DownloadAgent.cs b/GameFramework/Download/DownloadManager.DownloadAgent.cs
@@ -22,14 +22,14 @@ private sealed class DownloadAgent : ITaskAgent<DownloadTask>, IDisposable
             private FileStream m_FileStream;
             private int m_WaitFlushSize;
             private float m_WaitTime;
-            private int m_StartLength;
-            private int m_DownloadedLength;
-            private int m_SavedLength;
+            private long m_StartLength;
+            private long m_DownloadedLength;
+            private long m_SavedLength;
             private bool m_Disposed;
 
             public GameFrameworkAction<DownloadAgent> DownloadAgentStart;
-            public GameFrameworkAction<DownloadAgent, int> DownloadAgentUpdate;
-            public GameFrameworkAction<DownloadAgent, int> DownloadAgentSuccess;
+            public GameFrameworkAction<DownloadAgent, long> DownloadAgentUpdate;
+            public GameFrameworkAction<DownloadAgent, long> DownloadAgentSuccess;
             public GameFrameworkAction<DownloadAgent, string> DownloadAgentFailure;
 
             /// <summary>
@@ -48,9 +48,9 @@ public DownloadAgent(IDownloadAgentHelper downloadAgentHelper)
                 m_FileStream = null;
                 m_WaitFlushSize = 0;
                 m_WaitTime = 0f;
-                m_StartLength = 0;
-                m_DownloadedLength = 0;
-                m_SavedLength = 0;
+                m_StartLength = 0L;
+                m_DownloadedLength = 0L;
+                m_SavedLength = 0L;
                 m_Disposed = false;
 
                 DownloadAgentStart = null;
@@ -84,7 +84,7 @@ public float WaitTime
             /// <summary>
             /// 获取开始下载时已经存在的大小。
             /// </summary>
-            public int StartLength
+            public long StartLength
             {
                 get
                 {
@@ -95,7 +95,7 @@ public int StartLength
             /// <summary>
             /// 获取本次已经下载的大小。
             /// </summary>
-            public int DownloadedLength
+            public long DownloadedLength
             {
                 get
                 {
@@ -106,7 +106,7 @@ public int DownloadedLength
             /// <summary>
             /// 获取当前的大小。
             /// </summary>
-            public int CurrentLength
+            public long CurrentLength
             {
                 get
                 {
@@ -117,7 +117,7 @@ public int CurrentLength
             /// <summary>
             /// 获取已经存盘的大小。
             /// </summary>
-            public int SavedLength
+            public long SavedLength
             {
                 get
                 {
@@ -190,9 +190,9 @@ public StartTaskStatus Start(DownloadTask task)
                     if (File.Exists(downloadFile))
                     {
                         m_FileStream = File.OpenWrite(downloadFile);
-                        m_FileStream.Seek(0, SeekOrigin.End);
-                        m_StartLength = m_SavedLength = (int)m_FileStream.Length;
-                        m_DownloadedLength = 0;
+                        m_FileStream.Seek(0L, SeekOrigin.End);
+                        m_StartLength = m_SavedLength = m_FileStream.Length;
+                        m_DownloadedLength = 0L;
                     }
                     else
                     {
@@ -203,15 +203,15 @@ public StartTaskStatus Start(DownloadTask task)
                         }
 
                         m_FileStream = new FileStream(downloadFile, FileMode.Create, FileAccess.Write);
-                        m_StartLength = m_SavedLength = m_DownloadedLength = 0;
+                        m_StartLength = m_SavedLength = m_DownloadedLength = 0L;
                     }
 
                     if (DownloadAgentStart != null)
                     {
                         DownloadAgentStart(this);
                     }
 
-                    if (m_StartLength > 0)
+                    if (m_StartLength > 0L)
                     {
                         m_Helper.Download(m_Task.DownloadUri, m_StartLength, m_Task.UserData);
                     }
@@ -247,9 +247,9 @@ public void Reset()
                 m_Task = null;
                 m_WaitFlushSize = 0;
                 m_WaitTime = 0f;
-                m_StartLength = 0;
-                m_DownloadedLength = 0;
-                m_SavedLength = 0;
+                m_StartLength = 0L;
+                m_DownloadedLength = 0L;
+                m_SavedLength = 0L;
             }
 
             /// <summary>
diff --git a/GameFramework/Download/DownloadManager.DownloadCounter.DownloadCounterNode.cs b/GameFramework/Download/DownloadManager.DownloadCounter.DownloadCounterNode.cs
@@ -13,20 +13,20 @@ private sealed partial class DownloadCounter
         {
             private sealed class DownloadCounterNode : IReference
             {
-                private int m_DownloadedLength;
+                private long m_DeltaLength;
                 private float m_ElapseSeconds;
 
                 public DownloadCounterNode()
                 {
-                    m_DownloadedLength = 0;
+                    m_DeltaLength = 0L;
                     m_ElapseSeconds = 0f;
                 }
 
-                public int DownloadedLength
+                public long DeltaLength
                 {
                     get
                     {
-                        return m_DownloadedLength;
+                        return m_DeltaLength;
                     }
                 }
 
@@ -38,26 +38,24 @@ public float ElapseSeconds
                     }
                 }
 
-                public static DownloadCounterNode Create(int downloadedLength)
+                public static DownloadCounterNode Create()
                 {
-                    DownloadCounterNode downloadCounterNode = ReferencePool.Acquire<DownloadCounterNode>();
-                    downloadCounterNode.m_DownloadedLength = downloadedLength;
-                    return downloadCounterNode;
+                    return ReferencePool.Acquire<DownloadCounterNode>();
                 }
 
                 public void Update(float elapseSeconds, float realElapseSeconds)
                 {
                     m_ElapseSeconds += realElapseSeconds;
                 }
 
-                public void AddDownloadedLength(int downloadedLength)
+                public void AddDeltaLength(long deltaLength)
                 {
-                    m_DownloadedLength += downloadedLength;
+                    m_DeltaLength += deltaLength;
                 }
 
                 public void Clear()
                 {
-                    m_DownloadedLength = 0;
+                    m_DeltaLength = 0L;
                     m_ElapseSeconds = 0f;
                 }
             }
diff --git a/GameFramework/Download/DownloadManager.DownloadCounter.cs b/GameFramework/Download/DownloadManager.DownloadCounter.cs
@@ -124,35 +124,38 @@ public void Update(float elapseSeconds, float realElapseSeconds)
 
                 if (m_TimeLeft <= 0f)
                 {
-                    int totalDownloadLength = 0;
+                    long totalDeltaLength = 0L;
                     foreach (DownloadCounterNode downloadCounterNode in m_DownloadCounterNodes)
                     {
-                        totalDownloadLength += downloadCounterNode.DownloadedLength;
+                        totalDeltaLength += downloadCounterNode.DeltaLength;
                     }
 
-                    m_CurrentSpeed = m_Accumulator > 0f ? totalDownloadLength / m_Accumulator : 0f;
+                    m_CurrentSpeed = m_Accumulator > 0f ? totalDeltaLength / m_Accumulator : 0f;
                     m_TimeLeft += m_UpdateInterval;
                 }
             }
 
-            public void RecordDownloadedLength(int downloadedLength)
+            public void RecordDeltaLength(long deltaLength)
             {
-                if (downloadedLength <= 0)
+                if (deltaLength <= 0L)
                 {
                     return;
                 }
 
+                DownloadCounterNode downloadCounterNode = null;
                 if (m_DownloadCounterNodes.Count > 0)
                 {
-                    DownloadCounterNode downloadCounterNode = m_DownloadCounterNodes.Last.Value;
+                    downloadCounterNode = m_DownloadCounterNodes.Last.Value;
                     if (downloadCounterNode.ElapseSeconds < m_UpdateInterval)
                     {
-                        downloadCounterNode.AddDownloadedLength(downloadedLength);
+                        downloadCounterNode.AddDeltaLength(deltaLength);
                         return;
                     }
                 }
 
-                m_DownloadCounterNodes.AddLast(DownloadCounterNode.Create(downloadedLength));
+                downloadCounterNode = DownloadCounterNode.Create();
+                downloadCounterNode.AddDeltaLength(deltaLength);
+                m_DownloadCounterNodes.AddLast(downloadCounterNode);
             }
 
             private void Reset()
diff --git a/GameFramework/Download/DownloadManager.cs b/GameFramework/Download/DownloadManager.cs
@@ -349,9 +349,9 @@ private void OnDownloadAgentStart(DownloadAgent sender)
             }
         }
 
-        private void OnDownloadAgentUpdate(DownloadAgent sender, int lastDownloadedLength)
+        private void OnDownloadAgentUpdate(DownloadAgent sender, long deltaLength)
         {
-            m_DownloadCounter.RecordDownloadedLength(lastDownloadedLength);
+            m_DownloadCounter.RecordDeltaLength(deltaLength);
             if (m_DownloadUpdateEventHandler != null)
             {
                 DownloadUpdateEventArgs downloadUpdateEventArgs = DownloadUpdateEventArgs.Create(sender.Task.SerialId, sender.Task.DownloadPath, sender.Task.DownloadUri, sender.CurrentLength, sender.Task.UserData);
@@ -360,7 +360,7 @@ private void OnDownloadAgentUpdate(DownloadAgent sender, int lastDownloadedLengt
             }
         }
 
-        private void OnDownloadAgentSuccess(DownloadAgent sender, int lastDownloadedLength)
+        private void OnDownloadAgentSuccess(DownloadAgent sender, long length)
         {
             if (m_DownloadSuccessEventHandler != null)
             {
diff --git a/GameFramework/Download/DownloadStartEventArgs.cs b/GameFramework/Download/DownloadStartEventArgs.cs
@@ -20,7 +20,7 @@ public DownloadStartEventArgs()
             SerialId = 0;
             DownloadPath = null;
             DownloadUri = null;
-            CurrentLength = 0;
+            CurrentLength = 0L;
             UserData = null;
         }
 
@@ -54,7 +54,7 @@ public string DownloadUri
         /// <summary>
         /// 获取当前大小。
         /// </summary>
-        public int CurrentLength
+        public long CurrentLength
         {
             get;
             private set;
@@ -78,7 +78,7 @@ public object UserData
         /// <param name="currentLength">当前大小。</param>
         /// <param name="userData">用户自定义数据。</param>
         /// <returns>创建的下载开始事件。</returns>
-        public static DownloadStartEventArgs Create(int serialId, string downloadPath, string downloadUri, int currentLength, object userData)
+        public static DownloadStartEventArgs Create(int serialId, string downloadPath, string downloadUri, long currentLength, object userData)
         {
             DownloadStartEventArgs downloadStartEventArgs = ReferencePool.Acquire<DownloadStartEventArgs>();
             downloadStartEventArgs.SerialId = serialId;
@@ -97,7 +97,7 @@ public override void Clear()
             SerialId = 0;
             DownloadPath = null;
             DownloadUri = null;
-            CurrentLength = 0;
+            CurrentLength = 0L;
             UserData = null;
         }
     }
diff --git a/GameFramework/Download/DownloadSuccessEventArgs.cs b/GameFramework/Download/DownloadSuccessEventArgs.cs
@@ -20,7 +20,7 @@ public DownloadSuccessEventArgs()
             SerialId = 0;
             DownloadPath = null;
             DownloadUri = null;
-            CurrentLength = 0;
+            CurrentLength = 0L;
             UserData = null;
         }
 
@@ -54,7 +54,7 @@ public string DownloadUri
         /// <summary>
         /// 获取当前大小。
         /// </summary>
-        public int CurrentLength
+        public long CurrentLength
         {
             get;
             private set;
@@ -78,7 +78,7 @@ public object UserData
         /// <param name="currentLength">当前大小。</param>
         /// <param name="userData">用户自定义数据。</param>
         /// <returns>创建的下载成功事件。</returns>
-        public static DownloadSuccessEventArgs Create(int serialId, string downloadPath, string downloadUri, int currentLength, object userData)
+        public static DownloadSuccessEventArgs Create(int serialId, string downloadPath, string downloadUri, long currentLength, object userData)
         {
             DownloadSuccessEventArgs downloadSuccessEventArgs = ReferencePool.Acquire<DownloadSuccessEventArgs>();
             downloadSuccessEventArgs.SerialId = serialId;
@@ -97,7 +97,7 @@ public override void Clear()
             SerialId = 0;
             DownloadPath = null;
             DownloadUri = null;
-            CurrentLength = 0;
+            CurrentLength = 0L;
             UserData = null;
         }
     }
diff --git a/GameFramework/Download/DownloadUpdateEventArgs.cs b/GameFramework/Download/DownloadUpdateEventArgs.cs
diff --git a/GameFramework/Download/IDownloadAgentHelper.cs b/GameFramework/Download/IDownloadAgentHelper.cs
diff --git a/GameFramework/Resource/ResourceManager.ResourceUpdater.cs b/GameFramework/Resource/ResourceManager.ResourceUpdater.cs

Original file line number	Diff line number	Diff line change
`@@ -17,13 +17,13 @@ public sealed class DownloadAgentHelperCompleteEventArgs : GameFrameworkEventArg`
`17`	`17`	`/// </summary>`
`18`	`18`	`public DownloadAgentHelperCompleteEventArgs()`
`19`	`19`	`{`
`20`		`- Length = 0;`
	`20`	`+ Length = 0L;`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`/// <summary>`
`24`	`24`	`/// 获取下载的数据大小。`
`25`	`25`	`/// </summary>`
`26`		`- public int Length`
	`26`	`+ public long Length`
`27`	`27`	`{`
`28`	`28`	`get;`
`29`	`29`	`private set;`
`@@ -34,9 +34,9 @@ public int Length`
`34`	`34`	`/// </summary>`
`35`	`35`	`/// <param name="length">下载的数据大小。</param>`
`36`	`36`	`/// <returns>创建的下载代理辅助器完成事件。</returns>`
`37`		`- public static DownloadAgentHelperCompleteEventArgs Create(int length)`
	`37`	`+ public static DownloadAgentHelperCompleteEventArgs Create(long length)`
`38`	`38`	`{`
`39`		`- if (length < 0)`
	`39`	`+ if (length < 0L)`
`40`	`40`	`{`
`41`	`41`	`throw new GameFrameworkException("Length is invalid.");`
`42`	`42`	`}`
`@@ -51,7 +51,7 @@ public static DownloadAgentHelperCompleteEventArgs Create(int length)`
`51`	`51`	`/// </summary>`
`52`	`52`	`public override void Clear()`
`53`	`53`	`{`
`54`		`- Length = 0;`
	`54`	`+ Length = 0L;`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,20 +13,20 @@ private sealed partial class DownloadCounter`
`13`	`13`	`{`
`14`	`14`	`private sealed class DownloadCounterNode : IReference`
`15`	`15`	`{`
`16`		`- private int m_DownloadedLength;`
	`16`	`+ private long m_DeltaLength;`
`17`	`17`	`private float m_ElapseSeconds;`
`18`	`18`
`19`	`19`	`public DownloadCounterNode()`
`20`	`20`	`{`
`21`		`- m_DownloadedLength = 0;`
	`21`	`+ m_DeltaLength = 0L;`
`22`	`22`	`m_ElapseSeconds = 0f;`
`23`	`23`	`}`
`24`	`24`
`25`		`- public int DownloadedLength`
	`25`	`+ public long DeltaLength`
`26`	`26`	`{`
`27`	`27`	`get`
`28`	`28`	`{`
`29`		`- return m_DownloadedLength;`
	`29`	`+ return m_DeltaLength;`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`@@ -38,26 +38,24 @@ public float ElapseSeconds`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
`41`		`- public static DownloadCounterNode Create(int downloadedLength)`
	`41`	`+ public static DownloadCounterNode Create()`
`42`	`42`	`{`
`43`		`- DownloadCounterNode downloadCounterNode = ReferencePool.Acquire<DownloadCounterNode>();`
`44`		`- downloadCounterNode.m_DownloadedLength = downloadedLength;`
`45`		`- return downloadCounterNode;`
	`43`	`+ return ReferencePool.Acquire<DownloadCounterNode>();`
`46`	`44`	`}`
`47`	`45`
`48`	`46`	`public void Update(float elapseSeconds, float realElapseSeconds)`
`49`	`47`	`{`
`50`	`48`	`m_ElapseSeconds += realElapseSeconds;`
`51`	`49`	`}`
`52`	`50`
`53`		`- public void AddDownloadedLength(int downloadedLength)`
	`51`	`+ public void AddDeltaLength(long deltaLength)`
`54`	`52`	`{`
`55`		`- m_DownloadedLength += downloadedLength;`
	`53`	`+ m_DeltaLength += deltaLength;`
`56`	`54`	`}`
`57`	`55`
`58`	`56`	`public void Clear()`
`59`	`57`	`{`
`60`		`- m_DownloadedLength = 0;`
	`58`	`+ m_DeltaLength = 0L;`
`61`	`59`	`m_ElapseSeconds = 0f;`
`62`	`60`	`}`
`63`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,35 +124,38 @@ public void Update(float elapseSeconds, float realElapseSeconds)`
`124`	`124`
`125`	`125`	`if (m_TimeLeft <= 0f)`
`126`	`126`	`{`
`127`		`- int totalDownloadLength = 0;`
	`127`	`+ long totalDeltaLength = 0L;`
`128`	`128`	`foreach (DownloadCounterNode downloadCounterNode in m_DownloadCounterNodes)`
`129`	`129`	`{`
`130`		`- totalDownloadLength += downloadCounterNode.DownloadedLength;`
	`130`	`+ totalDeltaLength += downloadCounterNode.DeltaLength;`
`131`	`131`	`}`
`132`	`132`
`133`		`- m_CurrentSpeed = m_Accumulator > 0f ? totalDownloadLength / m_Accumulator : 0f;`
	`133`	`+ m_CurrentSpeed = m_Accumulator > 0f ? totalDeltaLength / m_Accumulator : 0f;`
`134`	`134`	`m_TimeLeft += m_UpdateInterval;`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`
`138`		`- public void RecordDownloadedLength(int downloadedLength)`
	`138`	`+ public void RecordDeltaLength(long deltaLength)`
`139`	`139`	`{`
`140`		`- if (downloadedLength <= 0)`
	`140`	`+ if (deltaLength <= 0L)`
`141`	`141`	`{`
`142`	`142`	`return;`
`143`	`143`	`}`
`144`	`144`
	`145`	`+ DownloadCounterNode downloadCounterNode = null;`
`145`	`146`	`if (m_DownloadCounterNodes.Count > 0)`
`146`	`147`	`{`
`147`		`- DownloadCounterNode downloadCounterNode = m_DownloadCounterNodes.Last.Value;`
	`148`	`+ downloadCounterNode = m_DownloadCounterNodes.Last.Value;`
`148`	`149`	`if (downloadCounterNode.ElapseSeconds < m_UpdateInterval)`
`149`	`150`	`{`
`150`		`- downloadCounterNode.AddDownloadedLength(downloadedLength);`
	`151`	`+ downloadCounterNode.AddDeltaLength(deltaLength);`
`151`	`152`	`return;`
`152`	`153`	`}`
`153`	`154`	`}`
`154`	`155`
`155`		`- m_DownloadCounterNodes.AddLast(DownloadCounterNode.Create(downloadedLength));`
	`156`	`+ downloadCounterNode = DownloadCounterNode.Create();`
	`157`	`+ downloadCounterNode.AddDeltaLength(deltaLength);`
	`158`	`+ m_DownloadCounterNodes.AddLast(downloadCounterNode);`
`156`	`159`	`}`
`157`	`160`
`158`	`161`	`private void Reset()`
Original file line number	Diff line number	Diff line change
`@@ -349,9 +349,9 @@ private void OnDownloadAgentStart(DownloadAgent sender)`
`349`	`349`	`}`
`350`	`350`	`}`
`351`	`351`
`352`		`- private void OnDownloadAgentUpdate(DownloadAgent sender, int lastDownloadedLength)`
	`352`	`+ private void OnDownloadAgentUpdate(DownloadAgent sender, long deltaLength)`
`353`	`353`	`{`
`354`		`- m_DownloadCounter.RecordDownloadedLength(lastDownloadedLength);`
	`354`	`+ m_DownloadCounter.RecordDeltaLength(deltaLength);`
`355`	`355`	`if (m_DownloadUpdateEventHandler != null)`
`356`	`356`	`{`
`357`	`357`	`DownloadUpdateEventArgs downloadUpdateEventArgs = DownloadUpdateEventArgs.Create(sender.Task.SerialId, sender.Task.DownloadPath, sender.Task.DownloadUri, sender.CurrentLength, sender.Task.UserData);`
`@@ -360,7 +360,7 @@ private void OnDownloadAgentUpdate(DownloadAgent sender, int lastDownloadedLengt`
`360`	`360`	`}`
`361`	`361`	`}`
`362`	`362`
`363`		`- private void OnDownloadAgentSuccess(DownloadAgent sender, int lastDownloadedLength)`
	`363`	`+ private void OnDownloadAgentSuccess(DownloadAgent sender, long length)`
`364`	`364`	`{`
`365`	`365`	`if (m_DownloadSuccessEventHandler != null)`
`366`	`366`	`{`