ucservice 2.4.7 → 2.4.9

package/dist/ucservice.common.js

@@ -15449,7 +15449,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
                 },
                 error: function (error) {
                   if (error.name == 'NotAllowedError') {
-                    alert('请检查PC设备的摄像头和麦克风并允许浏览器使用它们，以便进行视频通话。');
+                    alert('请检查PC设备的麦克风并允许浏览器使用它们，以便进行视频通话。');
                   }
 
                   console.error('incomingcall', error); // let body = { "request": "decline", "code": 480 };
@@ -32742,17 +32742,36 @@ const meetOp = sip => {
     },
     end: function (param) {
       let net = meet_url.endMeetNet;
-      return new Promise((resolve, reject) => {
+      let async = true;
+
+      if (Object.keys(param).includes('async')) {
+        async = param.async;
+      }
+
+      if (async) {
+        return new Promise((resolve, reject) => {
+          loadJson(server_ + net.url, { ...param
+          }, function (ret) {
+            if (ret.code == 0) {
+              resolve(ret);
+            } else {
+              console.log("结束会议失败", ret.code);
+              reject(ret.code);
+            }
+          }, '', net.method);
+        });
+      } else {
+        // 同步
+        delete param.async;
         loadJson(server_ + net.url, { ...param
         }, function (ret) {
           if (ret.code == 0) {
-            resolve(ret);
+            console.log("结束会议成功");
           } else {
             console.log("结束会议失败", ret.code);
-            reject(ret.code);
           }
-        }, '', net.method);
-      });
+        }, async, net.method);
+      }
     },
     joinVideo: function (param) {
       let net = meet_url.joinVideoMemberNet;
@@ -32798,17 +32817,36 @@ const meetOp = sip => {
     },
     destroyRoom: function (param) {
       let net = meet_url.destroyMeetNet;
-      return new Promise((resolve, reject) => {
+      let async = true;
+
+      if (Object.keys(param).includes('async')) {
+        async = param.async;
+      }
+
+      if (async) {
+        return new Promise((resolve, reject) => {
+          loadJson(server_ + net.url, { ...param
+          }, function (ret) {
+            if (ret.code == 0) {
+              resolve(ret);
+            } else {
+              console.log("销毁会议会场失败", ret.code);
+              reject(ret.code);
+            }
+          }, '', net.method);
+        });
+      } else {
+        // 同步
+        delete param.async;
         loadJson(server_ + net.url, { ...param
         }, function (ret) {
           if (ret.code == 0) {
-            resolve(ret);
+            console.log("销毁会议会场成功");
           } else {
             console.log("销毁会议会场失败", ret.code);
-            reject(ret.code);
           }
-        }, '', net.method);
-      });
+        }, async, net.method);
+      }
     },
     changeMemberStatus: function (param) {
       let net = meet_url.changeMemeberLevelNet;