@ray-js/ipc-player-integration 0.0.1-beta-37 → 0.0.1-beta-39

package/lib/ctx/ctx.js

@@ -1,3 +1,7 @@
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.filter.js";
+import "core-js/modules/esnext.iterator.find.js";
+import "core-js/modules/esnext.iterator.map.js";
 import { useRef, useCallback, useEffect } from 'react';
 import Strings from '../i18n';
 import { useAtom, updateAtom, getDefaultStore, useStore } from './store';
@@ -80,10 +84,10 @@ export const createUseCtx = _ref => {
         // 获取缓存的值且同步
         getMemoryState(devId).then(res => {
           console.log('==== getMemoryState ====', res);
-          _setMute(res.mute);
-          setIntercomMode(res.intercomMode);
           setResolutionList(res.resolutionList);
           _setResolution(res.resolution);
+          _setMute(res.mute);
+          setIntercomMode(res.intercomMode);
         });
       }
     }, [devId, _playState]);
@@ -122,6 +126,7 @@ export const createUseCtx = _ref => {
       IPCPlayerInstance.current = createPlayContext(devId);
     }
     const _setMute = async target => {
+      console.log(target, '_setMute====');
       return new Promise((resolve, reject) => {
         IPCPlayerInstance.current.setMuted({
           mute: target,
@@ -138,12 +143,12 @@ export const createUseCtx = _ref => {
                 updateAtom(mute, res);
               }
             });
+            console.log('喇叭调用失败', JSON.stringify(err));
             reject(err);
-            const errObj = err.innerError || err || {};
-            const errMsg = errObj.errorMsg || I18n.t('error_setMute');
-            toast({
-              title: errMsg
-            });
+
+            // const errObj = err.innerError || err || {};
+            // const errMsg = errObj.errorMsg || I18n.t('error_setMute');
+            // toast({ title: errMsg });
           }
         });
       });

package/lib/ctx/event.js

