!8971 媒体CameraXTS监听整改

Merge pull request !8971 from 张永宽/master

multimedia/camera/camera_js_standard/entry/src/main/ets/test/CameraEnumTest.test.ets

@@ -315,7 +315,7 @@ export default function cameraEnumTest() {
             expect(camera.CameraErrorCode.DEVICE_SETTING_LOCKED == 7400106).assertTrue();
             console.info(TAG + "--------------DEVICE_SETTING_LOCKED--------------");
             expect(camera.CameraErrorCode.CONFLICT_CAMERA == 7400107).assertTrue();
-            // console.info(TAG + "--------------CONFLICT_CAMERA--------------");
+            console.info(TAG + "--------------CONFLICT_CAMERA--------------");
             expect(camera.CameraErrorCode.DEVICE_DISABLED == 7400108).assertTrue();
             console.info(TAG + "--------------DEVICE_DISABLED--------------");
             expect(camera.CameraErrorCode.DEVICE_PREEMPTED == 7400109).assertTrue();

multimedia/camera/camera_js_standard/entry/src/main/ets/test/CameraJSUnitOutput.test.ets

@@ -1226,12 +1226,20 @@ export default function cameraJSUnitOutput() {
       } else {
         console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_START_0100 to operate");
         let count = 0;
-        photoOutput.on('captureStart', async (data) => {
-          count++;
+        photoOutput.on('captureStart', async (err, data) => {
+          if (!err) {
+            expect(true).assertTrue();
             console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_START_0100 success");
-          await sleep(1000);
-          done();
+            // count++;
+            // console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_START_0100 success");
+            // await sleep(1000);
+            // done();
+          } else {
+            expect().assertFail();
+            console.info(TAG + "Error in SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_START_0100 FAILED: " + err.message);
+          }
         })
+        await sleep(1000);
         photoOutput.capture();
         // expect(count == 1).assertTrue();
       }
@@ -1297,13 +1305,16 @@ export default function cameraJSUnitOutput() {
       } else {
         console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_END_0100 to operate");
         let count = 0;
-        photoOutput.on('captureEnd', async (data) => {
+        photoOutput.on('captureEnd', async (err, data) => {
+          if (!err) {
             count++;
             console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_END_0100 success");
             console.info(TAG + "SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_END_0100, captureId = " + data.captureId);
             console.info(TAG + "SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_END_0100, frameCount = " + data.frameCount);
-        await sleep(1000);
-        done();
+          } else {
+            expect().assertFail();
+            console.info(TAG + "Error in SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_END_0100 FAILED: " + err.message);
+          }
         })
         await sleep(1000);
         done();
@@ -1332,11 +1343,11 @@ export default function cameraJSUnitOutput() {
         console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_ERROR_0100 to operate");
         photoOutput.on('error', async (err, data) => {
           if (!err) {
-            expect(true).assertTrue();
             console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_ERROR_0100 success");
+            expect(true).assertTrue();
           } else {
-            expect().assertFail();
             console.info(TAG + "Error in SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_ERROR_0100 FAILED: " + err.message);
+            expect().assertFail();
           }
           await sleep(1000);
           done();