@ray-js/lock-sdk 1.2.0-beta.7 → 1.2.0-beta.9

package/lib/api/video.d.ts

@@ -28,4 +28,13 @@ export declare const getIPCConfig: (devId: string) => Promise<{
         hardwareCapability: number[];
     };
 }>;
+export interface MediaViewTimesResult {
+    count: number;
+}
+export declare const getMediaViewTimes: (devId: string) => Promise<MediaViewTimesResult>;
+export declare const setMediaViewTimes: (devId: string) => Promise<MediaViewTimesResult>;
+export interface getAlbumDateListResult {
+    dateList: string[];
+}
+export declare const getAlbumDateList: (devId: string) => Promise<getAlbumDateListResult>;
 export {};

package/lib/api/video.js

@@ -30,3 +30,33 @@ export const getIPCConfig = (devId) => {
         },
     });
 };
+export const getMediaViewTimes = (devId) => {
+    return requestApi({
+        logName: "getMediaViewTimes",
+        api: `${THING}.m.device.lock.media.view.times.get`,
+        version: "1.0",
+        data: {
+            devId,
+        },
+    });
+};
+export const setMediaViewTimes = (devId) => {
+    return requestApi({
+        logName: "setMediaViewTimes",
+        api: `${THING}.m.device.lock.media.view.times.set`,
+        version: "1.0",
+        data: {
+            devId,
+        },
+    });
+};
+export const getAlbumDateList = (devId) => {
+    return requestApi({
+        logName: "getAlbumDateList",
+        api: "m.lock.album.media.date.list",
+        version: "1.0",
+        data: {
+            devId,
+        },
+    });
+};

package/lib/entries/main/exports/media.d.ts

@@ -6,6 +6,10 @@ export declare function getMediaInfo(): import("../../../feature/media/media").M
 export declare function openLocalAlbum(params?: OpenLocalAlbumParams): Promise<void>;
 export declare function gotoPlayback(params?: GotoPlaybackParams): Promise<void>;
 export declare function isSupportMultiCamera(): boolean;
-export declare function getCameraInfo(): import("../../../feature/media/camera").CameraInfo | undefined;
+export declare function getCameraInfo(): import("../../../feature/media/camera").CameraDpInfo | undefined;
 export declare function queryCameraInfo(): Promise<import("../../../feature/media/camera").CameraInfo | undefined>;
 export declare function switchCamera(index: number): Promise<true>;
+export declare function getMediaViewTimes(): Promise<import("../../../api/video").MediaViewTimesResult>;
+export declare function addMediaViewTimes(): Promise<import("../../../api/video").MediaViewTimesResult>;
+export declare function getAlbumDateList(): Promise<import("../../../api/video").getAlbumDateListResult>;
+export declare function getCameraConfig(): import("../../..").CameraConfig[];

package/lib/entries/main/exports/media.js

@@ -1,7 +1,7 @@
 import { resolveRuntimeFromExportThis } from "../bootstrap/resolve-runtime-from-export-this";
-import { getMediaUrlForRuntime, isSupportMediaForRuntime, openLocalAlbumForRuntime, gotoPlaybackForRuntime, getMediaInfoForRuntime, } from "../../../feature/media/media";
+import { getMediaUrlForRuntime, isSupportMediaForRuntime, openLocalAlbumForRuntime, gotoPlaybackForRuntime, getMediaInfoForRuntime, getMediaViewTimesForRuntime, setMediaViewTimesForRuntime, getAlbumDateListForRuntime, } from "../../../feature/media/media";
 import { getMediaRotateForRuntime } from "../../../feature/media/rotate";
-import { isSupportMultiCameraForRuntime, getCameraInfoForRuntime, queryCameraInfoForRuntime, switchCameraForRuntime, } from "../../../feature/media/camera";
+import { isSupportMultiCameraForRuntime, getCameraInfoForRuntime, queryCameraInfoForRuntime, switchCameraForRuntime, getCameraConfigForRuntime, } from "../../../feature/media/camera";
 export async function getMediaUrl(params) {
     return getMediaUrlForRuntime(resolveRuntimeFromExportThis(this), params);
 }
