!82 1.codecheck检查修改 2.README新增HSP场景适配说明

Merge pull request !82 from zhoulisheng2/master

README.md

@@ -425,6 +425,14 @@ export default class EntryAbility extends UIAbility {
 
 DevEco Studio 4.0（4.0.3.700）--SDK:API10（ 4.0.10.15）
 
+HSP场景适配:
+
+在使用ImageKnifeComponent进行加载图片时, 提供的ImageKnifeOption配置类新增了可选参数context, 在HSP场景下需要传入正确的context, 才能保证三方库后续正确获取Resource资源。
+
+在使用RquestOption进行加载图片时, 提供的RquestOption配置类新增了接口`setModuleContext(moduleCtx:common.UIAbilityContext)`, 在HSP场景下需要传入正确的context, 才能保证三方库后续正确获取Resource资源。
+
+非HSP场景不影响原功能, ImageKnifeOption配置类新增的可选参数context可以不传, RquestOption配置类新增的接口可以不调用。
+
 ## 目录结构
 
 ```

entry/src/main/ets/entryability/EntryAbility.ets

@@ -28,10 +28,10 @@ export default class EntryAbility extends UIAbility {
     let atManager = abilityAccessCtrl.createAtManager();
     atManager.requestPermissionsFromUser(this.context, list, (err: BusinessError, result: Object) => {
       if (err) {
-        console.log("dodo requestPermissionsFromUserError:" + JSON.stringify(err));
+
       } else {
         permissionRequestResult = result;
-        console.log("dodo permissionRequestResult:" + JSON.stringify(permissionRequestResult))
+
       }
     })
 

entry/src/ohosTest/ets/test/logutil.test.ets

@@ -39,7 +39,7 @@ export default function LogUtilTest() {
     })
     it('TestLogUtilLevel',0,  ()=> {
 
-      console.log("tag:LogUtil LogUtil.mLogLevel="+LogUtil.mLogLevel);
+
       LogUtil.mLogLevel = LogUtil.OFF;
       expect(LogUtil.mLogLevel).assertEqual(LogUtil.OFF);
 

entry/src/ohosTest/ets/test/lrucache.test.ets

@@ -88,7 +88,7 @@ export default function lruCacheTest() {
           expect(key).assertEqual("2")
           expect(value).assertEqual("2")
         }
-        console.log('dodo count='+count+' key='+key+' value='+value)
+
         count++;
       }
       memoryCache.foreachLruCache( (value:string, key:string, map:Map<string,string>)=> {
@@ -117,7 +117,7 @@ export default function lruCacheTest() {
           expect(key).assertEqual("1")
           expect(value).assertEqual("1")
         }
-        console.log('dodo count='+count+' key='+key+' value='+value)
+
         count++;
       }
       memoryCache.foreachLruCache( (value:string, key:string, map:Map<string,string>)=> {

library/src/main/ets/components/imageknife/ImageKnife.ets

@@ -360,9 +360,9 @@ export class ImageKnife {
 
   // 执行相同key的pending队列请求
   private keyEqualPendingToRun(nextPending: RequestOption) {
-    // let nextPending = this.pendingRequest.splice(index, 1)[0];
+
-    // this.runningRequest.push(nextPending)
+
-    // RequestManager.execute((nextPending as RequestOption), this.memoryCache, this.diskMemoryCache, this.dataFetch, this.resourceFetch)
+
 
     this.pendingMaps.remove(nextPending.uuid)
     this.runningMaps.put(nextPending.uuid, nextPending);
@@ -445,11 +445,11 @@ export class ImageKnife {
         if (hasRunningRequest) {
           this.pendingMaps.put(request.uuid, request);
 
-          // this.pendingRequest.push(request);
+
         } else {
           this.runningMaps.put(request.uuid, request)
 
-          // this.runningRequest.push(request);
+
           // 不存在相同key的 任务可以并行
           RequestManager.execute(request, this.memoryCache, this.diskMemoryCache, this.dataFetch, this.resourceFetch)
         }

library/src/main/ets/components/imageknife/RequestOption.ets

@@ -529,11 +529,11 @@ export class RequestOption {
       }
     }
 
-    // // 加载成功之后
+
-    // let imageKnife:ImageKnife | undefined = ImageKnifeGlobal.getInstance().getImageKnife();
+
-    // if(imageKnife != undefined) {
+
-    //   imageKnife.removeRunning(this);
+
-    // }
+
   }
 
   // 图片文件落盘之后会自动去寻找下一个数据加载

library/src/main/ets/components/imageknife/interface/IParseImage.ets

@@ -15,5 +15,6 @@
 import { BusinessError } from '@ohos.base'
 export interface IParseImage<T> {
   parseImage:(imageinfo:ArrayBuffer, onCompleteFunction:(value:T)=>void | PromiseLike<T>, onErrorFunction:(reason?:BusinessError|string)=>void)=>void;
-  parseImageThumbnail:(scale:number, imageinfo:ArrayBuffer, onCompleteFunction:(value:T)=>void | PromiseLike<T>, onErrorFunction:(reason?:BusinessError|string)=>void)=>void;
+  parseImageThumbnail:(scale:number, imageinfo:ArrayBuffer, onCompleteFunction:(value:T)=>void | PromiseLike<T>,
+                       onErrorFunction:(reason?:BusinessError|string)=>void)=>void;
 }

library/src/main/ets/components/imageknife/networkmanage/DownloadClient.ets

@@ -44,7 +44,6 @@ export class DownloadClient implements IDataFetch {
         this.dataShareFileClient.loadData(request, onCompleteFunction, onErrorFunction)
       } else {
         // 网络下载
-        // this.networkDownloadClient.loadData(request, onCompleteFunction, onErrorFunction)
         this.httpDownloadClient.loadData(request, onCompleteFunction, onErrorFunction)
       }
     }

library/src/main/ets/components/imageknife/resourcemanage/IResourceFetch.ets

@@ -18,5 +18,6 @@ import common from '@ohos.app.ability.common';
 
 // 本地资源解析抽象接口
 export interface IResourceFetch<T> {
-  loadResource:(context:common.UIAbilityContext ,res: Resource, onCompleteFunction:(value:T)=>void | PromiseLike<T>, onErrorFunction:(reason?:BusinessError|string)=>void)=>void;
+  loadResource:(context:common.UIAbilityContext ,res: Resource, onCompleteFunction:(value:T)=>void | PromiseLike<T>,
+                onErrorFunction:(reason?:BusinessError|string)=>void)=>void;
 }

library/src/main/ets/components/imageknife/utils/FileTypeUtil.ets

@@ -14,13 +14,6 @@
  */
 import { LogUtil } from '../../imageknife/utils/LogUtil'
 
-// jpg = 'jpg,0,FFD8',
-// png = 'png,0,89504E470D0A1A0A',
-// bmp = 'bmp,0,424D',
-// gif = 'gif,0,474946383961',
-// svg = 'svg,0,3C3F786D6C',
-// webp = 'webp,0,52494646',
-// tiff = 'tiff,0,492049|49492A00|4D4D002A|4D4D002B'
 
 export class FileTypeUtil {
   private fileSignatureMap: Record<string, Array<Uint8Array>> = {