@ray-js/ray-ipc-player 2.0.20-beta-2 → 2.0.20-beta-4

package/lib/index.module.less

@@ -28,11 +28,7 @@
   z-index: 350;
 }
 
-.state_label {
-  text-align: center;
-  font-size: 0.28rem;
-  color: rgba(255, 255, 255, 0.5);
-}
+
 
 :root {
   --video-bg: #0D0D0D;
@@ -148,4 +144,94 @@
   -webkit-mask-image: url('data:image/png;base64,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');
   -webkit-mask-size: cover;
   -webkit-mask-repeat: no-repeat;
-}
+}
+
+.errorContainer {
+  text-align: center;
+  font-size: 12px;
+  padding: 0 16px;
+  word-break: break-all;
+
+  .errIconContainer {
+    .errIcon {
+      background-image: url('./svg/errIcon.svg');
+      width: 38px;
+      height: 38px;
+      background-size: contain;
+      background-repeat: no-repeat;
+      -webkit-mask-image: url('./svg/errIcon.svg');
+      -webkit-mask-repeat: no-repeat;
+      -webkit-mask-size: contain;
+      mask-image: url('./svg/errIcon.svg');
+      mask-repeat: no-repeat;
+      mask-size: contain;
+      background-color: #ffffff; /* 指定颜色 */
+      margin-bottom: 15px;
+    }
+  }
+
+  .errTextContainer {
+    .errContent {
+      color: #ffffff;
+      font-size: 24rpx;
+      font-weight: 400;
+    }
+    .errDesc {
+      margin-top: 10rpx;
+      color: rgba(255,255,255,0.7);
+      font-size: 24rpx;
+      font-weight: 400;
+    }
+  }
+  
+  .errOperatorContainer {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    margin-top: 15px;
+    .operatorBtn {
+      font-size: 14px;
+      font-weight: 400;
+      min-height: 36px;
+      box-sizing: border-box;
+      border-radius: 30px;
+      overflow: hidden;
+      min-width: 104px;
+      max-width: 200px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      color: #ffffff;
+      margin: 0 4px;
+      text-overflow: ellipsis;
+      padding: 8px 16px;
+    }
+    .operatorBtn:hover {
+      opacity: 0.9;
+    }
+    .operatorBtn:active {
+      opacity: 1;
+    }
+    .operatorBtn:first-of-type {
+      margin-right: 4px;
+      margin-left: 0;
+    }
+    .operatorBtn:last-of-type {
+      margin-left: 4px;
+      margin-right: 0;;
+    }
+    .operatorBtn:only-of-type{
+      margin: 0
+    }
+    .operatorRetry {
+      background-color: red;
+    }
+    .operatorHelp {
+      background-color: #252525;
+    }
+     .operatorFeedBack {
+      background-color: #252525;
+     }
+  }
+}
+

package/lib/svg/errIcon.svg

