@ray-js/ipc-player-integration 0.0.50-beta.0 → 0.0.50-beta.2

package/README.md

@@ -260,17 +260,17 @@ instance.addContent('absolute', {
 
 Convenient device-state access (all exported from the package root):
 
-| Hook             | Signature                                      | Description                    |
-| ---------------- | ---------------------------------------------- | ------------------------------ |
-| `useBattery`     | `(devId) => { batteryValue, batteryCharging }` | Battery level / charging state |
-| `usePtz`         | `(devId) => boolean`                           | Whether PTZ is supported       |
-| `useTemperature` | `(devId) => number`                            | Temperature                    |
-| `useHumidity`    | `() => number`                                 | Humidity                       |
-| `useSignal4G`    | `(devId) => { dpValue, signalKey }`            | 4G signal strength             |
-| `useDpState`     | —                                              | Read/write DP state            |
-| `useDpSupport`   | —                                              | DP support check               |
-| `useSchemaInfo`  | —                                              | Device schema info             |
-| `useMemoizedFn`  | —                                              | Stable function reference      |
+| Hook             | Signature                                                                | Description                                                                                                                                                                                 |
+| ---------------- | ------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `useBattery`     | `(devId) => { batteryValue, batteryCharging, powerMode, solarCharging }` | Battery level / charging state. `powerMode` is the raw `wireless_powermode` DP (`0` battery / `1` wired charging / `2` solar charging); `batteryCharging` is `true` for both charging modes |
+| `usePtz`         | `(devId) => boolean`                                                     | Whether PTZ is supported                                                                                                                                                                    |
+| `useTemperature` | `(devId) => number`                                                      | Temperature                                                                                                                                                                                 |
+| `useHumidity`    | `() => number`                                                           | Humidity                                                                                                                                                                                    |
+| `useSignal4G`    | `(devId) => { dpValue, signalKey }`                                      | 4G signal strength                                                                                                                                                                          |
+| `useDpState`     | —                                                                        | Read/write DP state                                                                                                                                                                         |
+| `useDpSupport`   | —                                                                        | DP support check                                                                                                                                                                            |
+| `useSchemaInfo`  | —                                                                        | Device schema info                                                                                                                                                                          |
+| `useMemoizedFn`  | —                                                                        | Stable function reference                                                                                                                                                                   |
 
 ### `Utils` & device helpers
 

package/lib/ctx/ctx.composition.js

@@ -47,6 +47,11 @@ export const defaultBottomLeftContent = [{
 }, {
   id: 'Siren',
   content: Siren
+}, /* 焦距转盘入口：仅多镜头设备（ipc_multi_zoom 上报值 cnt > 1）会真正渲染 */
+{
+  id: 'ZoomTurntableEntry',
+  content: ZoomTurntableEntry,
+  hidden: true
 }, /* TryExperience 必须紧跟 Muted，在 VerticalSmallIntercom 之前 */
 {
   id: 'TryExperience',
@@ -68,11 +73,6 @@ export const defaultBottomLeftContent = [{
   id: 'RealTimeMagnification',
   content: RealTimeMagnification,
   hidden: true
-}, /* 焦距转盘入口：仅多镜头设备（ipc_multi_zoom 上报值 cnt > 1）会真正渲染 */
-{
-  id: 'ZoomTurntableEntry',
-  content: ZoomTurntableEntry,
-  hidden: true
 }];
 export const defaultBottomRightContent = [{
   id: 'SwitchLayout',

package/lib/features/initPlayerWidgets/index.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="react" />
 import { ComponentConfig, UseCtx, WidgetId } from '../../interface';
 import { FullScreen } from '../../widgets';
-import type { ZoomSkill } from '../../widgets/zoomTurntable/lensSkill';
 type Ctx = ReturnType<UseCtx>;
 export type InitPlayerWidgetsOptions = {
     verticalResolutionCustomClick?: boolean;
@@ -18,8 +17,6 @@ export type InitPlayerWidgetsOptions = {
      * 仅为功能开关；实际渲染还要 ipc_multi_zoom 解析出 cnt > 1，单镜头设备传 true 也不出现。
      */
     showZoomTurntable?: boolean;
-    /** 调试用：直接注入镜头能力（ZoomSkill），跳过 ipc_multi_zoom DP 解析 */
-    mockZoomSkill?: ZoomSkill | boolean;
     directionControlProps?: Partial<React.ComponentProps<typeof FullScreen>['directionControlProps']>;
     hideSmartImageQualityState?: boolean;
     topLeftContent?: ComponentConfig[];

package/lib/features/initPlayerWidgets/index.js

@@ -60,8 +60,7 @@ export async function initPlayerWidgets(ctx, options) {
       newDefaultBottomLeftContent[zoomTurntableIndex].hidden = false;
       // @ts-ignore
       newDefaultBottomLeftContent[zoomTurntableIndex].initProps = {
-        showZoomTurntable: true,
-        mockZoomSkill: options.mockZoomSkill
+        showZoomTurntable: true
       };
     }
   }

package/lib/hooks/useBattery/index.js

@@ -1,6 +1,7 @@
 import { useMemo } from 'react';
 import { useDpState } from '../useDpState';
 import { addZero } from '../../utils';
+import { PowerMode } from '../../ports.output';
 const POWER_MODE_DP_CODE = 'wireless_powermode';
 const POWER_VALUE_DP_CODE = 'wireless_electricity';
 const POWER_CALC_METHOD_DP_CODE = 'battery_report_cap';
@@ -42,9 +43,14 @@ export const useBattery = devId => {
     return undefined;
   };
   const batteryInfo = useMemo(() => {
+    const powerMode = dpState[POWER_MODE_DP_CODE];
+    const solarCharging = powerMode === PowerMode.Solar;
     return {
       batteryValue: getEleValue(dpState[POWER_VALUE_DP_CODE], dpState[POWER_CALC_METHOD_DP_CODE]),
-      batteryCharging: dpState[POWER_MODE_DP_CODE] === '1'
+      // 有线充电与太阳能充电都属于充电中
+      batteryCharging: powerMode === PowerMode.Charging || solarCharging,
+      powerMode,
+      solarCharging
     };
   }, [dpState]);
   return batteryInfo;

package/lib/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "icon-panel"; /* Project id 4727767 */
-  src: url('iconfont.woff2?t=1784625396313') format('woff2'),
-       url('iconfont.woff?t=1784625396313') format('woff'),
-       url('iconfont.ttf?t=1784625396313') format('truetype');
+  src: url('iconfont.woff2?t=1787047721746') format('woff2'),
+       url('iconfont.woff?t=1787047721746') format('woff'),
+       url('iconfont.ttf?t=1787047721746') format('truetype');
 }
 
 .icon-panel {
@@ -13,6 +13,130 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-panel-solar:before {
+  content: "\e6ee";
+}
+
+.icon-panel-a-rongqi722:before {
+  content: "\e6ed";
+}
+
+.icon-panel-favorite:before {
+  content: "\e6e9";
+}
+
+.icon-panel-album1:before {
+  content: "\e6e5";
+}
+
+.icon-panel-grain:before {
+  content: "\e6e6";
+}
+
+.icon-panel-pump:before {
+  content: "\e6e7";
+}
+
+.icon-panel-favorites2:before {
+  content: "\e6e8";
+}
+
+.icon-panel-bird-identification:before {
+  content: "\e6e4";
+}
+
+.icon-panel-pir-close:before {
+  content: "\e6e2";
+}
+
+.icon-panel-pir-open:before {
+  content: "\e6e3";
+}
+
+.icon-panel-Access-Stop:before {
+  content: "\e6e1";
+}
+
+.icon-panel-uvb1:before {
+  content: "\e6f3";
+}
+
+.icon-panel-uva:before {
+  content: "\e6f4";
+}
+
+.icon-panel-circle:before {
+  content: "\e6f2";
+}
+
+.icon-panel-heat-light:before {
+  content: "\e6f1";
+}
+
+.icon-panel-exhaust:before {
+  content: "\e6ea";
+}
+
+.icon-panel-atomization:before {
+  content: "\e6eb";
+}
+
+.icon-panel-spray:before {
+  content: "\e6ec";
+}
+
+.icon-panel-intake:before {
+  content: "\e6ef";
+}
+
+.icon-panel-heat-pad:before {
+  content: "\e6f0";
+}
+
+.icon-panel-location:before {
+  content: "\e6ab";
+}
+
+.icon-panel-weight:before {
+  content: "\e6e0";
+}
+
+.icon-panel-energy:before {
+  content: "\e6de";
+}
+
+.icon-panel-air-setting:before {
+  content: "\e6df";
+}
+
+.icon-panel-a-zu1:before {
+  content: "\e6dd";
+}
+
+.icon-panel-zhuapai2:before {
+  content: "\e6dc";
+}
+
+.icon-panel-zhuapai1:before {
+  content: "\e6db";
+}
+
+.icon-panel-zhuapai:before {
+  content: "\e6da";
+}
+
+.icon-panel-xingxing_mian:before {
+  content: "\e617";
+}
+
+.icon-panel-anti-flicker-off:before {
+  content: "\e6d9";
+}
+
+.icon-panel-left-arrow-center:before {
+  content: "\e6d8";
+}
+
 .icon-panel-v-alarm-light-siren:before {
   content: "\e6d5";
 }
@@ -209,10 +333,6 @@
   content: "\e6ac";
 }
 
-.icon-panel-a-dingweixiao:before {
-  content: "\e6ab";
-}
-
 .icon-panel-zujifenxiang:before {
   content: "\e6aa";
 }