diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/download/DownloadManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/download/DownloadManager.kt index 052b8d62d4..2520ff1378 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/download/DownloadManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/download/DownloadManager.kt @@ -110,7 +110,9 @@ object DownloadManager { } // 改名后文件存在 不需要下载 if(isLocalCacheFileExists(first.downloadUrl)){ - waitDownLoadList.removeFirst() + if(waitDownLoadList.size>0) { + waitDownLoadList.removeFirst() + } OchChainLogManager.writechainLogDownload("取消下载文件已存在","信息:${first}") go2Download() return @@ -134,7 +136,9 @@ object DownloadManager { override fun onFinished(url: String, path: String) { OchChainLogManager.writechainLogDownload("下载成功","url:${url}---path:${path}") - waitDownLoadList.removeFirst() + if(waitDownLoadList.size>0) { + waitDownLoadList.removeFirst() + } if(path.endsWith("_temp")){ val tempFile = File(path) val newName = tempFile.name.replace("_temp","") @@ -150,7 +154,9 @@ object DownloadManager { clearLocalFile(first.downloadDir+File.separator+first.downloadFileName) if(first.downLoadCount>=5){ OchChainLogManager.writechainLogDownload("下载错误5次可终点关注","url:${url}---error:${error}") - waitDownLoadList.removeFirst() + if(waitDownLoadList.size>0) { + waitDownLoadList.removeFirst() + } go2Download() return } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaLoopPlayView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaLoopPlayView.kt index bfa66383a2..0c1e4fce23 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaLoopPlayView.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaLoopPlayView.kt @@ -245,7 +245,9 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter itemView.initVideoUrlData(currentMediaItem.fileUrl,currentMediaItem.coverImageUrl,currentMediaItem.priority) itemView.setThumbImageViewVisible() itemView.startPlayVideo(hightPriorityVideoPlayLifecycleCallBack) - hightPriorityMediaItem.removeFirst() + if(hightPriorityMediaItem.size>0) { + hightPriorityMediaItem.removeFirst() + } } // 当前正在播放图片 is AdvanceImageView -> {