@@ -0,0 +1,7 @@
+<svg width="38px" height="38px" viewBox="0 0 38 38" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g id="errIcon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="errIcon" transform="translate(3.000000, 3.000000)" fill="#FFFFFF">
+            <path d="M11.9536398,14.4064773 L12.0797001,14.5236 L12.8944001,15.3383 L12.0797001,16.1529 L11.2651001,15.3383 C10.8473358,14.9205357 10.1884879,14.8906954 9.7363151,15.2487791 L9.63584013,15.3383 L1.48950013,23.4846 C1.07172655,23.9023643 1.04188558,24.5612122 1.39997722,25.0134171 L1.48950013,25.1139 L7.19194013,30.8163 C7.60970441,31.2340643 8.26850926,31.2639046 8.72071592,30.9058209 L8.82120013,30.8163 L16.9675001,22.67 C17.3853573,22.2522357 17.4152042,21.5933878 17.0570409,21.1411829 L16.9675001,21.0407 L16.1529001,20.2261 L16.9675001,19.4114 L17.7822001,20.2261 C18.6411001,21.085 18.680141,22.4533279 17.8993229,23.3585395 L17.7822001,23.4846 L9.63584013,31.6309 C8.77692103,32.4898955 7.40859227,32.5289407 6.50336321,31.7480357 L6.37730013,31.6309 L0.674864125,25.9285 C-0.184054966,25.0696 -0.22309492,23.7012721 0.557739913,22.7960605 L0.674865125,22.67 L8.82121013,14.5236 C9.63718326,13.707645 10.912874,13.6316128 11.8145068,14.2955035 L11.9536398,14.4064773 Z M20.6334001,20.0573 C20.9515001,20.0573 21.2094001,20.3152 21.2094001,20.6334 L21.2094001,23.8919 C21.2094001,24.21 20.9515001,24.4679 20.6334001,24.4679 C20.3152001,24.4679 20.0573001,24.21 20.0573001,23.8919 L20.0573001,20.6334 C20.0573001,20.3152 20.3152001,20.0573 20.6334001,20.0573 Z M25.1139001,18.8354 C25.4320001,18.8354 25.6899001,19.0933 25.6899001,19.4114 C25.6899001,19.7296 25.4320001,19.9875 25.1139001,19.9875 L21.8553001,19.9875 C21.5372001,19.9875 21.2793001,19.7296 21.2793001,19.4114 C21.2793001,19.0933 21.5372001,18.8354 21.8553001,18.8354 L25.1139001,18.8354 Z M15.7456001,16.5602 C15.9456001,16.7602 15.9678223,17.0705802 15.8122668,17.295039 L15.7456001,17.3748 L14.1163001,19.0041 C13.8914001,19.2291 13.5267001,19.2291 13.3017001,19.0041 C13.101789,18.8041889 13.0794977,18.4937395 13.2350368,18.2692643 L13.3017001,18.1895 L14.9310001,16.5602 C15.1559001,16.3353 15.5207001,16.3353 15.7456001,16.5602 Z M25.9285001,0.674864 L31.6310001,6.3773 C32.5308001,7.27712 32.5308001,8.73602 31.6310001,9.63584 L23.4846001,17.7822 C22.5848001,18.682 21.1259001,18.682 20.2261001,17.7822 L19.4115001,16.9676 L20.2261001,16.1529 L21.0407001,16.9675 C21.4907001,17.4175 22.2201001,17.4175 22.6700001,16.9675 L30.8163001,8.8212 C31.2663001,8.37129 31.2663001,7.64184 30.8163001,7.19193 L25.1139001,1.4895 C24.6640001,1.03959 23.9346001,1.03959 23.4846001,1.4895 L15.3383001,9.63584 C14.8884001,10.0857 14.8884001,10.8152 15.3383001,11.2651 L16.1529001,12.0797 L15.3383001,12.8944 L14.5237001,12.0797 C13.6238001,11.1799 13.6238001,9.72103 14.5237001,8.82121 L22.6700001,0.674866 C23.5698001,-0.224954 25.0287001,-0.224956 25.9285001,0.674864 Z M19.0042001,13.3017 C19.2291001,13.5266 19.2291001,13.8913 19.0042001,14.1163 L17.3749001,15.7456 C17.1499001,15.9705 16.7852001,15.9705 16.5603001,15.7456 C16.3353001,15.5206 16.3353001,15.1559 16.5603001,14.9309 L18.1895001,13.3017 C18.4145001,13.0767 18.7792001,13.0767 19.0042001,13.3017 Z M11.0352001,12.1192 C11.3533001,12.1147 11.6148001,12.369 11.6193001,12.6871 C11.6232601,12.97339 11.4177541,13.213834 11.1447184,13.2623404 L11.0514001,13.2712 L7.79318013,13.3171 C7.47508013,13.3216 7.21357013,13.0673 7.20909013,12.7492 C7.20505813,12.46291 7.41058123,12.222466 7.68362836,12.1739596 L7.77695013,12.1651 L11.0352001,12.1192 Z M12.1938001,7.62194 C12.4800901,7.617899 12.7205341,7.8234293 12.7690405,8.09647796 L12.7779001,8.1898 L12.8238001,11.448 C12.8283001,11.7661 12.5741001,12.0276 12.2560001,12.0321 C11.9697101,12.03615 11.7292661,11.830572 11.6807597,11.557521 L11.6719001,11.4642 L11.6260001,8.20603 C11.6215001,7.88793 11.8757001,7.62642 12.1938001,7.62194 Z" id="形状"></path>
+        </g>
+    </g>
+</svg>

package/lib/svg/index.d.ts

@@ -0,0 +1,2 @@
+declare const _default: {};
+export default _default;

package/lib/svg/index.js

@@ -0,0 +1 @@
+export default {};

package/lib/utils.d.ts

@@ -1,4 +1,3 @@
-export declare const putDpData: (dpIds: Record<number, boolean>, deviceId?: string) => Promise<unknown>;
 /**
  * 获取当前是否Connected （p2p连接状态）
  * @param ipcCtx
@@ -11,3 +10,33 @@ export declare const getIsConnected: (ipcCtx: any) => Promise<unknown>;
  * @returns
  */
 export declare const getIsOnPreview: (ipcCtx: any) => Promise<unknown>;
