!3489 【媒体子系统】API9 Camera下库

Merge pull request !3489 from 陈佳欢/OpenHarmony-3.1-Release

multimedia/BUILD.gn

@@ -18,7 +18,6 @@ group("multimedia") {
   if (is_standard_system) {
     deps = [
       "audio/audio_js_standard/audioManager:audio_manager_js_hap",
-      "camera/camera_js_standard:camera_standard_ets_hap",
       "image/image_js_standard:image_js_hap",
       "media/media_js_standard/audioDecoder:audio_decoder_js_hap",
       "media/media_js_standard/audioEncoder:audio_encoder_js_hap",

multimedia/camera/camera_js_standard/BUILD.gn

-# 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("//test/xts/tools/build/suite.gni")
-ohos_js_hap_suite("camera_standard_ets_hap") {
-  hap_profile = "./src/main/config.json"
-  deps = [
-    ":camera_ets_assets",
-    ":camera_ets_resources",
-  ]
-  ets2abc = true
-
-  certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsCameraStandardETSTest"
-}
-ohos_js_assets("camera_ets_assets") {
-  source_dir = "./src/main/ets/MainAbility"
-}
-ohos_resources("camera_ets_resources") {
-  sources = [ "./src/main/resources" ]
-  hap_profile = "./src/main/config.json"
-}

multimedia/camera/camera_js_standard/Test.json

-{
-    "description": "Configuration for camerastandard Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "1000000",
-        "package": "com.open.harmony.multimedia.cameratest",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "type": "ShellKit",
-            "run-command": [
-                "touch /data/media/01.mp4",
-                "chmod -R 777 /data/media"
-                
-            ],
-            "teardown-command":[
-           
-            ]
-        },
-        {
-            "test-file-name": [
-                "ActsCameraStandardETSTest.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
-}
\ No newline at end of file

multimedia/camera/camera_js_standard/src/main/config.json

-{
-  "app": {
-    "bundleName": "com.open.harmony.multimedia.cameratest",
-    "vendor": "open",
-    "version": {
-      "code": 1000000,
-      "name": "1.0.0"
-    },
-    "apiVersion": {
-      "compatible": 7,
-      "releaseType": "Release",
-      "target": 7
-    }
-  },
-  "deviceConfig": {},
-  "module": {
-    "package": "com.open.harmony.multimedia.cameratest",
-    "name": ".MyApplication",
-    "mainAbility": "com.open.harmony.multimedia.cameratest.MainAbility",
-    "deviceType": [
-      "phone"
-    ],
-    "distro": {
-      "deliveryWithInstall": true,
-      "moduleName": "entry",
-      "moduleType": "entry",
-      "installationFree": false
-    },
-    "abilities": [
-      {
-        "skills": [
-          {
-            "entities": [
-              "entity.system.home"
-            ],
-            "actions": [
-              "action.system.home"
-            ]
-          }
-        ],
-        "orientation": "unspecified",
-        "visible": true,
-        "srcPath": "MainAbility",
-        "name": ".MainAbility",
-        "srcLanguage": "ets",
-        "icon": "$media:icon",
-        "description": "$string:description_mainability",
-        "formsEnabled": false,
-        "label": "$string:entry_MainAbility",
-        "type": "page",
-        "launchType": "standard"
-      }
-    ],
-    "reqPermissions": [
-      {
-        "name": "ohos.permission.GRANT_SENSITIVE_PERMISSIONS",
-        "reason": "use ohos.permission.GRANT_SENSITIVE_PERMISSIONS"
-      },
-      {
-        "name": "ohos.permission.REVOKE_SENSITIVE_PERMISSIONS",
-        "reason": "use ohos.permission.REVOKE_SENSITIVE_PERMISSIONS"
-      },
-      {
-        "name": "ohos.permission.CAMERA",
-        "reason": "use ohos.permission.CAMERA"
-      },
-      {
-        "name": "ohos.permission.MICROPHONE",
-        "reason": "use ohos.permission.MICROPHONE"
-      },
-      {
-        "name": "ohos.permission.MEDIA_LOCATION",
-        "reason": "use ohos.permission.MEDIA_LOCATION"
-      },
-      {
-        "name": "ohos.permission.READ_MEDIA",
-        "reason": "use ohos.permission.READ_MEDIA"
-      },
-      {
-        "name": "ohos.permission.WRITE_MEDIA",
-        "reason": "use ohos.permission.WRITE_MEDIA"
-      }
-    ],
-    "js": [
-      {
-        "mode": {
-          "syntax": "ets",
-          "type": "pageAbility"
-        },
-        "pages": [
-          "pages/index"
-        ],
-        "name": ".MainAbility",
-        "window": {
-          "designWidth": 720,
-          "autoDesignWidth": false
-        }
-      }
-    ]
-  }
-}
\ No newline at end of file

multimedia/camera/camera_js_standard/src/main/ets/MainAbility/app.ets

-/*
- * 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.
- */
-
-export default {
-  onCreate() {
-    console.info('Application onCreate')
-  },
-  onDestroy() {
-    console.info('Application onDestroy')
-  },
-}

multimedia/camera/camera_js_standard/src/main/ets/MainAbility/pages/index.ets

-/*
- * 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 {Core, ExpectExtend} from "deccjsunit/index"
-import cameraKit from "../test/Camera.test"
-import featureAbility from "@ohos.ability.featureAbility"
-
-let TAG = 'CameraModuleTest: '
-var mXComponentController: XComponentController = new XComponentController()
-var surfaceId: any
-
-@Entry
-@Component
-struct CameraIndex {
-  @State isShowSettings: boolean = false
-  @State previewSize: string = '75%'
-
-  aboutToAppear() {
-    console.info('--------------aboutToAppear--------------')
-  }
-
-  build() {
-    Flex() {
-      XComponent({
-        id: '',
-        type: 'surface',
-        libraryname: '',
-        controller: mXComponentController
-      })
-        .onLoad(() => {
-          console.info('CameraModuleTest: OnLoad() is called!')
-          mXComponentController.setXComponentSurfaceSize({ surfaceWidth: 1920, surfaceHeight: 1080 });
-          surfaceId = mXComponentController.getXComponentSurfaceId()
-          console.info('CameraModuleTest: XComponent onLoad surfaceId: ' + surfaceId)
-          featureAbility.getWant()
-            .then((Want) => {
-              const core = Core.getInstance()
-              const expectExtend = new ExpectExtend({
-                'id': 'extend'
-              })
-              console.info(TAG + 'Entering expectExtend')
-              core.addService('expect', expectExtend)
-              console.info(TAG + 'Entering addService')
-              core.init()
-              console.info(TAG + 'Entering core.init()')
-              console.info(TAG + 'Entering subscribeEvent')
-              const configService = core.getDefaultService('config')
-              configService.setConfig(Want.parameters)
-              console.info(TAG + 'Entering configService')
-              cameraKit(surfaceId)
-              core.execute()
-              console.info(TAG + 'Operation successful. Data: ' + JSON.stringify(Want));
-            })
-            .catch((error) => {
-              console.error(TAG + 'Operation failed. Cause: ' + JSON.stringify(error));
-            })
-        })
-        .width('1920px')
-        .height('1080px')
-    }
-  }
-}

multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/Camera.test.ets

-/*
- * 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 cameraJSUnitEnum from './CameraJSUnitEnum.test.ets'
-import cameraJSUnitCameraFormat from './CameraJSUnitCameraFormat.test.ets'
-import cameraJSUnitPhotoAsync from './CameraJSUnitPhotoAsync.test.ets'
-import cameraJSUnitPhotoPromise from './CameraJSUnitPhotoPromise.test.ets'
-import cameraJSUnitVideoAsync from './CameraJSUnitVideoAsync.test.ets'
-import cameraJSUnitVideoPromise from './CameraJSUnitVideoPromise.test.ets'
-
-let TAG = 'CameraModuleTest: '
-
-export default function cameraKit(surfaceId: any) {
-  console.info(TAG + 'Entering cameraKit')
-  console.info(TAG + 'surfaceId: ' + surfaceId)
-
-  cameraJSUnitEnum(surfaceId)
-  cameraJSUnitCameraFormat(surfaceId)
-  cameraJSUnitPhotoAsync(surfaceId)
-  cameraJSUnitVideoAsync(surfaceId)
-}
\ No newline at end of file