@@ -32,3 +32,15 @@ export async function queryCameraInfo() {
 export async function switchCamera(index) {
     return switchCameraForRuntime(resolveRuntimeFromExportThis(this), index);
 }
+export async function getMediaViewTimes() {
+    return getMediaViewTimesForRuntime(resolveRuntimeFromExportThis(this));
+}
+export async function addMediaViewTimes() {
+    return setMediaViewTimesForRuntime(resolveRuntimeFromExportThis(this));
+}
+export async function getAlbumDateList() {
+    return getAlbumDateListForRuntime(resolveRuntimeFromExportThis(this));
+}
+export function getCameraConfig() {
+    return getCameraConfigForRuntime(resolveRuntimeFromExportThis(this));
+}

package/lib/feature/media/camera.d.ts

@@ -1,8 +1,18 @@
 import type { LockDeviceRuntime } from "../../runtime/LockDeviceRuntime";
-import type { DpMapDataType } from "../../interface";
+import type { CameraConfig, DpMapDataType } from "../../interface";
 import { locationSelectReportMap } from "../../config/dp-map/media";
 export type CameraInfo = DpMapDataType<typeof locationSelectReportMap>;
 export declare const isSupportMultiCameraForRuntime: (runtime: LockDeviceRuntime) => boolean;
-export declare const getCameraInfoForRuntime: (runtime: LockDeviceRuntime) => CameraInfo | undefined;
+interface CameraItem {
+    index: number;
+    type: number;
+}
+export interface CameraDpInfo {
+    status: number;
+    list: CameraItem[];
+}
+export declare const getCameraInfoForRuntime: (runtime: LockDeviceRuntime) => CameraDpInfo | undefined;
 export declare const queryCameraInfoForRuntime: (runtime: LockDeviceRuntime) => Promise<CameraInfo | undefined>;
 export declare const switchCameraForRuntime: (runtime: LockDeviceRuntime, index: number) => Promise<true>;
+export declare const getCameraConfigForRuntime: (runtime: LockDeviceRuntime) => CameraConfig[];
+export {};

package/lib/feature/media/camera.js

@@ -31,3 +31,6 @@ export const switchCameraForRuntime = async (runtime, index) => {
             throw getError(1104);
     }
 };
+export const getCameraConfigForRuntime = (runtime) => {
+    return runtime.config.cameraConfig;
+};

package/lib/feature/media/media.d.ts

@@ -1,4 +1,5 @@
 import type { LockDeviceRuntime } from "../../runtime/LockDeviceRuntime";
+import { MediaViewTimesResult, getAlbumDateListResult } from "../../api/video";
 export interface GetMediaUrlParams {
     mediaPath: string;
     mediaBucket: string;
@@ -35,3 +36,6 @@ export interface MediaInfo {
     isTwoWayTalk: boolean;
 }
 export declare const getMediaInfoForRuntime: (runtime: LockDeviceRuntime) => MediaInfo;
+export declare const getMediaViewTimesForRuntime: (runtime: LockDeviceRuntime) => Promise<MediaViewTimesResult>;
+export declare const setMediaViewTimesForRuntime: (runtime: LockDeviceRuntime) => Promise<MediaViewTimesResult>;
+export declare const getAlbumDateListForRuntime: (runtime: LockDeviceRuntime) => Promise<getAlbumDateListResult>;

package/lib/feature/media/media.js

@@ -4,6 +4,7 @@ import dpCodes from "../../config/dp-code";
 import { RotateType, VedioType } from "../../constant";
 import { isSupportShortLink } from "../../platform";
 import { getError } from "../../utils/errors";
+import { getMediaViewTimes, setMediaViewTimes, getAlbumDateList, } from "../../api/video";
 export const getMediaUrlForRuntime = async (runtime, params) => {
     const devId = runtime.config.devInfo.devId;
     if ("mediaPath" in params && "mediaBucket" in params) {
@@ -85,3 +86,12 @@ export const getMediaInfoForRuntime = (runtime) => {
         isTwoWayTalk: runtime.config.isTwoWayTalk,
     };
 };
+export const getMediaViewTimesForRuntime = (runtime) => {
+    return getMediaViewTimes(runtime.config.devInfo.devId);
+};
+export const setMediaViewTimesForRuntime = (runtime) => {
+    return setMediaViewTimes(runtime.config.devInfo.devId);
+};
+export const getAlbumDateListForRuntime = (runtime) => {
+    return getAlbumDateList(runtime.config.devInfo.devId);
+};

package/lib/feature/state/init-state.js

@@ -39,9 +39,10 @@ export const initState = async (runtime) => {
                 isSupportVideo,
             },
         });