+/**
+ * RN跳转小程序通过shortLink
+ */
+export declare const openTargetMinByShortLink: (url: string, position?: string) => boolean;
+/**
+ * 针对多语言code进行分割
+ */
+export declare const splitLanguage: (s: string) => string;
+/**
+ * 获取当前语言类型
+ */
+export declare const getLanguage: () => Promise<string>;
+/**
+ * 获取设备信息
+ */
+export declare const getDeviceInfo: (devId: string) => Promise<any>;
+/**
+ * 获取家庭信息
+ */
+export declare const getHomeInfo: () => Promise<{
+    [key: string]: any;
+}>;
+/**
+ * 根据dpCode获取DpId
+ */
+export declare const getDpIdByDpCode: (devId: string, code: string) => Promise<number>;
+/**
+ * TTT能力写入App日志
+ */
+export declare const ipcTTTOperatorLog: (ipcLogString: string) => void;

package/lib/utils.js

@@ -1,21 +1,10 @@
-export const putDpData = (dpIds, deviceId) => {
-  return new Promise((resolve, reject) => {
-    ty.device.publishDps({
-      deviceId: deviceId,
-      mode: 2,
-      pipelines: [],
-      options: {},
-      dps: dpIds,
-      success: res => resolve(res),
-      fail: e => reject(e)
-    });
-  });
-};
-
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.find.js";
+import { getLangKey, device, home, navigateToMiniProgram, getDpsInfos } from '@ray-js/ray';
 /**
  * 获取当前是否Connected （p2p连接状态）
- * @param ipcCtx 
- * @returns 
+ * @param ipcCtx
+ * @returns
  */
 export const getIsConnected = ipcCtx => {
   return new Promise(resolve => {
@@ -38,8 +27,8 @@ export const getIsConnected = ipcCtx => {
 
 /**
  * 获取当前是否已经在拉流状态
- * @param ipcCtx 
- * @returns 
+ * @param ipcCtx
+ * @returns
  */
 export const getIsOnPreview = ipcCtx => {
   return new Promise(resolve => {
@@ -58,4 +47,109 @@ export const getIsOnPreview = ipcCtx => {
       resolve(false);
     }
   });
+};
+
+/**
+ * RN跳转小程序通过shortLink
+ */
+export const openTargetMinByShortLink = function (url) {
+  let position = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'bottom';
+  navigateToMiniProgram({
+    shortLink: url,
+    position
+  });
+  return false;
+};
+
+/**
+ * 针对多语言code进行分割
+ */
+export const splitLanguage = s => {
+  if (s.includes('-')) {
+    return s.split('-')[0];
+  }
+  if (s.includes('_')) {
+    return s.split('_')[0];
+  }
+  return s;
+};
+
+/**
+ * 获取当前语言类型
+ */
+export const getLanguage = () => {
+  return new Promise(resolve => {
+    getLangKey({
+      success: res => {
+        if (res) resolve(splitLanguage(res.langKey));else resolve('en');
+      },
+      fail: () => {
+        resolve('en');
+      }
+    });
+  });
+};
+
+/**
+ * 获取设备信息
+ */
+export const getDeviceInfo = devId => {
+  const {
+    getDeviceInfo
+  } = device;
+  return new Promise(resolve => {
+    getDeviceInfo({
+      deviceId: devId,
+      success: res => {
+        resolve(res);
+      },
+      fail: () => {
+        resolve({});
+      }
+    });
+  });
+};
+
+/**
+ * 获取家庭信息
+ */
+export const getHomeInfo = () => {
+  const {
+    getCurrentHomeInfo
+  } = home;
+  return new Promise(resolve => {
+    getCurrentHomeInfo({
+      success: res => {
+        resolve(res);
+      },
+      fail: () => {
+        resolve({});
+      }
+    });
+  });
+};
+
+/**
+ * 根据dpCode获取DpId
+ */
+export const getDpIdByDpCode = async (devId, code) => {
+  var _dpInfo$find;
+  const dpInfo = await getDpsInfos({
+    devId,
+    gwId: devId
+  });
+  return ((_dpInfo$find = dpInfo.find(item => item.code === code)) === null || _dpInfo$find === void 0 ? void 0 : _dpInfo$find.dpId) || -1;
+};
+
+/**
+ * TTT能力写入App日志
+ */
+export const ipcTTTOperatorLog = ipcLogString => {
+  try {
+    ty.ipc.ipcTTTOperatorLog({
+      ipcLogString
+    });
+  } catch (err) {
+    console.log('ipcTTTOperatorLog error', err);
+  }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ray-ipc-player",
-  "version": "2.0.20-beta-2",
+  "version": "2.0.20-beta-4",
   "description": "ray小程序播放器",
   "keywords": [
     "tuya-miniapp",