inl-ui 0.1.163 → 0.1.170

package/dist/components/index.cjs

@@ -88,20 +88,20 @@ const getUserinfo = () => {
   }
 };
 const getCommonHeaders = () => {
-  const userInfo = getUserinfo();
-  const userId = getUserId();
+  getUserinfo();
+  getUserId();
   const token = getToken();
   const appId = getAppId();
-  const corpId = getCorpId();
+  getCorpId();
   const Authorization = `Bearer ${token}`;
   return {
-    userName: userInfo?.userName,
-    userId: userInfo?.userId || userId,
-    employeeName: encodeURIComponent(userInfo?.employeeName ?? ""),
-    employeeId: userInfo?.employeeId,
+    // userName: userInfo?.userName,
+    // userId: userInfo?.userId || userId,
+    // employeeName: encodeURIComponent(userInfo?.employeeName ?? ""),
+    // employeeId: userInfo?.employeeId,
     token,
     appId,
-    corpId,
+    // corpId,
     Authorization,
     "Content-Type": "application/json;charset=utf-8"
   };
@@ -17029,9 +17029,25 @@ class WebRtcMt {
   // 拉流创建播放器
   createVideo(plays) {
     this.mediaServerAddrMap.set(plays.videoElm, plays);
-    this.createRtspUrl(plays);
-    this.startPlay(plays);
-    return "success";
+    const {
+      addRtspProxyUrl
+    } = this.createRtspUrl(plays);
+    return new Promise((resolve, reject) => {
+      console.log("\u62C9\u6D41");
+      this.instance.get(addRtspProxyUrl).then(res => {
+        console.log("\u62C9\u6D41\u6210\u529F");
+        if (res.data.code === 0) {
+          plays.key = res.data.data?.key;
+          this.startPlay(plays).then(() => {
+            resolve(res.data);
+          });
+        } else {
+          this.mediaServerAddrMap.delete(plays.videoElm);
+          reject();
+          this.log("err", "\u4ECE\u670D\u52A1\u7AEF\u62C9\u6D41\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5");
+        }
+      });
+    });
   }
   log(type, text) {
     switch (type) {

package/dist/components/index.js

@@ -59,20 +59,20 @@ const getUserinfo = () => {
   }
 };
 const getCommonHeaders = () => {
-  const userInfo = getUserinfo();
-  const userId = getUserId();
+  getUserinfo();
+  getUserId();
   const token = getToken();
   const appId = getAppId();
-  const corpId = getCorpId();
+  getCorpId();
   const Authorization = `Bearer ${token}`;
   return {
-    userName: userInfo?.userName,
-    userId: userInfo?.userId || userId,
-    employeeName: encodeURIComponent(userInfo?.employeeName ?? ""),
-    employeeId: userInfo?.employeeId,
+    // userName: userInfo?.userName,
+    // userId: userInfo?.userId || userId,
+    // employeeName: encodeURIComponent(userInfo?.employeeName ?? ""),
+    // employeeId: userInfo?.employeeId,
     token,
     appId,
-    corpId,
+    // corpId,
     Authorization,
     "Content-Type": "application/json;charset=utf-8"
   };
@@ -17000,9 +17000,25 @@ class WebRtcMt {
   // 拉流创建播放器
   createVideo(plays) {
     this.mediaServerAddrMap.set(plays.videoElm, plays);
-    this.createRtspUrl(plays);
-    this.startPlay(plays);
-    return "success";
+    const {
+      addRtspProxyUrl
+    } = this.createRtspUrl(plays);
+    return new Promise((resolve, reject) => {
+      console.log("\u62C9\u6D41");
+      this.instance.get(addRtspProxyUrl).then(res => {
+        console.log("\u62C9\u6D41\u6210\u529F");
+        if (res.data.code === 0) {
+          plays.key = res.data.data?.key;
+          this.startPlay(plays).then(() => {
+            resolve(res.data);
+          });
+        } else {
+          this.mediaServerAddrMap.delete(plays.videoElm);
+          reject();
+          this.log("err", "\u4ECE\u670D\u52A1\u7AEF\u62C9\u6D41\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5");
+        }
+      });
+    });
   }
   log(type, text) {
     switch (type) {

package/dist/index.cjs

@@ -45,7 +45,7 @@ var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
 var dayjs__default = /*#__PURE__*/_interopDefaultLegacy(dayjs);
 var mqtt__default = /*#__PURE__*/_interopDefaultLegacy(mqtt);
 
-var version = "0.1.162";
+var version = "0.1.164";
 
 const setTheme = theme => {
   if (theme === "dark") {
@@ -227,20 +227,20 @@ const getUserinfo = () => {
   }
 };
 const getCommonHeaders = () => {
-  const userInfo = getUserinfo();
-  const userId = getUserId();
+  getUserinfo();
+  getUserId();
   const token = getToken();
   const appId = getAppId();
-  const corpId = getCorpId();
+  getCorpId();
   const Authorization = `Bearer ${token}`;
   return {
-    userName: userInfo?.userName,
-    userId: userInfo?.userId || userId,
-    employeeName: encodeURIComponent(userInfo?.employeeName ?? ""),
-    employeeId: userInfo?.employeeId,
+    // userName: userInfo?.userName,
+    // userId: userInfo?.userId || userId,
+    // employeeName: encodeURIComponent(userInfo?.employeeName ?? ""),
+    // employeeId: userInfo?.employeeId,
     token,
     appId,
-    corpId,
+    // corpId,
     Authorization,
     "Content-Type": "application/json;charset=utf-8"
   };
@@ -18015,9 +18015,25 @@ class WebRtcMt {
   // 拉流创建播放器
   createVideo(plays) {
     this.mediaServerAddrMap.set(plays.videoElm, plays);
-    this.createRtspUrl(plays);
-    this.startPlay(plays);
-    return "success";
+    const {
+      addRtspProxyUrl
+    } = this.createRtspUrl(plays);
+    return new Promise((resolve, reject) => {
+      console.log("\u62C9\u6D41");
+      this.instance.get(addRtspProxyUrl).then(res => {
+        console.log("\u62C9\u6D41\u6210\u529F");
+        if (res.data.code === 0) {
+          plays.key = res.data.data?.key;
+          this.startPlay(plays).then(() => {
+            resolve(res.data);
+          });
+        } else {
+          this.mediaServerAddrMap.delete(plays.videoElm);
+          reject();
+          this.log("err", "\u4ECE\u670D\u52A1\u7AEF\u62C9\u6D41\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5");
+        }
+      });
+    });
   }
   log(type, text) {
     switch (type) {

package/dist/index.d.ts

@@ -11,7 +11,7 @@ import { Key } from 'ant-design-vue/lib/table/interface';
 import * as vue_jsx_runtime from 'vue/jsx-runtime';
 import * as _ant_design_icons_vue_lib_components_IconFont from '@ant-design/icons-vue/lib/components/IconFont';
 
-var version = "0.1.162";
+var version = "0.1.164";
 
 declare const _default$p: {
     set(theme: string): void;
@@ -78,13 +78,8 @@ interface IApiInstanceConfig extends AxiosRequestConfig {
  *    keepProperty: boolean; 保留多余的属性，如createUser
  */
 declare const getCommonHeaders: () => {
-    userName: any;
-    userId: any;
-    employeeName: string;
-    employeeId: any;
     token: string;
     appId: any;
-    corpId: any;
     Authorization: string;
     "Content-Type": string;
 };

package/dist/index.js

@@ -14,7 +14,7 @@ import { XPopup, CommentBlock, setAxiosOption } from '@sszj-temp/mobile';
 import { marked } from 'marked';
 import '@sszj-temp/mobile/style.css';
 
-var version = "0.1.162";
+var version = "0.1.164";
 
 const setTheme = theme => {
   if (theme === "dark") {
@@ -196,20 +196,20 @@ const getUserinfo = () => {
   }
 };
 const getCommonHeaders = () => {
-  const userInfo = getUserinfo();
-  const userId = getUserId();
+  getUserinfo();
+  getUserId();
   const token = getToken();
   const appId = getAppId();
-  const corpId = getCorpId();
+  getCorpId();
   const Authorization = `Bearer ${token}`;
   return {
-    userName: userInfo?.userName,
-    userId: userInfo?.userId || userId,
-    employeeName: encodeURIComponent(userInfo?.employeeName ?? ""),
-    employeeId: userInfo?.employeeId,
+    // userName: userInfo?.userName,
+    // userId: userInfo?.userId || userId,
+    // employeeName: encodeURIComponent(userInfo?.employeeName ?? ""),
+    // employeeId: userInfo?.employeeId,
     token,
     appId,
-    corpId,
+    // corpId,
     Authorization,
     "Content-Type": "application/json;charset=utf-8"
   };
@@ -17984,9 +17984,25 @@ class WebRtcMt {
   // 拉流创建播放器
   createVideo(plays) {
     this.mediaServerAddrMap.set(plays.videoElm, plays);
-    this.createRtspUrl(plays);
-    this.startPlay(plays);
-    return "success";
+    const {
+      addRtspProxyUrl
+    } = this.createRtspUrl(plays);
+    return new Promise((resolve, reject) => {
+      console.log("\u62C9\u6D41");
+      this.instance.get(addRtspProxyUrl).then(res => {
+        console.log("\u62C9\u6D41\u6210\u529F");
+        if (res.data.code === 0) {
+          plays.key = res.data.data?.key;
+          this.startPlay(plays).then(() => {
+            resolve(res.data);
+          });
+        } else {
+          this.mediaServerAddrMap.delete(plays.videoElm);
+          reject();
+          this.log("err", "\u4ECE\u670D\u52A1\u7AEF\u62C9\u6D41\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5");
+        }
+      });
+    });
   }
   log(type, text) {
     switch (type) {

package/dist/utils/index.cjs

@@ -213,20 +213,20 @@ const getUserinfo = () => {
   }
 };
 const getCommonHeaders = () => {
-  const userInfo = getUserinfo();
-  const userId = getUserId();
+  getUserinfo();
+  getUserId();
   const token = getToken();
   const appId = getAppId();
-  const corpId = getCorpId();
+  getCorpId();
   const Authorization = `Bearer ${token}`;
   return {
-    userName: userInfo?.userName,
-    userId: userInfo?.userId || userId,
-    employeeName: encodeURIComponent(userInfo?.employeeName ?? ""),
-    employeeId: userInfo?.employeeId,
+    // userName: userInfo?.userName,
+    // userId: userInfo?.userId || userId,
+    // employeeName: encodeURIComponent(userInfo?.employeeName ?? ""),
+    // employeeId: userInfo?.employeeId,
     token,
     appId,
-    corpId,
+    // corpId,
     Authorization,
     "Content-Type": "application/json;charset=utf-8"
   };

package/dist/utils/index.d.ts

@@ -69,13 +69,8 @@ interface IApiInstanceConfig extends AxiosRequestConfig {
  *    keepProperty: boolean; 保留多余的属性，如createUser
  */
 declare const getCommonHeaders: () => {
-    userName: any;
-    userId: any;
-    employeeName: string;
-    employeeId: any;
     token: string;
     appId: any;
-    corpId: any;
     Authorization: string;
     "Content-Type": string;
 };

package/dist/utils/index.js

@@ -185,20 +185,20 @@ const getUserinfo = () => {
   }
 };
 const getCommonHeaders = () => {
-  const userInfo = getUserinfo();
-  const userId = getUserId();
+  getUserinfo();
+  getUserId();
   const token = getToken();
   const appId = getAppId();
-  const corpId = getCorpId();
+  getCorpId();
   const Authorization = `Bearer ${token}`;
   return {
-    userName: userInfo?.userName,
-    userId: userInfo?.userId || userId,
-    employeeName: encodeURIComponent(userInfo?.employeeName ?? ""),
-    employeeId: userInfo?.employeeId,
+    // userName: userInfo?.userName,
+    // userId: userInfo?.userId || userId,
+    // employeeName: encodeURIComponent(userInfo?.employeeName ?? ""),
+    // employeeId: userInfo?.employeeId,
     token,
     appId,
-    corpId,
+    // corpId,
     Authorization,
     "Content-Type": "application/json;charset=utf-8"
   };

package/dist/video/index.cjs

@@ -13994,9 +13994,25 @@ class WebRtcMt {
   // 拉流创建播放器
   createVideo(plays) {
     this.mediaServerAddrMap.set(plays.videoElm, plays);
-    this.createRtspUrl(plays);
-    this.startPlay(plays);
-    return "success";
+    const {
+      addRtspProxyUrl
+    } = this.createRtspUrl(plays);
+    return new Promise((resolve, reject) => {
+      console.log("\u62C9\u6D41");
+      this.instance.get(addRtspProxyUrl).then(res => {
+        console.log("\u62C9\u6D41\u6210\u529F");
+        if (res.data.code === 0) {
+          plays.key = res.data.data?.key;
+          this.startPlay(plays).then(() => {
+            resolve(res.data);
+          });
+        } else {
+          this.mediaServerAddrMap.delete(plays.videoElm);
+          reject();
+          this.log("err", "\u4ECE\u670D\u52A1\u7AEF\u62C9\u6D41\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5");
+        }
+      });
+    });
   }
   log(type, text) {
     switch (type) {

package/dist/video/index.js

@@ -13966,9 +13966,25 @@ class WebRtcMt {
   // 拉流创建播放器
   createVideo(plays) {
     this.mediaServerAddrMap.set(plays.videoElm, plays);
-    this.createRtspUrl(plays);
-    this.startPlay(plays);
-    return "success";
+    const {
+      addRtspProxyUrl
+    } = this.createRtspUrl(plays);
+    return new Promise((resolve, reject) => {
+      console.log("\u62C9\u6D41");
+      this.instance.get(addRtspProxyUrl).then(res => {
+        console.log("\u62C9\u6D41\u6210\u529F");
+        if (res.data.code === 0) {
+          plays.key = res.data.data?.key;
+          this.startPlay(plays).then(() => {
+            resolve(res.data);
+          });
+        } else {
+          this.mediaServerAddrMap.delete(plays.videoElm);
+          reject();
+          this.log("err", "\u4ECE\u670D\u52A1\u7AEF\u62C9\u6D41\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5");
+        }
+      });
+    });
   }
   log(type, text) {
     switch (type) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inl-ui",
-  "version": "0.1.163",
+  "version": "0.1.170",
   "description": "工业 pc ui库",
   "main": "dist/index.cjs",
   "module": "dist/index.js",