@ray-js/ipc-player-integration 0.0.1-beta-51 → 0.0.1-beta-53

package/lib/ctx/ctx.js

@@ -81,9 +81,7 @@ export const createUseCtx = _ref => {
       eventRef.current = getEventInstance();
     }
     useEffect(() => {
-      console.log('========================+++++');
       if (devId && _playState === PlayState.PLAYING) {
-        console.log('===================');
         // 获取缓存的值且同步
         getMemoryState(devId).then(res => {
           console.log('==== getMemoryState ====', res);
@@ -223,30 +221,52 @@ export const createUseCtx = _ref => {
                   }
                 });
               },
-              fail: err => {
-                showModal({
-                  title: '',
-                  content: Strings.getLang('ipc_player_no_record_permission'),
-                  cancelText: Strings.getLang('ipc_player_authorize_cancel_text'),
-                  confirmText: Strings.getLang('ipc_player_authorize_confirm_text'),
-                  isShowGlobal: true,
-                  success: res => {
-                    if (res.confirm) {
-                      const {
-                        platform
-                      } = getSystemInfoSync();
-                      console.log(platform, 'platform');
-                      openAppSystemSettingPage({
-                        // scope: platform === 'ios' ? 'App-Settings' : 'App-Settings-Permission',
-                        scope: 'App-Settings',
-                        success: () => {
-                          console.log('跳转成功');
+              fail: () => {
+                ty.authorize({
+                  // 麦克风权限
+                  scope: 'scope.record',
+                  success: () => {
+                    IPCPlayerInstance.current.startTalk({
+                      success: () => {
+                        updateAtom(intercom, true);
+                        resolve(true);
+                      },
+                      fail: err => {
+                        const errObj = err.innerError || err || {};
+                        const errMsg = errObj.errorMsg || Strings.getLang('ipc_player_error_intercom');
+                        toast({
+                          title: errMsg
+                        });
+                        reject(err);
+                      }
+                    });
+                  },
+                  fail: err => {
+                    showModal({
+                      title: '',
+                      content: Strings.getLang('ipc_player_no_record_permission'),
+                      cancelText: Strings.getLang('ipc_player_authorize_cancel_text'),
+                      confirmText: Strings.getLang('ipc_player_authorize_confirm_text'),
+                      isShowGlobal: true,
+                      success: res => {
+                        if (res.confirm) {
+                          const {
+                            platform
+                          } = getSystemInfoSync();
+                          console.log(platform, 'platform');
+                          openAppSystemSettingPage({
+                            // scope: platform === 'ios' ? 'App-Settings' : 'App-Settings-Permission',
+                            scope: 'App-Settings',
+                            success: () => {
+                              console.log('跳转成功');
+                            }
+                          });
                         }
-                      });
-                    }
+                      }
+                    });
+                    reject(err);
                   }
                 });
-                reject(err);
               }
             });
           } else {
@@ -278,7 +298,7 @@ export const createUseCtx = _ref => {
         }
         return new Promise((resolve, reject) => {
           if (target) {
-            // 麦克风权限
+            // 写入相册
             ty.authorizeStatus({
               scope: 'scope.writePhotosAlbum',
               success: () => {
@@ -293,30 +313,46 @@ export const createUseCtx = _ref => {
                   }
                 });
               },
-              fail: err => {
-                showModal({
-                  title: '',
-                  content: Strings.getLang('ipc_player_no_album_permission'),
-                  cancelText: Strings.getLang('ipc_player_authorize_cancel_text'),
-                  confirmText: Strings.getLang('ipc_player_authorize_confirm_text'),
-                  isShowGlobal: true,
-                  success: res => {
-                    if (res.confirm) {
-                      const {
-                        platform
-                      } = getSystemInfoSync();
-                      console.log(platform, 'platform');
-                      openAppSystemSettingPage({
-                        // scope: platform === 'ios' ? 'App-Settings' : 'App-Settings-Permission',
-                        scope: 'App-Settings',
-                        success: () => {
-                          console.log('跳转成功');
+              fail: () => {
+                ty.authorize({
+                  scope: 'scope.writePhotosAlbum',
+                  success: () => {
+                    IPCPlayerInstance.current.startRecord({
+                      saveToAlbum,
+                      success: () => {
+                        updateAtom(recording, true);
+                        resolve(true);
+                      },
+                      fail: err => {
+                        reject(err);
+                      }
+                    });
+                  },
+                  fail: () => {
+                    showModal({
+                      title: '',
+                      content: Strings.getLang('ipc_player_no_album_permission'),
+                      cancelText: Strings.getLang('ipc_player_authorize_cancel_text'),
+                      confirmText: Strings.getLang('ipc_player_authorize_confirm_text'),
+                      isShowGlobal: true,
+                      success: res => {
+                        if (res.confirm) {
+                          const {
+                            platform
+                          } = getSystemInfoSync();
+                          console.log(platform, 'platform');
+                          openAppSystemSettingPage({
+                            // scope: platform === 'ios' ? 'App-Settings' : 'App-Settings-Permission',
+                            scope: 'App-Settings',
+                            success: () => {
+                              console.log('跳转成功');
+                            }
+                          });
                         }
-                      });
-                    }
+                      }
+                    });
                   }
                 });
-                reject(err);
               }
             });
           } else {

package/lib/i18n/index.d.ts

@@ -18,6 +18,7 @@ declare const Strings: kit.I18N<{
         ipc_player_no_album_permission: string;
         ipc_player_authorize_cancel_text: string;
         ipc_player_authorize_confirm_text: string;
+        ipc_player_error_record_tip: string;
     };
     zh: {
         ipc_player_resolution_HD: string;
@@ -37,6 +38,7 @@ declare const Strings: kit.I18N<{
         ipc_player_no_album_permission: string;
         ipc_player_authorize_cancel_text: string;
         ipc_player_authorize_confirm_text: string;
+        ipc_player_error_record_tip: string;
     };
 }, {
     ipc_player_resolution_HD: string;
@@ -56,6 +58,7 @@ declare const Strings: kit.I18N<{
     ipc_player_no_album_permission: string;
     ipc_player_authorize_cancel_text: string;
     ipc_player_authorize_confirm_text: string;
+    ipc_player_error_record_tip: string;
 } | {
     ipc_player_resolution_HD: string;
     ipc_player_resolution_SD: string;
@@ -74,5 +77,6 @@ declare const Strings: kit.I18N<{
     ipc_player_no_album_permission: string;
     ipc_player_authorize_cancel_text: string;
     ipc_player_authorize_confirm_text: string;
+    ipc_player_error_record_tip: string;
 }>;
 export default Strings;

package/lib/i18n/strings.d.ts

@@ -17,6 +17,7 @@ declare const _default: {
         ipc_player_no_album_permission: string;
         ipc_player_authorize_cancel_text: string;
         ipc_player_authorize_confirm_text: string;
+        ipc_player_error_record_tip: string;
     };
     zh: {
         ipc_player_resolution_HD: string;
@@ -36,6 +37,7 @@ declare const _default: {
         ipc_player_no_album_permission: string;
         ipc_player_authorize_cancel_text: string;
         ipc_player_authorize_confirm_text: string;
+        ipc_player_error_record_tip: string;
     };
 };
 export default _default;

package/lib/i18n/strings.js

@@ -16,7 +16,8 @@ export default {
     ipc_player_no_record_permission: 'The microphone permission is not enabled. Please go to the app settings to enable it first.',
     ipc_player_no_album_permission: 'You currently do not have access to the album or storage. Please enable this permission in the settings.',
     ipc_player_authorize_cancel_text: 'Cancel',
-    ipc_player_authorize_confirm_text: 'Go to Settings'
+    ipc_player_authorize_confirm_text: 'Go to Settings',
+    ipc_player_error_record_tip: 'The recording has failed, please try again later.'
   },
   zh: {
     ipc_player_resolution_HD: '高清',
@@ -35,6 +36,7 @@ export default {
     ipc_player_no_record_permission: '您当前没有 麦克风 的访问权限, 请在设置中打开此权限',
     ipc_player_no_album_permission: '您当前没有 相册/存储 的访问权限, 请在设置中打开此权限',
     ipc_player_authorize_cancel_text: '取消',
-    ipc_player_authorize_confirm_text: '去设置'
+    ipc_player_authorize_confirm_text: '去设置',
+    ipc_player_error_record_tip: '录制出错了，请稍后再试'
   }
 };

package/lib/plugins/battery/battery.composition.js

@@ -1,9 +1,9 @@
 import { createBattery } from './battery';
-import { createBatteryFull } from './batteryFull';
+import { createBattery as createBatteryFull } from './batteryFull';
 import { useBattery } from '../../hooks';
 export const Battery = createBattery({
-  useBattery // todo
+  useBattery
 });
 export const BatteryFull = createBatteryFull({
-  useBattery // todo
+  useBattery
 });

package/lib/plugins/battery/batteryFull.d.ts

@@ -9,5 +9,5 @@ type Props = ComponentConfigProps & {
     className?: string;
 };
 type CreateBattery = (deps: Depend) => React.FunctionComponent<Props>;
-export declare const createBatteryFull: CreateBattery;
+export declare const createBattery: CreateBattery;
 export {};

package/lib/plugins/battery/batteryFull.js

@@ -1,13 +1,13 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { View, Text } from '@ray-js/ray';
 import clsx from 'clsx';
 import { useStore } from '../../ctx/store';
 import './battery.less';
-export const createBatteryFull = _ref => {
+export const createBattery = _ref => {
   let {
     useBattery
   } = _ref;
-  return props => {
+  return /*#__PURE__*/React.memo(props => {
     const {
       className,
       devId
@@ -21,6 +21,16 @@ export const createBatteryFull = _ref => {
       batteryValue,
       batteryCharging
     } = useBattery(devId);
+    const batteryColor = useMemo(() => {
+      if (!batteryValue) return '#eb3223';
+      if (batteryValue >= 60) {
+        return '#5cc83b';
+      }
+      if (batteryValue >= 30) {
+        return '#f8cd46';
+      }
+      return '#eb3223';
+    }, [batteryValue]);
     if (batteryValue === undefined || screenType === 'vertical') {
       return null;
     }
@@ -28,7 +38,9 @@ export const createBatteryFull = _ref => {
       className: clsx(className)
     }, /*#__PURE__*/React.createElement(View, {
       className: "ipc-player-plugin-battery"
-    }, /*#__PURE__*/React.createElement(View, {
+    }, batteryCharging ? /*#__PURE__*/React.createElement(View, {
+      className: "icon-panel icon-panel-charging ipc-player-plugin-battery-charging"
+    }) : /*#__PURE__*/React.createElement(View, {
       className: "ipc-player-plugin-battery-border"
     }, /*#__PURE__*/React.createElement(View, {
       className: "ipc-player-plugin-battery-border-1"
@@ -36,11 +48,12 @@ export const createBatteryFull = _ref => {
       className: "ipc-player-plugin-battery-value-wrap"
     }, /*#__PURE__*/React.createElement(View, {
       style: {
-        width: `${batteryValue}%`
+        width: `${batteryValue}%`,
+        backgroundColor: batteryColor
       },
       className: "ipc-player-plugin-battery-value-value"
     }))), /*#__PURE__*/React.createElement(Text, {
       className: "ipc-player-plugin-battery-text"
     }, batteryValue, "%")));
-  };
+  });
 };

package/lib/plugins/fullScreen/fullScreen.d.ts

@@ -1,9 +1,10 @@
 import React from 'react';
+import { FullTravelRouteControlProps } from './fullTravelRouteControl';
 import './fullScreen.less';
 import type { ComponentConfigProps } from '../../interface';
 type Props = ComponentConfigProps & {
     className?: string;
     hideHorizontalMenu?: boolean;
-};
+} & Pick<FullTravelRouteControlProps, 'throttleTime'>;
 export declare function FullScreen(props: Props): React.JSX.Element | null;
 export {};

package/lib/plugins/fullScreen/fullScreen.less

@@ -17,6 +17,10 @@
 }
 
 .ipc-player-plugin-full-screen-voice {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+  justify-content: center;
   transform: translate(0, 0);
   transition: transform ease-in 0.3s;
   &.ipc-player-plugin-full-screen-voice-hide {

package/lib/plugins/fullScreen/fullTravelRouteControl.d.ts

@@ -3,6 +3,7 @@
  */
 import React from 'react';
 import type { ComponentConfigProps } from '../../interface';
-type Props = ComponentConfigProps;
-export declare function FullTravelRouteControl(props: Props): React.JSX.Element;
-export {};
+export type FullTravelRouteControlProps = ComponentConfigProps & {
+    throttleTime?: number;
+};
+export declare function FullTravelRouteControl(props: FullTravelRouteControlProps): React.JSX.Element;

package/lib/plugins/fullScreen/fullTravelRouteControl.js

@@ -6,7 +6,7 @@ import React, { useEffect, useContext, useState, useRef } from 'react';
 import { View } from '@ray-js/ray';
 import clsx from 'clsx';
 import RectDirectionControl from '@ray-js/direction-control';
-import { useDebounceFn, useMemoizedFn } from 'ahooks';
+import { useThrottleFn, useMemoizedFn } from 'ahooks';
 import { UIEventContext } from '../../ui/context';
 import { useDpState } from '../../hooks';
 import { useComponentHideState } from '../../ui/hooks';
@@ -14,6 +14,9 @@ import { pauseTimeToHideAllComponent, startTimeToHideAllComponent } from '../../
 import { DIRECTION_CONTROL_DP_CODE } from './constant';
 import { useStore } from '../../ctx/store';
 export function FullTravelRouteControl(props) {
+  const {
+    throttleTime = 300
+  } = props;
   const [shouldHide] = useComponentHideState();
   const [isPtzActive, setIsPtzActive] = useState(false);
   const {
@@ -25,11 +28,14 @@ export function FullTravelRouteControl(props) {
   } = useStore({
     brandColor: props.brandColor
   });
+  const timerRef = useRef();
+  const [touching, setTouching] = useState(false);
   const [state, _, sendDp] = useDpState({
     devId: props.devId,
     dpCodes: [DIRECTION_CONTROL_DP_CODE],
     listenDpChange: true
   });
+  console.log('touching', touching);
   const onPtzControlShow = useMemoizedFn(() => {
     setIsPtzActive(true);
   });
@@ -44,39 +50,57 @@ export function FullTravelRouteControl(props) {
       event.off('ptzControlHide', onPtzControlHide);
     };
   }, []);
-  const handTouchEnd = () => {
-    event.emit(startTimeToHideAllComponent);
-    sendDpValue('-1');
+  const pauseTimeToHideAllComponentFn = () => {
+    if (timerRef.current) {
+      clearTimeout(timerRef.current);
+    }
+    // @ts-ignore
+    timerRef.current = setTimeout(() => {
+      event.emit(pauseTimeToHideAllComponent);
+    }, 300);
   };
   const {
     run: sendDpValue
-  } = useDebounceFn(value => {
+  } = useThrottleFn(value => {
     if (value === prevRotate.current) return;
     sendDp({
       [DIRECTION_CONTROL_DP_CODE]: value
     });
     prevRotate.current = value;
   }, {
-    wait: 50,
-    leading: false,
-    trailing: false
+    wait: throttleTime,
+    leading: true,
+    trailing: true
   });
   return /*#__PURE__*/React.createElement(View, {
     className: clsx('ipc-player-plugin-full-screen-voice', {
       'ipc-player-plugin-full-screen-voice-hide': shouldHide || isPtzActive
-    })
+    }),
+    style: {
+      width: touching ? '100vw' : 'auto',
+      height: touching ? '100vh' : 'auto',
+      backgroundColor: 'transparent'
+    }
   }, /*#__PURE__*/React.createElement(RectDirectionControl, {
     className: "ipc-plugin-full-travel-route-control",
     value: 0,
     onTouchStart: value => {
+      setTouching(true);
       sendDpValue(String(value));
     },
     onTouchMove: value => {
-      event.emit(pauseTimeToHideAllComponent);
+      setTouching(true);
+      pauseTimeToHideAllComponentFn();
       sendDpValue(String(value));
     },
-    onTouchEnd: handTouchEnd,
-    onMoveNonIntersection: handTouchEnd,
+    onTouchEnd: () => {
+      event.emit(startTimeToHideAllComponent);
+      setTouching(false);
+      sendDpValue('-1');
+    },
+    onMoveNonIntersection: () => {
+      sendDpValue('-1');
+    },
     showArcOnTouchInEdgeProximity: true,
     arcEdgeProximityColor: brandColor,
     touchDistanceThreshold: 50

package/lib/plugins/recordVideo/recordVideo.js

@@ -82,7 +82,8 @@ export function RecordVideo(props) {
     setRecording,
     setRecordingDisabled,
     devId,
-    className
+    className,
+    toast
   } = props;
   const {
     recording,
@@ -260,10 +261,15 @@ export function RecordVideo(props) {
     } catch (err) {
       console.log('录制失败', err);
       if ((err === null || err === void 0 ? void 0 : err.errorCode) === 7) {
-        ty.showToast({
-          icon: 'none',
+        toast({
           title: Strings.getLang('ipc_player_require_record_permission')
         });
+      } else {
+        const errObj = err.innerError || err || {};
+        const errMsg = errObj.errorMsg || Strings.getLang('ipc_player_error_record_tip');
+        toast({
+          title: errMsg
+        });
       }
       setState({
         showTimer: false

package/lib/plugins/resolution/resolution.js

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

package/lib/plugins/screenshot/screenshot.js

@@ -131,25 +131,51 @@ export function Screenshot(props) {
         });
       },
       fail: () => {
-        showModal({
-          title: '',
-          content: Strings.getLang('ipc_player_no_album_permission'),
-          cancelText: Strings.getLang('ipc_player_authorize_cancel_text'),
-          confirmText: Strings.getLang('ipc_player_authorize_confirm_text'),
-          isShowGlobal: true,
-          success: res => {
-            if (res.confirm) {
-              const {
-                platform
-              } = getSystemInfoSync();
-              console.log(platform, 'platform');
-              openAppSystemSettingPage({
-                scope: 'App-Settings',
-                success: () => {
-                  console.log('跳转成功');
+        ty.authorize({
+          scope: 'scope.writePhotosAlbum',
+          success: () => {
+            IPCPlayerContext.snapshot({
+              saveToAlbum,
+              // 保存到 IPC 相册
+              success: res => {
+                console.log(res, 'res');
+                setState({
+                  showShot: true,
+                  shotUrl: res.tempImagePath
+                });
+              },
+              fail: err => {
+                console.log(err, 'err');
+                const errObj = err.innerError || err || {};
+                const errMsg = errObj.errorMsg || Strings.getLang('ipc_player_error_screenshot_error_tip');
+                toast({
+                  title: errMsg
+                });
+              }
+            });
+          },
+          fail: () => {
+            showModal({
+              title: '',
+              content: Strings.getLang('ipc_player_no_album_permission'),
+              cancelText: Strings.getLang('ipc_player_authorize_cancel_text'),
+              confirmText: Strings.getLang('ipc_player_authorize_confirm_text'),
+              isShowGlobal: true,
+              success: res => {
+                if (res.confirm) {
+                  const {
+                    platform
+                  } = getSystemInfoSync();
+                  console.log(platform, 'platform');
+                  openAppSystemSettingPage({
+                    scope: 'App-Settings',
+                    success: () => {
+                      console.log('跳转成功');
+                    }
+                  });
                 }
-              });
-            }
+              }
+            });
           }
         });
       }

package/lib/ui/bottomLeftContent.js

@@ -16,7 +16,10 @@ const BottomLeftContent = _ref => {
   });
   const [shouldHide] = useComponentHideState();
   return /*#__PURE__*/React.createElement(CoverView, {
-    className: clsx('ipc-player-bottom-left-content-wrap')
+    className: clsx('ipc-player-bottom-left-content-wrap'),
+    style: {
+      paddingRight: screenType === 'vertical' ? '0' : '50px'
+    }
   }, /*#__PURE__*/React.createElement(View, {
     style: {
       paddingBottom: screenType === 'vertical' ? '14px' : '32px',

package/lib/ui/bottomRightContent.js

@@ -16,7 +16,10 @@ const BottomRightContent = _ref => {
   });
   const [shouldHide] = useComponentHideState();
   return /*#__PURE__*/React.createElement(CoverView, {
-    className: clsx('ipc-player-bottom-right-content-wrap')
+    className: clsx('ipc-player-bottom-right-content-wrap'),
+    style: {
+      paddingLeft: screenType === 'vertical' ? '10px' : '0'
+    }
   }, /*#__PURE__*/React.createElement(View, {
     style: {
       paddingBottom: screenType === 'vertical' ? '14px' : '32px',

package/lib/ui/topLeftContent.js

@@ -16,7 +16,10 @@ const TopLeftContent = _ref => {
   });
   const [shouldHide] = useComponentHideState();
   return /*#__PURE__*/React.createElement(CoverView, {
-    className: clsx('ipc-player-top-left-content-wrap')
+    className: clsx('ipc-player-top-left-content-wrap'),
+    style: {
+      paddingRight: screenType === 'vertical' ? '0' : '20px'
+    }
   }, /*#__PURE__*/React.createElement(View, {
     style: {
       paddingTop: screenType === 'vertical' ? '12px' : '16px',

package/lib/utils/device/index.js

@@ -144,7 +144,11 @@ export const getEnumRangeIsValid = async (devId, dpCode, rangValue) => {
 export function hasDpCode(devId, code) {
   return new Promise((resolve, reject) => {
     getDeviceInfo(devId).then(res => {
-      resolve(res.dpCodes[code] !== undefined);
+      const {
+        schema = []
+      } = res || {};
+      const target = schema.find(item => item.code === code);
+      resolve(!!target);
     }, err => reject(err));
   });
 }

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

@@ -3,5 +3,6 @@ type Ctx = ReturnType<UseCtx>;
 export declare function initPlayerPlugins(ctx: Ctx, options: {
     verticalResolutionCustomClick?: boolean;
     hideHorizontalMenu?: boolean;
+    throttleTime?: number;
 }): Promise<void>;
 export {};

package/lib/utils/plugins/index.js

@@ -18,7 +18,8 @@ export async function initPlayerPlugins(ctx, options) {
   const fullScreenIndex = newDefaultBottomRightContent.findIndex(item => item.id === 'FullScreen');
   if (fullScreenIndex !== -1) {
     newDefaultBottomRightContent[fullScreenIndex].initProps = {
-      hideHorizontalMenu: options.hideHorizontalMenu
+      hideHorizontalMenu: options.hideHorizontalMenu,
+      throttleTime: options.throttleTime
     };
   }
   ctx.addContent('bottomRight', newDefaultBottomRightContent);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.1-beta-51",
+  "version": "0.0.1-beta-53",
   "description": "IPC 播放器功能集成",
   "main": "lib/index",
   "files": [