!48 替换entry中所有使用到的过时ArkWorker.Worker为worker.ThreadWorker

Merge pull request !48 from 李艺为/master

entry/build-profile.json5

@@ -3,8 +3,6 @@
   "buildOption": {
     "sourceOption": {
       "workers": [
-        "./src/main/ets/pages/workers/worker1.js",
-        "./src/main/ets/pages/workers/gifParseWorker.ts",
         './src/main/ets/workers/GifLoadWorker.ts',
         './src/main/ets/workers/PngLoadWorker.ts',
         './src/main/ets/workers/MyWorker.ts'

entry/src/main/ets/pages/gifTestCasePage.ets

@@ -14,6 +14,7 @@
  */
 import {GIFParseImpl} from '@ohos/imageknife'
 import ArkWorker from '@ohos.worker'
+import worker from '@ohos.worker';
 @Entry
 @Component
 struct gifTestCasePage {
@@ -51,7 +52,7 @@ struct gifTestCasePage {
               globalThis.ImageKnife.getImageKnifeContext().resourceManager.getMedia($r('app.media.gifSample_single_frame').id)
                 .then(data => {
                   console.log('basicTestFileIOPage - 本地加载资源 解析后数据data length = ' + data.byteLength)
-                  let worker = new ArkWorker.Worker('entry/ets/pages/workers/gifParseWorker.ts', {
+                  let local_worker = new worker.ThreadWorker('entry/ets/workers/GifLoadWorker.ts', {
                     type: 'classic',
                     name: 'ImageKnifeParseGIF'
                   })
@@ -64,7 +65,7 @@ struct gifTestCasePage {
                       console.log('加载gif图片自带worker suc,长度='+data.length)
                       this.pixels = data[0]['drawPixelMap']
                     }
-                  },worker)
+                  },local_worker)
                 })
                 .catch(err => {
                   console.log('basicTestFileIOPage - 本地加载资源err' + JSON.stringify(err));
@@ -111,7 +112,7 @@ struct gifTestCasePage {
 
   aboutToAppear() {
     console.log("aboutToAppear()")
-    this.globalGifWorker = new ArkWorker.Worker('entry/ets/pages/workers/gifParseWorker.ts', {
+    this.globalGifWorker = new worker.ThreadWorker('entry/ets/workers/GifLoadWorker.ts', {
       type: 'classic',
       name: 'ImageKnifeParseGIF'
     })

entry/src/main/ets/pages/pngjTestCasePage.ets

@@ -18,6 +18,7 @@ import resourceManager from '@ohos.resourceManager';
 import { FileUtils } from '@ohos/imageknife'
 import featureability from '@ohos.ability.featureAbility'
 import ArkWorker from '@ohos.worker'
+import worker from '@ohos.worker';
 
 @Entry
 @Component
@@ -109,11 +110,11 @@ struct PngjTestCasePage {
                   if (!this.pngdecodeRun2) {
                     this.pngdecodeRun2 = true;
                   let pngj = new Pngj();
-                  let worker = new ArkWorker.Worker('entry/ets/pages/workers/worker1.js', {
+                  let png_worker = new worker.ThreadWorker('entry/ets/workers/PngLoadWorker.ts', {
                     type: 'classic',
                     name: 'readPngImageAsync'
                   })
-                  pngj.readPngImageAsync(worker, this.pngSource1, (sender, value) => {
+                  pngj.readPngImageAsync(png_worker, this.pngSource1, (sender, value) => {
                     this.pngSource1 = sender
                     this.hint2 = 'img with=' + value.width + ' img height=' + value.height
                     + ' img depth=' + value.depth + ' img ctype=' + value.ctype
@@ -154,11 +155,11 @@ struct PngjTestCasePage {
                   if (!this.pngdecodeRun3) {
                     this.pngdecodeRun3 = true;
                   let pngj = new Pngj();
-                  let worker = new ArkWorker.Worker('entry/ets/pages/workers/worker1.js', {
+                  let png_worker = new worker.ThreadWorker('entry/ets/workers/PngLoadWorker.ts', {
                     type: 'classic',
                     name: 'writePngWithStringAsync'
                   })
-                  pngj.writePngWithStringAsync(worker, 'hello world', this.pngSource3, (sender, value) => {
+                  pngj.writePngWithStringAsync(png_worker, 'hello world', this.pngSource3, (sender, value) => {
                     this.pngSource3 = sender
                     FileUtils.getInstance().createFileProcess(
                       this.rootFolder + '/pngj',
@@ -199,16 +200,15 @@ struct PngjTestCasePage {
             })
           Button('writePng')
             .onClick(()=>{
-
               if (this.pngSource4) {
                 if (!this.pngdecodeRun4) {
                   this.pngdecodeRun4 = true;
                   let pngj = new Pngj();
-                  let worker = new ArkWorker.Worker('entry/ets/pages/workers/worker1.js', {
+                  let png_worker = new worker.ThreadWorker('entry/ets/workers/PngLoadWorker.ts', {
                     type: 'classic',
                     name: 'writePngAsync'
                   })
-                  pngj.writePngAsync(worker, this.pngSource4, (sender, value) => {
+                  pngj.writePngAsync(png_worker, this.pngSource4, (sender, value) => {
                     this.pngSource4 = sender
                     FileUtils.getInstance().createFileProcess(
                       this.rootFolder + '/pngj',
@@ -224,8 +224,8 @@ struct PngjTestCasePage {
               } else {
                 this.hint10 = '请先点击此处获取buffer'
               }
-
+            })
-            }).margin({ top: 5, left: 10 })
+            .margin({ top: 5, left: 10 })
         }.width('100%')
         .height(60).backgroundColor(Color.Pink)
 

entry/src/main/ets/pages/tempUrlTestPage.ets

@@ -20,6 +20,7 @@ import {
   ScaleType
 } from '@ohos/imageknife'
 import ArkWorker from '@ohos.worker'
+import worker from '@ohos.worker';
 @Entry
 @Component
 struct tempUrlTestPage {
@@ -84,7 +85,7 @@ struct tempUrlTestPage {
   }
 
   aboutToAppear() {
-    this.globalGifWorker = new ArkWorker.Worker('entry/ets/pages/workers/gifParseWorker.ts', {
+    this.globalGifWorker = new worker.ThreadWorker('entry/ets/workers/GifLoadWorker.ts', {
       type: 'classic',
       name: 'ImageKnifeParseGIF'
     })

entry/src/main/ets/pages/testGifDontAnimatePage.ets

@@ -16,6 +16,7 @@ import {ImageKnifeComponent} from '@ohos/imageknife'
 import {ImageKnifeOption} from '@ohos/imageknife'
 import {RotateImageTransformation} from '@ohos/imageknife'
 import ArkWorker from '@ohos.worker'
+import worker from '@ohos.worker'
 @Entry
 @Component
 struct TestGifDontAnimatePage {
@@ -85,7 +86,7 @@ struct TestGifDontAnimatePage {
   }
 
   aboutToAppear() {
-    this.globalGifWorker = new ArkWorker.Worker('entry/ets/pages/workers/gifParseWorker.ts', {
+    this.globalGifWorker = new worker.ThreadWorker('entry/ets/workers/GifLoadWorker.ts', {
       type: 'classic',
       name: 'ImageKnifeParseGIF'
     })

entry/src/main/ets/pages/testImageKnifeOptionChangedPage.ets

@@ -16,6 +16,7 @@ import {ImageKnifeComponent} from '@ohos/imageknife'
 import {ImageKnifeOption} from '@ohos/imageknife'
 import {RotateImageTransformation} from '@ohos/imageknife'
 import ArkWorker from '@ohos.worker'
+import worker from '@ohos.worker'
 @Entry
 @Component
 struct TestImageKnifeOptionChangedPage {
@@ -185,7 +186,7 @@ struct TestImageKnifeOptionChangedPage {
 
   aboutToAppear() {
     console.log("aboutToAppear()")
-    this.globalGifWorker = new ArkWorker.Worker('entry/ets/pages/workers/gifParseWorker.ts', {
+    this.globalGifWorker = new worker.ThreadWorker('entry/ets/workers/GifLoadWorker.ts', {
       type: 'classic',
       name: 'ImageKnifeParseGIF'
     })

entry/src/main/ets/pages/testImageKnifeOptionChangedPage3.ets

@@ -19,6 +19,7 @@ import {RotateImageTransformation} from '@ohos/imageknife'
 import {GrayscaleTransformation} from '@ohos/imageknife'
 import {SketchFilterTransformation} from '@ohos/imageknife'
 import ArkWorker from '@ohos.worker'
+import worker from '@ohos.worker'
 @Entry
 @Component
 struct TestImageKnifeOptionChangedPage3 {
@@ -198,7 +199,7 @@ struct TestImageKnifeOptionChangedPage3 {
   }
   aboutToAppear() {
     console.log("aboutToAppear()")
-    this.globalGifWorker = new ArkWorker.Worker('entry/ets/pages/workers/gifParseWorker.ts', {
+    this.globalGifWorker = new worker.ThreadWorker('entry/ets/workers/GifLoadWorker.ts', {
       type: 'classic',
       name: 'ImageKnifeParseGIF'
     })

entry/src/main/ets/pages/testImageKnifeOptionChangedPage4.ets

@@ -24,6 +24,7 @@ import {
   ScaleType
 } from '@ohos/imageknife'
 import ArkWorker from '@ohos.worker'
+import worker from '@ohos.worker';
 @Entry
 @Component
 struct TestImageKnifeOptionChangedPage4 {
@@ -113,7 +114,7 @@ struct TestImageKnifeOptionChangedPage4 {
 
   aboutToAppear() {
     console.log("aboutToAppear()")
-    this.globalGifWorker = new ArkWorker.Worker('entry/ets/pages/workers/gifParseWorker.ts', {
+    this.globalGifWorker = new worker.ThreadWorker('entry/ets/workers/GifLoadWorker.ts', {
       type: 'classic',
       name: 'ImageKnifeParseGIF'
     })

entry/src/main/ets/pages/testImageKnifeOptionChangedPage5.ets

@@ -25,6 +25,7 @@ import {
   ImageKnifeDrawFactory
 } from '@ohos/imageknife'
 import ArkWorker from '@ohos.worker'
+import worker from '@ohos.worker';
 @Entry
 @Component
 struct TestImageKnifeOptionChangedPage5 {
@@ -95,7 +96,7 @@ struct TestImageKnifeOptionChangedPage5 {
 
   aboutToAppear() {
     console.log("aboutToAppear()")
-    this.globalGifWorker = new ArkWorker.Worker('entry/ets/pages/workers/gifParseWorker.ts', {
+    this.globalGifWorker = new worker.ThreadWorker('entry/ets/workers/GifLoadWorker.ts', {
       type: 'classic',
       name: 'ImageKnifeParseGIF'
     })

entry/src/main/ets/pages/testPreloadPage.ets

@@ -16,6 +16,7 @@ import {ImageKnifeComponent} from '@ohos/imageknife'
 import {ImageKnifeOption} from '@ohos/imageknife'
 import {RequestOption} from '@ohos/imageknife'
 import ArkWorker from '@ohos.worker'
+import worker from '@ohos.worker'
 
 @Entry
 @Component
@@ -614,7 +615,7 @@ struct TestPreloadPage {
   }
 
   aboutToAppear() {
-    this.globalGifWorker = new ArkWorker.Worker('entry/ets/pages/workers/gifParseWorker.ts', {
+    this.globalGifWorker = new worker.ThreadWorker('entry/ets/workers/GifLoadWorker.ts', {
       type: 'classic',
       name: 'ImageKnifeParseGIF'
     })

entry/src/main/ets/pages/workers/gifParseWorker.ts

@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import arkWorker from '@ohos.worker';
-import { gifHandler } from '@ohos/imageknife/GifWorker'
-
-arkWorker.parentPort.onmessage = gifHandler;
-
-
-
-
-
-

entry/src/main/ets/pages/workers/worker1.js

@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import arkWorker from '@ohos.worker';
-
-import {handler} from '@ohos/imageknife/PngWork'
-
-arkWorker.parentPort.onmessage = handler
-
-
-
-
-
-
-
-
-