fix camera

add25796 · Roman · 3a17c554 · add25796 · add25796 · add25796
Commit add25796 authored 4 years ago by Roman
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 6372 additions and 8 deletions

dist/services/camera.js dist/services/camera.js +4 -4

package-lock.json package-lock.json +6364 -0

src/services/camera.ts src/services/camera.ts +4 -4

No files found.
--- a/dist/services/camera.js
+++ b/dist/services/camera.js
@@ -12,15 +12,15 @@ export default class CameraService extends Service {
                case ApiMessageType.CAMERA_CONTROL_RESPONSE:
                    if (typeof message.start_camera !== 'undefined') {
                        if (message.start_camera === true) {
-                            this.resolve(this.waiters.camera);
+                            this.resolve(this.waiters.camera, { startCamera: message.start_camera });
                        }
                        else {
-                            this.reject(this.waiters.cameras, message.reason);
+                            this.reject(this.waiters.camera, message.reason);
                        }
                    }
                    else if (typeof message.make_photo !== 'undefined') {
-                        if (message.start_camera === true) {
-                            this.resolve(this.waiters.photo, message.file);
+                        if (message.make_photo === true) {
+                            this.resolve(this.waiters.photo, { makePhoto: message.make_photo, file: message.file });
                        }
                        else {
                            this.reject(this.waiters.photo, message.reason);

--- a/package-lock.json
+++ b/package-lock.json
--- a/src/services/camera.ts
+++ b/src/services/camera.ts
@@ -18,13 +18,13 @@ export default class CameraService extends Service {
        case ApiMessageType.CAMERA_CONTROL_RESPONSE:
          if (typeof message.start_camera !== 'undefined') {
            if (message.start_camera === true) {
-              this.resolve(this.waiters.camera);
+              this.resolve(this.waiters.camera, { startCamera: message.start_camera });
            } else {
-              this.reject(this.waiters.cameras, message.reason);
+              this.reject(this.waiters.camera, message.reason);
            }
          } else if (typeof message.make_photo !== 'undefined') {
-            if (message.start_camera === true) {
-              this.resolve(this.waiters.photo, message.file);
+            if (message.make_photo === true) {
+              this.resolve(this.waiters.photo, { makePhoto: message.make_photo, file: message.file });
            } else {
              this.reject(this.waiters.photo, message.reason);
            }