caishi
/
ImageKnife
forked from floraachy/ImageKnife
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

1.更改存入running和pend running的策略,修复同一张图片因为展示尺寸不同重复下载问题 

Signed-off-by: zhoulisheng1 <zhoulisheng1@huawei.com>
This commit is contained in:
zhoulisheng1 2023-05-06 10:10:54 +08:00
parent a5da43a82b
commit bb547da285
1 changed files with 65 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
imageknife/src/main/ets/components/imageknife/ImageKnife.ets
View File

@ -107,7 +107,7 @@ export class ImageKnife {
}; };
setDiskMemoryCache(diskLruCache: DiskLruCache) { setDiskMemoryCache(diskLruCache: DiskLruCache) {
this.diskMemoryCache = diskLruCache; this.diskMemoryCache = diskLruCache;
}; };
getFileTypeUtil(): FileTypeUtil{ getFileTypeUtil(): FileTypeUtil{
@ -130,7 +130,7 @@ export class ImageKnife {
this.gifWorker = worker this.gifWorker = worker
} }
getGifWorker(){ getGifWorker(){
return this.gifWorker; return this.gifWorker;
} }
getDefaultLifeCycle(){ getDefaultLifeCycle(){
@ -162,7 +162,7 @@ export class ImageKnife {
}else{ }else{
let newLruCache = new LruCache<string, any>(size); let newLruCache = new LruCache<string, any>(size);
this.memoryCache.foreachLruCache(function (value, key, map) { this.memoryCache.foreachLruCache(function (value, key, map) {
newLruCache.put(key, value); newLruCache.put(key, value);
}) })
this.memoryCache = newLruCache; this.memoryCache = newLruCache;
} }
@ -277,7 +277,7 @@ export class ImageKnife {
for (let i = 0; i < this.runningRequest.length; i++) { for (let i = 0; i < this.runningRequest.length; i++) {
let tempRunning = this.runningRequest[i]; let tempRunning = this.runningRequest[i];
if (this.keyEqual(request, tempRunning)) { if (this.keyEqual(request, tempRunning)) {
// 如果key相同 说明目前有任务正在执行，我们记录下当前request 放入pendingRunning // 如果key相同 说明找到执行的request，我们记录下当前request的index位置
index = i; index = i;
break; break;
} }
@ -290,35 +290,36 @@ export class ImageKnife {
// 执行相同key的pending队列请求 // 执行相同key的pending队列请求
keyEqualPendingToRun(index:number){ keyEqualPendingToRun(index:number){
let nextPending = this.pendingRequest.splice(index, 1)[0]; let nextPending = this.pendingRequest.splice(index, 1)[0];
this.runningRequest.push(nextPending) this.runningRequest.push(nextPending)
RequestManager.execute((nextPending as RequestOption), this.memoryCache, this.diskMemoryCache, this.dataFetch, this.resourceFetch) RequestManager.execute((nextPending as RequestOption), this.memoryCache, this.diskMemoryCache, this.dataFetch, this.resourceFetch)
} }
searchNextKeyToRun(){ searchNextKeyToRun(){
// 其次则寻找pending中第一个和running不重复的key // 其次则寻找pending中第一个和running不重复的requestOrKey
let index2 = -1; let index2 = -1;
for (let i = 0; i < this.pendingRequest.length; i++) { for (let i = 0; i < this.pendingRequest.length; i++) {
let temppending = this.pendingRequest[i]; let temppending = this.pendingRequest[i];
let hasKeyEqual = false; let hasKeyEqual = false;
for (let j = 0; j < this.runningRequest.length; j++) { for (let j = 0; j < this.runningRequest.length; j++) {
let temprunning = this.runningRequest[j]; let temprunning = this.runningRequest[j];
if (this.keyEqual(temppending, temprunning)) { if (this.requestOrKeyEqual(temppending, temprunning)) {
hasKeyEqual = true; hasKeyEqual = true;
break; break;
}
}
if (!hasKeyEqual) {
index2 = i;
} }
} }
if (index2 >= 0) { if (!hasKeyEqual) {
let nextPending = this.pendingRequest.splice(index2, 1)[0]; index2 = i;
this.runningRequest.push(nextPending) break;
RequestManager.execute((nextPending as RequestOption), this.memoryCache, this.diskMemoryCache, this.dataFetch, this.resourceFetch)
} else {
// 不执行
} }
}
if (index2 >= 0) {
let nextPending = this.pendingRequest.splice(index2, 1)[0];
this.runningRequest.push(nextPending)
RequestManager.execute((nextPending as RequestOption), this.memoryCache, this.diskMemoryCache, this.dataFetch, this.resourceFetch)
} else {
// 不执行
}
} }
@ -328,16 +329,16 @@ export class ImageKnife {
let index = -1; let index = -1;
for (let i = 0; i < this.pendingRequest.length; i++) { for (let i = 0; i < this.pendingRequest.length; i++) {
let temppending = this.pendingRequest[i]; let temppending = this.pendingRequest[i];
if (this.keyEqual(request, temppending)) { if (this.requestOrKeyEqual(request, temppending)) {
// 如果key相同 说明目前有任务正在执行，我们记录下当前request 放入pendingRunning // 如果key相同 说明目前有任务正在执行，我们记录下当前request 放入pendingRunning
index = i; index = i;
break; break;
} }
} }
if (index >= 0) { if (index >= 0) {
this.keyEqualPendingToRun(index); this.keyEqualPendingToRun(index);
} else { } else {
this.searchNextKeyToRun(); this.searchNextKeyToRun();
} }
} }
@ -347,9 +348,9 @@ export class ImageKnife {
let hasRunningRequest = false; let hasRunningRequest = false;
for (let i = 0; i < this.runningRequest.length; i++) { for (let i = 0; i < this.runningRequest.length; i++) {
let tempRunning = this.runningRequest[i]; let tempRunning = this.runningRequest[i];
if (this.keyEqual(request, tempRunning)) { if (this.requestOrKeyEqual(request, tempRunning)) {
// 如果key相同 说明目前有任务正在执行，我们记录下当前request 放入pendingRunning // 如果requestOrKey相同 说明目前有任务正在执行，我们记录下当前request 放入pendingRunning
hasRunningRequest = true; hasRunningRequest = true;
break; break;
} }
@ -371,9 +372,9 @@ export class ImageKnife {
private keyNotEmpty(request: RequestOption): boolean{ private keyNotEmpty(request: RequestOption): boolean{
if ( if (
request.generateCacheKey != null && request.generateCacheKey.length > 0 && request.generateCacheKey != null && request.generateCacheKey.length > 0 &&
request.generateDataKey != null && request.generateDataKey.length > 0 && request.generateDataKey != null && request.generateDataKey.length > 0 &&
request.generateResourceKey != null && request.generateResourceKey.length > 0 request.generateResourceKey != null && request.generateResourceKey.length > 0
) { ) {
return true; return true;
} }
@ -381,13 +382,36 @@ export class ImageKnife {
} }
private keyEqual(request1: RequestOption, request2: RequestOption): boolean{ private keyEqual(request1: RequestOption, request2: RequestOption): boolean{
// key 完全相等的情况
if ( if (
request1.generateCacheKey == request2.generateCacheKey && request1.generateCacheKey == request2.generateCacheKey &&
request1.generateResourceKey == request2.generateResourceKey && request1.generateResourceKey == request2.generateResourceKey &&
request1.generateDataKey == request2.generateDataKey request1.generateDataKey == request2.generateDataKey
) { ) {
return true; return true;
} }
return false;
}
// 非严格校验模式,如果所有key相等我们认为一定相等, 如果请求类型是string 网络请求url或者uri相等 我们也认为该请求应该只发送一个即可,后续请求会去缓存或者磁盘读取
private requestOrKeyEqual(request1: RequestOption, request2: RequestOption): boolean{
// key 完全相等的情况
if (
request1.generateCacheKey == request2.generateCacheKey &&
request1.generateResourceKey == request2.generateResourceKey &&
request1.generateDataKey == request2.generateDataKey
) {
return true;
}
// 如果加载的是网络url或者是本地文件uri读取,那么loadSrc相同就认为是同一个请求
if(
typeof request1.loadSrc == 'string' && typeof request2.loadSrc == 'string' && request1.loadSrc == request2.loadSrc
) {
return true;
}
return false; return false;
} }
@ -397,9 +421,9 @@ export class ImageKnife {
request.loadComplete(imageKnifeData); request.loadComplete(imageKnifeData);
} else } else
if (typeof request.loadSrc == 'string') { if (typeof request.loadSrc == 'string') {
// 进入三级缓存模型 // 进入三级缓存模型
return this.loadResources(request); return this.loadResources(request);
} else { } else {
let res = request.loadSrc as Resource; let res = request.loadSrc as Resource;
if (typeof res.id != 'undefined' && typeof res.type != 'undefined') { if (typeof res.id != 'undefined' && typeof res.type != 'undefined') {
//进入三级缓存模型 本地资源不参与磁盘缓存 //进入三级缓存模型 本地资源不参与磁盘缓存