@@ -1,3 +1,6 @@
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.filter.js";
+import "core-js/modules/esnext.iterator.for-each.js";
 export function getEventInstance() {
   const map = {};
   return {

package/lib/ctx/store.js

@@ -1,3 +1,5 @@
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.for-each.js";
 import { useRef } from 'react';
 import { atom, useAtomValue, getDefaultStore } from 'jotai';
 export { getDefaultStore } from 'jotai';

package/lib/hooks/index.d.ts

@@ -3,3 +3,4 @@ export * from './useHumidity';
 export * from './useTemperature';
 export * from './useDpState';
 export * from './useMemoizedFn';
+export * from './usePtz';

package/lib/hooks/index.js

@@ -2,4 +2,5 @@ export * from './useBattery';
 export * from './useHumidity';
 export * from './useTemperature';
 export * from './useDpState';
-export * from './useMemoizedFn';
+export * from './useMemoizedFn';
+export * from './usePtz';

package/lib/hooks/useDpState/useDpState.js

@@ -1,4 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.for-each.js";
+import "core-js/modules/esnext.iterator.reduce.js";
 import { useState, useEffect, useRef, useCallback } from 'react';
 import { getDeviceInfo, onDpDataChange, offDpDataChange } from '@ray-js/ray';
 import { useMemoizedFn } from '../useMemoizedFn';

package/lib/hooks/usePtz/index.d.ts

@@ -0,0 +1 @@
+export declare const usePtz: (devId: string) => boolean;

package/lib/hooks/usePtz/index.js

@@ -0,0 +1,13 @@
+import { useMemo } from 'react';
+import { PTZ_CONTROL } from '../../utils/content/dpCode';
+import { useDpState } from '../useDpState';
+export const usePtz = devId => {
+  const [dpState] = useDpState({
+    devId,
+    dpCodes: [PTZ_CONTROL]
+  });
+  const supportPtz = useMemo(() => {
+    return dpState[PTZ_CONTROL];
+  }, [dpState]);
+  return supportPtz;
+};

package/lib/interface.js

@@ -1,17 +1,26 @@
 export { IntercomMode } from './ports.output';
 export let PlayerStreamStatus = /*#__PURE__*/function (PlayerStreamStatus) {
   PlayerStreamStatus[PlayerStreamStatus["UnknownException"] = -1000] = "UnknownException";
+  // 未知异常
   PlayerStreamStatus[PlayerStreamStatus["ConnectSuccess"] = 1001] = "ConnectSuccess";
+  // 连接成功
   PlayerStreamStatus[PlayerStreamStatus["ConnectFail"] = -1001] = "ConnectFail";
+  // 链接失败
   PlayerStreamStatus[PlayerStreamStatus["PreviewSuccess"] = 1002] = "PreviewSuccess";
+  // preview 成功
   PlayerStreamStatus[PlayerStreamStatus["PreviewFail"] = -1002] = "PreviewFail";
+  // preview 失败
   PlayerStreamStatus[PlayerStreamStatus["NetworkError"] = -1010] = "NetworkError";
+  // 网络状态不可用
   PlayerStreamStatus[PlayerStreamStatus["DeviceDelete"] = -1012] = "DeviceDelete";
+  // 设备被移除
   PlayerStreamStatus[PlayerStreamStatus["DisconnectSuccess"] = 1009] = "DisconnectSuccess";
+  // 断连成功
   PlayerStreamStatus[PlayerStreamStatus["DisconnectFail"] = -1009] = "DisconnectFail";
-  PlayerStreamStatus[PlayerStreamStatus["PAUSE"] = 4] = "PAUSE";
+  // 断连失败
+  PlayerStreamStatus[PlayerStreamStatus["PAUSE"] = 4] = "PAUSE"; // 暂停
   return PlayerStreamStatus;
-}({}); // 暂停
+}({});
 export let PlayState = /*#__PURE__*/function (PlayState) {
   PlayState[PlayState["CONNECTING"] = 0] = "CONNECTING";
   PlayState[PlayState["PLAYING"] = 1] = "PLAYING";

package/lib/plugins/fullScreen/fullScreen.js

@@ -93,17 +93,17 @@ export function FullScreen(props) {
       handleFull();
     },
     vertical: () => {
+      event.emit(pauseTimeToHideAllComponent);
       ty.setNavigationBarBack({
         type: 'system'
       });
-      event.emit(pauseTimeToHideAllComponent);
+      ty.showMenuButton();
+      ty.showStatusBar();
+      deleteContent('topLeft', verticalScreenId);
       deleteContent('absolute', voiceIntercomId);
       deleteContent('absolute', ptzControlId);
-      deleteContent('topLeft', verticalScreenId);
       deleteContent('absolute', fullResolutionId);
       deleteContent('absolute', fullTravelRouteControlId);
-      ty.showMenuButton();
-      ty.showStatusBar();
     }
   };
   useUpdateEffect(() => {

package/lib/plugins/fullScreen/fullScreen.less

@@ -24,6 +24,12 @@
   }
 }
 
+.ipc-player-plugin-full-screen-voice-disappear {
+  width: 0;
+  height: 0;
+  overflow: hidden;
+}
+
 .ipc-plugin-full-travel-route-control {
   width: calc(172px * var(--ipc-player-size-scale, 1));
   height: calc(172px * var(--ipc-player-size-scale, 1));

package/lib/plugins/fullScreen/fullVoiceIntercom.js

@@ -10,12 +10,18 @@ import { useComponentHideState } from '../../ui/hooks';
 import { useMemoizedFn } from '../../hooks';
 import { UIEventContext } from '../../ui/context';
 import { pauseTimeToHideAllComponent } from '../../ui/constant';
+import { useStore } from '../../ctx/store';
 export function FullVoiceIntercom(props) {
   const [shouldHide] = useComponentHideState();
   const [isPtzActive, setIsPtzActive] = useState(false);
   const {
     event
   } = useContext(UIEventContext);
+  const {
+    screenType
+  } = useStore({
+    screenType: props.screenType
+  });
   const onPtzControlShow = useMemoizedFn(() => {
     setIsPtzActive(true);
   });
@@ -32,7 +38,8 @@ export function FullVoiceIntercom(props) {
   }, []);
   return /*#__PURE__*/React.createElement(View, {
     className: clsx('ipc-player-plugin-full-screen-voice', {
-      'ipc-player-plugin-full-screen-voice-hide': shouldHide || isPtzActive
+      'ipc-player-plugin-full-screen-voice-hide': shouldHide || isPtzActive,
+      'ipc-player-plugin-full-screen-voice-disappear': screenType === 'vertical'
     })
   }, /*#__PURE__*/React.createElement(VoiceIntercom, _extends({}, props, {
     talkingColor: "#FFFFFF",

package/lib/plugins/moveInteractiveControl/moveInteractiveControlUI.js

@@ -1,4 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.map.js";
 import React from 'react';
 import { View, ScrollView } from '@ray-js/ray';
 import clsx from 'clsx';

package/lib/plugins/ptz/ptz.js

@@ -3,6 +3,7 @@ import { View, Text } from '@ray-js/ray';
 import clsx from 'clsx';
 import React, { useEffect, useState, useContext } from 'react';
 import { UIEventContext } from '../../ui/context';
+import { usePtz } from '../../hooks';
 import { useStore } from '../../ctx/store';
 import { ptzControlId } from '../../ui/constant';
 import './ptz.less';
@@ -15,7 +16,8 @@ export const Ptz = props => {
     deleteContent,
     showContent,
     hideContent,
-    className
+    className,
+    devId
   } = props;
   const {
     screenType,
@@ -28,13 +30,14 @@ export const Ptz = props => {
   const {
     event
   } = useContext(UIEventContext);
+  const supportPtz = usePtz(devId);
   useEffect(() => {
     if (screenType === 'vertical') {
       event.emit('ptzControlHide');
       setIsPtzActive(false);
     }
   }, [screenType]);
-  if (screenType === 'vertical') {
+  if (screenType === 'vertical' || !supportPtz) {
     return null;
   }
   return /*#__PURE__*/React.createElement(View, {

package/lib/plugins/resolution/fullResolutionControl.js

@@ -1,3 +1,5 @@
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.map.js";
 import React, { useCallback, useState, useContext, useEffect } from 'react';
 import { Text, View } from '@ray-js/ray';
 import clsx from 'clsx';

package/lib/plugins/resolution/resolution.js

@@ -57,7 +57,9 @@ export const Resolution = props => {
     onClick: onResolution,
     className: clsx(className, screenType === 'vertical' ? 'ipc-player-plugin-resolution-vertical' : 'ipc-player-plugin-resolution-full')
   }, /*#__PURE__*/React.createElement(View, {
-    className: "ipc-player-plugin-resolution"
+    className: clsx('ipc-player-plugin-resolution', {
+      'ipc-player-plugin-resolution-full': screenType === 'full'
+    })
   }, /*#__PURE__*/React.createElement(Text, {
     className: "resolutionText"
   }, Strings.getLang(`ipc_player_resolution_${resolution}`))));

package/lib/plugins/resolution/resolution.less

@@ -2,19 +2,23 @@
 
 .ipc-player-plugin-resolution {
   background-color: rgba(255,255,255,0.2);
-  padding: calc(4px * var(--ipc-player-size-scale, 1)) calc(5px * var(--ipc-player-size-scale, 1)) !important;
+  padding: calc(4px * var(--ipc-player-size-scale, 1)) calc(5px * var(--ipc-player-size-scale, 1));
   display: flex;
   justify-content: center;
   align-items: center;
-  border-radius: calc(8px * var(--ipc-player-size-scale, 1));
+  border-radius: calc(3px * var(--ipc-player-size-scale, 1));
   background-color: rgba(255, 255, 255, 0.3);
   box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
   .resolutionText {
     color: var(--iconColor);
     font-weight: 600;
-    font-size: calc(14px * var(--ipc-player-size-scale, 1));
+    font-size: calc(12px * var(--ipc-player-size-scale, 1));
   }
 }
+.ipc-player-plugin-resolution-full {
+  padding-left: calc(8px * var(--ipc-player-size-scale, 1));
+  padding-right: calc(8px * var(--ipc-player-size-scale, 1));
+}
 
 .ipc-player-plugin-full-resolution-control {
   height: 100%;

package/lib/ports.output.d.ts

@@ -3,6 +3,7 @@ export type UseBattery = (devId: string) => {
     batteryValue: number;
     batteryCharging: boolean;
 };
+export type UsePtz = (devId: string) => boolean;
 export type UseTemperature = (devId: string) => number;
 export type UseHumidity = () => number;
 export type Toast = (options: {

package/lib/ports.output.js

@@ -2,6 +2,8 @@ export { IntercomMode } from '@ray-js/ray-ipc-utils/lib/interface';
 
 // plugin 获取电池电量 todo
 
+// plugin 获取是否支持Ptz
+
 // plugin 获取温度
 
 // plugin 获取湿度

package/lib/ui/event.js

@@ -1,3 +1,6 @@
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.filter.js";
+import "core-js/modules/esnext.iterator.for-each.js";
 export function getEventInstance() {
   const map = {};
   return {

package/lib/ui/ui.js

@@ -1,4 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.map.js";
 import React, { useState, useRef, useMemo, useEffect, useImperativeHandle } from 'react';
 import { View, CoverView, getSystemInfoSync, usePageEvent } from '@ray-js/ray';
 import clsx from 'clsx';

package/lib/ui/ui.less

@@ -191,6 +191,9 @@
    // 左下角子元素容器
    .bottom-left-item-container {
     padding: 0 12px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
   }
 
   .bottom-left-item-container:first-of-type {

package/lib/utils/device/index.js

@@ -1,3 +1,6 @@
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.find.js";
+import "core-js/modules/esnext.iterator.for-each.js";
 import IpcUtils from '@ray-js/ray-ipc-utils';
 export function getDpValue(options) {
   return new Promise((resolve, reject) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.1-beta-37",
+  "version": "0.0.1-beta-39",
   "description": "IPC 播放器功能集成",
   "main": "lib/index",
   "files": [
@@ -36,7 +36,7 @@
     "ahooks": "^3.1.6"
   },
   "dependencies": {
-    "@ray-js/ipc-ptz-zoom": "0.0.2-beta-6",
+    "@ray-js/ipc-ptz-zoom": "0.0.2-beta-7",
     "@ray-js/panel-sdk": "^1.13.1",
     "@ray-js/ray-ipc-player": "2.0.20-beta-6",
     "@ray-js/ray-ipc-utils": "1.1.0-beta-13",

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

@@ -1,9 +0,0 @@
-import { IntercomMode } from '../ports.output';
-export type { Toast, IntercomMode } from '../ports.output';
-export type createPlayContext = (devId: string) => IpcContext;
-export type AuthorizeStatus = (type: string) => Promise<boolean>;
-export type GetMemoryState = (devId: string) => Promise<{
-    mute: boolean;
-    intercomMode: IntercomMode;
-}>;
-export type SetMuteMemoryState = (devId: string, value: boolean) => void;

package/lib/interface.d.ts

@@ -1,102 +0,0 @@
-import React from 'react';
-import { PrimitiveAtom } from 'jotai';
-import type { Toast, IntercomMode } from './ports.output';
-export { IntercomMode } from './ports.output';
-type WithInitialValue<Value> = {
-    init: Value;
-};
-export type RetAtom<T> = PrimitiveAtom<T> & WithInitialValue<T>;
-export type ScreenType = 'full' | 'vertical';
-export declare const enum PlayerStreamStatus {
-    UnknownException = -1000,
-    ConnectSuccess = 1001,
-    ConnectFail = -1001,
-    PreviewSuccess = 1002,
-    PreviewFail = -1002,
-    NetworkError = -1010,
-    DeviceDelete = -1012,
-    DisconnectSuccess = 1009,
-    DisconnectFail = -1009,
-    PAUSE = 4
-}
-export declare const enum PlayState {
-    CONNECTING = 0,
-    PLAYING = 1,
-    PAUSE = 2
-}
-export type ContentPlaceType = 'topLeft' | 'topRight' | 'bottomLeft' | 'bottomRight' | 'absolute';
-type Task = (...args: any[]) => void;
-export type EventInstance = {
-    on: (type: string, cb: Task) => void;
-    off: (type: string, cb: Task) => void;
-    emit: (type: string, ...args: any[]) => void;
-};
-export type UseCtx = (options: {
-    devId: string;
-    initTopLeftContent?: ComponentConfig[];
-    initTopRightContent?: ComponentConfig[];
-    initBottomLeftContent?: ComponentConfig[];
-    initBottomRightContent?: ComponentConfig[];
-    initAbsoluteContent?: ComponentConfig[];
-    saveToAlbum?: 0 | 1;
-}) => {
-    devId: string;
-    brandColor: RetAtom<string>;
-    verticalMic: RetAtom<boolean>;
-    saveToAlbum: 0 | 1;
-    screenType: RetAtom<ScreenType>;
-    recording: RetAtom<boolean>;
-    recordingDisabled: RetAtom<boolean>;
-    mute: RetAtom<boolean>;
-    intercom: RetAtom<boolean>;
-    intercomMode: RetAtom<IntercomMode>;
-    resolution: RetAtom<string>;
-    resolutionList: RetAtom<string[]>;
-    playState: RetAtom<PlayState>;
-    IPCPlayerInstance: IpcContext;
-    topLeftContent: RetAtom<ComponentConfig[]>;
-    topRightContent: RetAtom<ComponentConfig[]>;
-    bottomLeftContent: RetAtom<ComponentConfig[]>;
-    bottomRightContent: RetAtom<ComponentConfig[]>;
-    absoluteContent: RetAtom<ComponentConfig[]>;
-    setBrandColor: (color: string) => void;
-    setVerticalMic: (color: boolean) => void;
-    setScreenType: (type: ScreenType) => void;
-    setRecordingDisabled: (type: boolean) => void;
-    setResolution: (type: string) => void;
-    setResolutionList: (type: string[]) => void;
-    setRecording: (value: boolean) => Promise<RecordInfoData>;
-    setIntercom: (value: boolean) => Promise<boolean>;
-    setMute: (value: boolean) => Promise<boolean>;
-    changeStreamStatus: (value: PlayerStreamStatus) => void;
-    getStreamStatus: () => PlayerStreamStatus;
-    setPlayState: (value: PlayState) => void;
-    addContent: <T>(type: ContentPlaceType, config: ComponentConfig<T> | ComponentConfig<T>[], position?: number) => void;
-    deleteContent: (type: ContentPlaceType, id: string) => void;
-    hasContent: (type: ContentPlaceType, id: string) => boolean;
-    hideContent: (type: ContentPlaceType, id: string) => void;
-    showContent: (type: ContentPlaceType, id: string) => void;
-    toast: Toast;
-    event: EventInstance;
-};
-export type ComponentConfig<T = ReturnType<UseCtx> & Record<string, any>> = {
-    id: string;
-    content: (props: T) => React.ReactElement;
-    initProps?: T;
-    absolutePosition?: React.CSSProperties;
-    absoluteContentClassName?: string;
-    absoluteContentStyle?: React.CSSProperties;
-    hidden?: boolean;
-};
-export type ComponentConfigProps = {
-    IPCPlayerContext: IpcContext;
-} & ReturnType<UseCtx>;
-export type PlayStatusData = {
-    playState: PlayState;
-    playCode: number;
-};
-export type RecordInfoData = boolean | {
-    tempImagePath: string;
-    filePath: string;
-    thumbPath: string;
-};

package/lib/utils/device/index.d.ts

@@ -1,23 +0,0 @@
-export declare function getDpValue<T extends string>(options: {
-    devId: string;
-    dps: T[];
-}): Promise<Record<T, number | string | boolean>>;
-export interface IDpCode {
-    code: string;
-    dpId: number;
-    value: string;
-    time: number;
-    type: string;
-}
-type ReturnDeviceInfo = Parameters<Parameters<typeof ty.device.getDeviceInfo>[0]['success']>[0];
-export declare function getDeviceInfo(devId: string): Promise<ReturnDeviceInfo>;
-export declare function getDpIdsByCodes<T extends string>(devId: string, dpIds: T[]): Promise<Record<T, string>>;
-export declare const showMathPowValue: (value: any, scale: any) => string | 0;
-export declare const getDevInfo: <T>(deviceId: string) => Promise<any>;
-/**
- * 根据DpCode获取枚举型DP的range是否包含对应项
- * @param result: {code: number, msg: string}
- */
-export declare const getEnumRangeIsValid: (devId: any, dpCode: any, rangValue: any) => Promise<any>;
-export declare function hasDpCode(devId: string, code: string): Promise<boolean>;
-export {};