1.codecheck整改

Signed-off-by: zhoulisheng <635547767@qq.com>

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))
+
       }
     })
 
@@ -47,10 +47,10 @@ export default class EntryAbility extends UIAbility {
         .setDefaultLifeCycle(ImageKnifeDrawFactory.createProgressLifeCycle("#10a5ff", 0.5))
       // 全局配置缓存key
       imageKnife.setEngineKeyImpl(new CustomEngineKeyImpl())
-      //设置全局内存缓存大小张数
+      // 设置全局内存缓存大小张数
       imageKnife.setLruCacheSize(100, 100 * 1204 * 1024)
     }
-    //开启ImageKnife所有级别日志开关
+    // 开启ImageKnife所有级别日志开关
     LogUtil.mLogLevel = LogUtil.ALL
   }
 }

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>)=> {

imageknife/src/main/ets/components/cache/FileUtils.ets

@@ -270,7 +270,7 @@ export class FileUtils {
    * @param 文件夹绝对路径
    */
   createFolder(path: string) {
-    //创建文件夹
+    // 创建文件夹
     if (!this.existFolder(path)) {
       fs.mkdirSync(path)
     }
@@ -297,11 +297,11 @@ export class FileUtils {
    * @param content 文件内容数据
    */
   createFileProcess(folder: string, file: string, content: ArrayBuffer | string) {
-    //创建文件夹
+    // 创建文件夹
     this.createFolder(folder);
-    //创建文件
+    // 创建文件
     this.createFile(file);
-    //写入数据
+    // 写入数据
     this.writeFile(file, content)
   }
 

imageknife/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)
         }
@@ -516,7 +516,7 @@ export class ImageKnife {
       } else {
       let res = request.loadSrc as Resource;
       if (typeof res.id != 'undefined' && typeof res.type != 'undefined') {
-        //进入三级缓存模型  本地资源不参与磁盘缓存
+        // 进入三级缓存模型  本地资源不参与磁盘缓存
         let none = new NONE();
         request.diskCacheStrategy(none);
         this.loadResources(request);

imageknife/src/main/ets/components/imageknife/ImageKnifeData.ets

@@ -26,8 +26,8 @@ export enum ImageKnifeType {
 
 export class DrawPixelMap {
   imagePixelMap: PixelMap | undefined = undefined
-  isShowOnComponent: boolean = false; //gif是否显示在组件上 true：显示在组件上 false：不显示在组件上
+  isShowOnComponent: boolean = false; // gif是否显示在组件上 true：显示在组件上 false：不显示在组件上
-  isLruCacheRelease: boolean = false; //当前lru是否释放gif资源，true的就释放了gif资源 false就是没有释放
+  isLruCacheRelease: boolean = false; // 当前lru是否释放gif资源，true的就释放了gif资源 false就是没有释放
 
   detachFromLayoutPixelMap: DetachFromLayout = {
     detach: () => {

imageknife/src/main/ets/components/imageknife/ImageKnifeDrawFactory.ets

@@ -439,12 +439,12 @@ export class ImageKnifeDrawFactory{
   private static drawDefaultProgress(context: CanvasRenderingContext2D, progress: number, imageKnifeOption: ImageKnifeOption,
                                      compWidth: number, compHeight: number,
                                      fontColor:string, fontSizeRate:number,setGifTimeId?: (timeId: number) => void,){
-    let pi = Math.PI * 2 / 100; //pi 讲圆的周长划分为100份
+    let pi = Math.PI * 2 / 100; // pi 讲圆的周长划分为100份
     let rate = progress - 25;
     let diameter = compWidth > compHeight ? compHeight : compWidth
     context.lineWidth = Math.floor(diameter * 0.03)
     context.lineCap = "round"
-    context.fillStyle = fontColor//"#10a5ff"
+    context.fillStyle = fontColor// "#10a5ff"
     context.font = Math.floor(diameter * fontSizeRate *px2vp(1))+'px'
     let x0 = (compWidth - diameter) / 2.0 + Math.floor(diameter * 0.5)
     let y0 = (compHeight - diameter) / 2.0 + Math.floor(diameter * 0.1)

imageknife/src/main/ets/components/imageknife/ImageKnifeOption.ets

@@ -95,7 +95,7 @@ export class ImageKnifeOption {
   displayProgress?: boolean;
 
 
-  //自定义缓存关键字
+  // 自定义缓存关键字
   signature?: ObjectKey;
 
   // 重试图层 可点击

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

@@ -90,7 +90,7 @@ export class RequestOption {
   onlyRetrieveFromCache: boolean = false;
   isCacheable: boolean = true;
 
-  //开启GPU变换绘制
+  // 开启GPU变换绘制
   gpuEnabled: boolean = false;
   // 变换相关
   transformations: Array<BaseTransform<PixelMap>> = new Array();
@@ -100,7 +100,7 @@ export class RequestOption {
   filesPath: string = ""; // data/data/包名/files目录
   cachesPath: string = ""; // 网络下载默认存储在data/data/包名/cache/ImageKnifeNetworkFolder/目标md5.img下面
 
-  //自定义缓存关键字
+  // 自定义缓存关键字
   signature?: ObjectKey;
 
   // 下载原始文件地址
@@ -438,7 +438,7 @@ export class RequestOption {
     this.transformations = inputs;
     return this;
   }
-  //开启GPU变换绘制
+  // 开启GPU变换绘制
   enableGPU() {
     this.gpuEnabled = true;
     return this;
@@ -465,7 +465,7 @@ export class RequestOption {
   // 缩略图解析成功
   thumbholderOnComplete = (imageKnifeData: ImageKnifeData)=> {
     if (!this.loadMainReady && !(this.loadErrorReady || this.loadRetryReady)) {
-      //主图未加载成功,并且未加载失败  显示占位图  主图加载成功或者加载失败后=>不展示占位图
+      // 主图未加载成功,并且未加载失败  显示占位图  主图加载成功或者加载失败后=>不展示占位图
       if(this.thumbHolderFunc != undefined) {
         this.thumbHolderFunc?.asyncSuccess(imageKnifeData)
       }
@@ -488,7 +488,7 @@ export class RequestOption {
     }
   }
 
-  //加载失败 占位图解析失败
+  // 加载失败 占位图解析失败
   errorholderOnError = (error:BusinessError|string)=> {
     LogUtil.log("失败占位图解析失败 error =" + error)
   }
@@ -529,11 +529,11 @@ export class RequestOption {
       }
     }
 
-    // // 加载成功之后
+
-    // let imageKnife:ImageKnife | undefined = ImageKnifeGlobal.getInstance().getImageKnife();
+
-    // if(imageKnife != undefined) {
+
-    //   imageKnife.removeRunning(this);
+
-    // }
+
   }
 
   // 图片文件落盘之后会自动去寻找下一个数据加载
@@ -545,7 +545,7 @@ export class RequestOption {
 
   loadError = (err:BusinessError|string)=>{
     LogUtil.log("loadError:" + err);
-    //失败占位图展示规则
+    // 失败占位图展示规则
     if (this.retryholderFunc) {
       // 重试图层优先于加载失败展示
       this.loadRetryReady = true;

imageknife/src/main/ets/components/imageknife/compress/CompressBuilder.ets

@@ -27,7 +27,7 @@ import common from '@ohos.app.ability.common';
 
 export class CompressBuilder {
   private _mTargetDir: string = '';
-  private _mLeastCompressSize: number= 100; //KB
+  private _mLeastCompressSize: number= 100; // KB
   private _mRenameListener: OnRenameListener = {reName:()=>{return ''}};
   private _mCompressListener: OnCompressListener={
     start:()=> {},

imageknife/src/main/ets/components/imageknife/compress/Engine.ets

@@ -29,7 +29,7 @@ export class Engine {
   private mPredicate: CompressionPredicate
   private mCompressAdapter: CompressAdapter
   private mPath: string
-  private _mLeastCompressSize: number; //KB
+  private _mLeastCompressSize: number; // KB
 
   constructor(compressAdapter: CompressAdapter,
               outPath: string,

imageknife/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;
 }

imageknife/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)
       }
     }

imageknife/src/main/ets/components/imageknife/networkmanage/HttpDownloadClient.ets

@@ -68,7 +68,7 @@ export class HttpDownloadClient implements IDataFetch {
           method: http.RequestMethod.GET,
           expectDataType: http.HttpDataType.ARRAY_BUFFER,
           connectTimeout: 60000, // 可选 默认60000ms
-          readTimeout: 0, //可选, 默认为60000ms
+          readTimeout: 0, // 可选, 默认为60000ms
           usingProtocol: http.HttpProtocol.HTTP1_1, // 可选,协议类型默认值由系统自动指定
         },
         (err: BusinessError, data: number) => {

imageknife/src/main/ets/components/imageknife/requestmanage/RequestManager.ets

@@ -170,7 +170,7 @@ export class RequestManager {
     }
   }
 
-  //究竟从哪里加载数据
+  // 究竟从哪里加载数据
   private searchLoadFrom(request: RequestOption, current: Stage, onComplete:(value:ImageKnifeData)=>void|PromiseLike<ImageKnifeData>, onError:(reason?:BusinessError|string)=>void) {
     LogUtil.log("RequestManager searchLoadFrom")
     if (current == Stage.RESOURCE_CACHE) {

imageknife/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;
 }

imageknife/src/main/ets/components/imageknife/transform/BaseTransform.ets

@@ -17,7 +17,7 @@ import {AsyncTransform} from "../transform/AsyncTransform"
 import {RequestOption}  from "../../imageknife/RequestOption"
 
 export interface BaseTransform<T> {
-  //实现类 返回作为key生成的一部分
+  // 实现类 返回作为key生成的一部分
   getName(): string;
 
   transform(value: ArrayBuffer, request: RequestOption, func: AsyncTransform<T>);

imageknife/src/main/ets/components/imageknife/transform/ContrastFilterTransformation.ets

@@ -107,7 +107,7 @@ export class ContrastFilterTransformation implements BaseTransform<PixelMap> {
 
     let dataArray = new Uint8Array(bufferData);
 
-    let brightness = 0; //亮度的偏移量，可以默认0
+    let brightness = 0; // 亮度的偏移量，可以默认0
     for (let index = 0; index < dataArray.length; index += 4) {
       dataArray[index] = this.checkVisAble((dataArray[index] - 127) * this._mContrast + brightness + 127);
       dataArray[index+1] = this.checkVisAble((dataArray[index+1] - 127) * this._mContrast + brightness + 127);

imageknife/src/main/ets/components/imageknife/transform/CropCircleTransformation.ets

@@ -118,7 +118,7 @@ export class CropCircleTransformation implements BaseTransform<PixelMap> {
         if (this.isContainsCircle(w, h)) {
           continue;
         }
-        //针对的点
+        // 针对的点
         let index = (h * width + w) * 4;
         dataArray[index] = 0;
         dataArray[index+1] = 0;

imageknife/src/main/ets/components/imageknife/transform/CropCircleWithBorderTransformation.ets

@@ -122,9 +122,9 @@ export class CropCircleWithBorderTransformation implements BaseTransform<PixelMa
 
     for (let h = 0;h <= height; h++) {
       for (let w = 0;w <= width; w++) {
-        //不在大圆之内的设置透明
+        // 不在大圆之内的设置透明
-        //在大圆与小圆之间的  设置rgb值
+        // 在大圆与小圆之间的  设置rgb值
-        //小圆之内的不变
+        // 小圆之内的不变
         let isSmallCircle: boolean = this.isContainsSmallCircle(w, h);
         let isBigCircle: boolean = this.isContainsCircle(w, h);
         if (isSmallCircle) {
@@ -133,13 +133,13 @@ export class CropCircleWithBorderTransformation implements BaseTransform<PixelMa
 
         let index = (h * width + w) * 4;
         if (!isBigCircle) {
-          //设置透明
+          // 设置透明
           dataArray[index] = 0;
           dataArray[index+1] = 0;
           dataArray[index+2] = 0;
           dataArray[index+3] = 0;
         } else {
-          //设置broke
+          // 设置broke
           dataArray[index] = this.mRColor;
           dataArray[index+1] = this.mGColor;
           dataArray[index+2] = this.mBColor;

imageknife/src/main/ets/components/imageknife/transform/GrayscaleTransformation.ets

@@ -93,7 +93,7 @@ export class GrayscaleTransformation implements BaseTransform<PixelMap> {
       const g = dataArray[index+1];
       const b = dataArray[index+2];
       const f = dataArray[index+3];
-      //b g r
+      // b g r
       dataNewArray[index] = this.grayscale(r, g, b);
       dataNewArray[index+1] = this.grayscale(r, g, b);
       dataNewArray[index+2] = this.grayscale(r, g, b);

imageknife/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>> = {

imageknife/src/main/ets/components/imageknife/utils/ParseImageUtil.ets

@@ -25,7 +25,8 @@ export class ParseImageUtil implements IParseImage<PixelMap> {
   }
 
   // scale(0,1)
-  parseImageThumbnail(scale: number, imageinfo: ArrayBuffer, onCompleteFunction: (value: PixelMap) => void | PromiseLike<PixelMap>, onErrorFunction: (reason?: BusinessError | string) => void) {
+  parseImageThumbnail(scale: number, imageinfo: ArrayBuffer, onCompleteFunction: (value: PixelMap) => void | PromiseLike<PixelMap>,
+                      onErrorFunction: (reason?: BusinessError | string) => void) {
     // taskPoolExecutePixelMap(imageinfo,scale,onCompleteFunction,onErrorFunction);
 
     let imageSource:image.ImageSource = image.createImageSource(imageinfo); // 步骤一：文件转为pixelMap 然后变换 给Image组件

imageknife/src/main/ets/components/imageknife/utils/PixelUtils.ets

@@ -74,9 +74,9 @@ export namespace pixelUtils {
     let realPixel_W = pixel > targetWidth ? targetWidth : pixel;
     let realPixel_H = pixel > targetHeight ? targetHeight : pixel;
 
-    //横排的正方形个数
+    // 横排的正方形个数
     let x_index = Math.floor(targetWidth / realPixel_W);
-    //纵排的正方形个数
+    // 纵排的正方形个数
     let y_index = Math.floor(targetHeight / realPixel_H);
 
     for (let ch = 0; ch < y_index; ch++) {
@@ -89,9 +89,9 @@ export namespace pixelUtils {
         let min_x = cw * realPixel_W;
         let min_y = ch * realPixel_H;
 
-        //取左上角的像素值
+        // 取左上角的像素值
         let center_p = inPixels[min_y+1][min_x+1];
-        //设置该正方形里的像素统一
+        // 设置该正方形里的像素统一
         for (let zh = min_y; zh < max_y; zh++) {
           for (let zw = min_x; zw < max_x; zw++) {
             inPixels[zh][zw] = center_p;

imageknife/src/main/ets/components/imageknife/utils/gif/GIFParseImpl.ets

@@ -45,7 +45,7 @@ export class GIFParseImpl implements IParseGif {
     }
     let data:GIFFrame[] = [];
     imageSource.createPixelMapList(decodeOpts).then((pixelList: Array<PixelMap>) => {
-      //sdk的api接口发生变更：从.getDelayTime() 变为.getDelayTimeList()
+      // sdk的api接口发生变更：从.getDelayTime() 变为.getDelayTimeList()
       imageSource.getDelayTimeList().then(delayTimes => {
         if (pixelList.length > 0) {
           let pixelmap = pixelList[0];
@@ -112,7 +112,7 @@ function taskPoolExecutePixelMapList(arrayBuffer: ArrayBuffer, callback: (data?:
   LogUtil.log("ceshi321 : arrayBuffer长度" + arrayBuffer.byteLength)
   let task = new taskpool.Task(taskParseGif, arrayBuffer)
   taskpool.execute(task).then((imageFrames: GIFFrame[]) => {
-    // LogUtil.log('ceshi321 : Succeeded in creating pixelmap Ui .' + imageFrames.getPixelBytesNumber())
+
     callback(imageFrames,undefined)
   }).catch((err: string) => {
     LogUtil.log("ceshi321 :  test occur error: " + err)