-        const [, , rotateInfo, deviceSkill, ipcConfig] = await Promise.allSettled([
+        const [, , , rotateInfo, deviceSkill, ipcConfig] = await Promise.allSettled([
             updateOnlineType(runtime),
             getCurrentUserForRuntime(runtime),
+            fetchDeviceProperties(runtime),
             isSupportVideo
                 ? getDataWithPreFetchForRuntime(runtime, "getRotate", () => getRotateInfo(devId))
                 : Promise.resolve({
@@ -84,8 +85,8 @@ export const initState = async (runtime) => {
                 }
                 else {
                     try {
-                        const modeRes = await ipc.getCurrentSupportedTalkMode(devId);
                         runtime.config.supportTalk = true;
+                        const modeRes = await ipc.getCurrentSupportedTalkMode(devId);
                         runtime.config.isTwoWayTalk = modeRes.talkbackMode === 2;
                         sdkLog("info", "initState", "supportTalk", {
                             devId,
@@ -99,7 +100,7 @@ export const initState = async (runtime) => {
                         sdkLog("error", "initState", "supportTalk", {
                             devId,
                             duration: Date.now() - startedAt,
-                            data: {},
+                            error: e,
                         });
                     }
                 }
@@ -111,7 +112,6 @@ export const initState = async (runtime) => {
                 runtime.config.mediaHeight = temp;
             }
         }
-        await fetchDeviceProperties(runtime);
         sdkLog("info", "initState", "ready", {
             devId,
             duration: Date.now() - startedAt,

package/lib/feature/state/remote-permissions.js

@@ -10,10 +10,12 @@ var DeviceProperties;
 (function (DeviceProperties) {
     DeviceProperties["REMOTE_UNLOCK_AUTH"] = "REMOTE_UNLOCK_AUTH";
     DeviceProperties["UNLOCK_PHONE_REMOTE"] = "UNLOCK_PHONE_REMOTE";
+    DeviceProperties["LOCK_POS_ROT_ANGLE"] = "LOCK_POS_ROT_ANGLE";
 })(DeviceProperties || (DeviceProperties = {}));
 const propsList = [
     DeviceProperties.REMOTE_UNLOCK_AUTH,
     DeviceProperties.UNLOCK_PHONE_REMOTE,
+    DeviceProperties.LOCK_POS_ROT_ANGLE,
 ];
 export async function fetchDeviceProperties(runtime, isForce) {
     let result = null;
@@ -27,4 +29,18 @@ export async function fetchDeviceProperties(runtime, isForce) {
         result[DeviceProperties.UNLOCK_PHONE_REMOTE] === "true";
     runtime.config.remoteOpenPermission =
         permissions[+result[DeviceProperties.REMOTE_UNLOCK_AUTH] || 0];
+    if (result[DeviceProperties.LOCK_POS_ROT_ANGLE]) {
+        try {
+            const data = JSON.parse(result[DeviceProperties.LOCK_POS_ROT_ANGLE]);
+            runtime.config.cameraConfig = data.map((item) => ({
+                isVR: !!item.vr,
+                width: item.w,
+                height: item.h,
+                rotate: item.al,
+                localtion: item.p,
+            }));
+        }
+        catch (e) {
+        }
+    }
 }

package/lib/interface.d.ts

@@ -402,4 +402,11 @@ export interface AIReportPopup {
     reportId: string;
     yearMonth: number;
 }
+export interface CameraConfig {
+    isVR: boolean;
+    width: number;
+    height: number;
+    rotate: number;
+    localtion: number;
+}
 export {};

package/lib/runtime/lock-config.d.ts

@@ -1,5 +1,5 @@
 import { ProductCommunicationType, RemotePermissionType } from "../constant";
-import { CapabilityInfo, DeviceInfo, DeviceStatus, DpSchema } from "../interface";
+import { CameraConfig, CapabilityInfo, DeviceInfo, DeviceStatus, DpSchema } from "../interface";
 export type LockConfigState = {
     devInfo: DeviceInfo;
     dpSchema: Record<string, DpSchema>;
@@ -23,6 +23,7 @@ export type LockConfigState = {
     preFetch: boolean;
     supportTalk: boolean;
     isTwoWayTalk: boolean;
+    cameraConfig: CameraConfig[];
 };
 export declare function createDefaultDeviceStatus(): DeviceStatus;
 export declare function createLockConfigState(): LockConfigState;

package/lib/runtime/lock-config.js

@@ -33,5 +33,6 @@ export function createLockConfigState() {
         preFetch: false,
         supportTalk: false,
         isTwoWayTalk: false,
+        cameraConfig: [],
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/lock-sdk",
-  "version": "1.2.0-beta.7",
+  "version": "1.2.0-beta.9",
   "files": [
     "lib",
     "LICENSE.md"