更新模型

Signed-off-by: Nwangyulie <wanglieyu@126.com>

resourceschedule/resourceschedule_standard/ffrt/entry/node_modules/.package-lock.json

+{
+  "name": "entry",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "node_modules/libffrtndk.so": {
+      "resolved": "src/main/cpp/types/libffrtndk",
+      "link": true
+    },
+    "src/main/cpp/types/libffrtndk": {
+      "dev": true
+    }
+  }
+}

resourceschedule/resourceschedule_standard/ffrt/entry/package-lock.json

+{
+    "name": "entry",
+    "lockfileVersion": 2,
+    "requires": true,
+    "packages": {
+        "": {
+            "devDependencies": {
+                "libffrtndk.so": "file:./src/main/cpp/types/libffrtndk"
+            }
+        },
+        "node_modules/libffrtndk.so": {
+            "resolved": "src/main/cpp/types/libffrtndk",
+            "link": true
+        },
+        "src/main/cpp/types/libffrtndk": {
+            "dev": true
+        }
+    },
+    "dependencies": {
+        "libffrtndk.so": {
+            "version": "file:src/main/cpp/types/libffrtndk"
+        }
+    }
+}

resourceschedule/resourceschedule_standard/ffrt/entry/package.json

+{
+    "name": "entry",
+    "devDependencies": {
+        "libffrtndk.so": "file:./src/main/cpp/types/libffrtndk"
+    }
+}

resourceschedule/resourceschedule_standard/ffrt/entry/src/main/config.json

@@ -7,9 +7,9 @@
       "name": "1.0.0"
     },
     "apiVersion": {
-      "compatible": 9,
+      "compatible": 10,
       "releaseType": "Release",
-      "target": 9
+      "target": 10
     }
   },
   "deviceConfig": {},
@@ -20,7 +20,8 @@
 
     "deviceType": [
       "default",
-      "tablet"
+      "tablet",
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,

resourceschedule/resourceschedule_standard/ffrt/entry/src/main/ets/MainAbility/app.ets

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
-import { Hypium } from 'hypium/index'
+import { Hypium } from '@ohos/hypium'
 import testsuite from '../test/List.test'
 
 export default {

resourceschedule/resourceschedule_standard/ffrt/entry/src/main/ets/TestAbility/app.ets

@@ -13,18 +13,10 @@
  * limitations under the License.
  */
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
-import { Hypium } from 'hypium/index'
-import testsuite from '../test/List.test'
+import { Hypium } from '@ohos/hypium'
 
 export default {
   onCreate() {
-    console.info('Application onCreate')
-    var abilityDelegator: any
-    abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
-    var abilityDelegatorArguments: any
-    abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
-    console.info('start run testcase!!!')
-    Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
   },
   onDestroy() {
     console.info('Application onDestroy')

resourceschedule/resourceschedule_standard/ffrt/entry/src/main/ets/test/Ffrt.test.ets

@@ -12,8 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import hilog from '@ohos.hilog';
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
+import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "@ohos/hypium"
 import ffrtndk from 'libffrtndk.so';
 export default function ffrtTest() {
   describe('ActsAbilityTest', function () {
@@ -38,7 +37,6 @@ export default function ffrtTest() {
     })
     it('assertContain',0, function () {
       // Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function.
-      hilog.info(0x0000, 'testTag', '%{public}s', 'it begin');
       var flag = ffrtndk.submitSimpleFfrtTask();
       var flag2 = ffrtndk.submitCondFfrtTask();
       var flag3 = ffrtndk.submitQueueFfrtTask();