@ray-js/ipc-player-integration 0.0.1-beta-6 → 0.0.1-beta-8

package/lib/ctx/ctx.composition.js

@@ -1,3 +1,6 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+const _excluded = ["title", "duration"];
 import { createUseCtx } from './ctx';
 import { Battery, Screenshot, TempHumidity, RecordVideo, FullScreen, VideoBitKbps, Muted } from '../plugins';
 import { authorizeStatus } from '../utils/authorize';
@@ -28,10 +31,23 @@ const bottomContent = [{
   id: 'FullScreen',
   content: FullScreen
 }];
+const toast = _ref => {
+  let {
+      title,
+      duration
+    } = _ref,
+    config = _objectWithoutProperties(_ref, _excluded);
+  ty.showToast(_objectSpread({
+    title,
+    duration,
+    icon: 'none'
+  }, config));
+};
 export const useCtx = createUseCtx({
   createPlayContext,
   defaultTopContent: topContent,
   defaultAbsoluteContent: absoluteContent,
   defaultBottomContent: bottomContent,
-  authorizeStatus: authorizeStatus
+  authorizeStatus: authorizeStatus,
+  toast
 });

package/lib/ctx/ctx.d.ts

@@ -1,11 +1,12 @@
 import { ComponentConfig, UseCtx } from '../interface';
-import type { createPlayContext, AuthorizeStatus } from './ports.output';
+import type { createPlayContext, AuthorizeStatus, Toast } from './ports.output';
 type Depend = {
     createPlayContext: createPlayContext;
     defaultTopContent?: ComponentConfig[];
     defaultBottomContent?: ComponentConfig[];
     defaultAbsoluteContent?: ComponentConfig[];
     authorizeStatus: AuthorizeStatus;
+    toast: Toast;
 };
-export declare const createUseCtx: ({ createPlayContext, defaultTopContent, defaultBottomContent, defaultAbsoluteContent, authorizeStatus, }: Depend) => UseCtx;
+export declare const createUseCtx: ({ createPlayContext, defaultTopContent, defaultBottomContent, defaultAbsoluteContent, authorizeStatus, toast, }: Depend) => UseCtx;
 export {};

package/lib/ctx/ctx.js

@@ -1,5 +1,5 @@
 import { useRef, useCallback } from 'react';
-import { useAtom, updateAtom } from './store';
+import { useAtom, updateAtom, getDefaultStore } from './store';
 import { PlayState } from '../interface';
 const SAVE_TO_ALBUM = 1;
 export const createUseCtx = _ref => {
@@ -8,7 +8,8 @@ export const createUseCtx = _ref => {
     defaultTopContent,
     defaultBottomContent,
     defaultAbsoluteContent,
-    authorizeStatus
+    authorizeStatus,
+    toast
   } = _ref;
   return _ref2 => {
     let {
@@ -50,8 +51,13 @@ export const createUseCtx = _ref => {
       playState,
       setPlayState,
       setIntercom: async target => {
-        const res = await authorizeStatus('scope.record');
-        if (!res) return false;
+        const store = getDefaultStore();
+        const _intercom = store.get(intercom);
+        if (target && target === _intercom) {
+          console.log('Cannot intercom during video _intercom');
+          return false;
+        }
+        if (!target && target === _intercom) return true;
         return new Promise((resolve, reject) => {
           if (target) {
             IPCPlayerInstance.current.startTalk({
@@ -61,6 +67,11 @@ export const createUseCtx = _ref => {
               },
               fail: err => {
                 reject(err);
+                const errObj = err.innerError || err || {};
+                const errMsg = errObj.errorMsg || I18n.t('error_intercom');
+                toast({
+                  title: errMsg
+                });
               }
             });
           } else {
@@ -83,7 +94,7 @@ export const createUseCtx = _ref => {
           IPCPlayerInstance.current.setMuted({
             mute: target,
             success: () => {
-              updateAtom(mute, true);
+              updateAtom(mute, target);
               resolve(true);
             },
             fail: err => {
@@ -94,8 +105,12 @@ export const createUseCtx = _ref => {
         });
       },
       setRecording: async target => {
-        const res = await authorizeStatus('scope.writePhotosAlbum');
-        if (!res) return false;
+        const store = getDefaultStore();
+        const _recording = store.get(recording);
+        if (target && target === _recording) {
+          console.log('Cannot record during video recording');
+          return false;
+        }
         return new Promise((resolve, reject) => {
           if (target) {
             IPCPlayerInstance.current.startRecord({
@@ -118,6 +133,11 @@ export const createUseCtx = _ref => {
               fail: err => {
                 updateAtom(recording, true);
                 reject(err);
+                const errObj = err.innerError || err || {};
+                const errMsg = errObj.errorMsg || I18n.t('error_recording');
+                toast({
+                  title: errMsg
+                });
               }
             });
           }
@@ -157,7 +177,8 @@ export const createUseCtx = _ref => {
       },
       getStreamStatus: () => {
         return streamStatus.current;
-      }
+      },
+      toast
     };
   };
 };

package/lib/ctx/ports.output.d.ts

@@ -1,2 +1,3 @@
+export type { Toast } from '../ports.output';
 export type createPlayContext = (devId: string) => IpcContext;
 export type AuthorizeStatus = (type: string) => Promise<boolean>;

package/lib/hooks/index.d.ts

@@ -1,5 +1,4 @@
 export * from './useBattery';
 export * from './useHumidity';
 export * from './useTemperature';
-export * from './useVideoBitKbps';
 export * from './useDpState';

package/lib/hooks/index.js

@@ -1,5 +1,4 @@
 export * from './useBattery';
 export * from './useHumidity';
 export * from './useTemperature';
-export * from './useVideoBitKbps';
 export * from './useDpState';

package/lib/hooks/useTemperature/index.js

@@ -10,7 +10,6 @@ export const useTemperature = devId => {
     dpCodes: [TEMP_UNIT_SELECT, SENSOR_TEMPERATURE, TEMP_REPORT_F]
   });
   useEffect(() => {
-    console.log('res===1', dpState);
     //  1=华氏度  0=摄氏度
     if (dpState[TEMP_UNIT_SELECT] !== undefined) {
       setTempUnit(dpState[TEMP_UNIT_SELECT] + '');