|
@@ -297,11 +297,11 @@ export default {
|
|
wx.showModal({
|
|
wx.showModal({
|
|
content: result.error,
|
|
content: result.error,
|
|
complete: () => {
|
|
complete: () => {
|
|
- if(result.message && result.message.isAnchor == 0){
|
|
|
|
|
|
+ if (result.message && result.message.isAnchor == 0) {
|
|
wx.switchTab({
|
|
wx.switchTab({
|
|
url: '/pages/index/index',
|
|
url: '/pages/index/index',
|
|
})
|
|
})
|
|
- }else{
|
|
|
|
|
|
+ } else {
|
|
wx.redirectTo({
|
|
wx.redirectTo({
|
|
url: '/pages/roomManger/roomManger',
|
|
url: '/pages/roomManger/roomManger',
|
|
});
|
|
});
|
|
@@ -364,7 +364,7 @@ export default {
|
|
|
|
|
|
|
|
|
|
// console.log('当前用户录音权限状态', isAuthMic)
|
|
// console.log('当前用户录音权限状态', isAuthMic)
|
|
-
|
|
|
|
|
|
+
|
|
this.setData({
|
|
this.setData({
|
|
isAllowMic,
|
|
isAllowMic,
|
|
isAuthMic
|
|
isAuthMic
|
|
@@ -571,6 +571,22 @@ export default {
|
|
roomMaximum: true
|
|
roomMaximum: true
|
|
})
|
|
})
|
|
});
|
|
});
|
|
|
|
+ //被动通知开关MIC
|
|
|
|
+ socket.on('serverOnMic', ({
|
|
|
|
+ voiceStatus
|
|
|
|
+ }) => {
|
|
|
|
+ setTimeout(() => {
|
|
|
|
+ if (Number(voiceStatus) === 2) {
|
|
|
|
+
|
|
|
|
+ this.openMic();
|
|
|
|
+ }
|
|
|
|
+ if (Number(voiceStatus) === 0) {
|
|
|
|
+
|
|
|
|
+ this.closeMic();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }, 1000)
|
|
|
|
+ })
|
|
|
|
|
|
this.socketStop = () => {
|
|
this.socketStop = () => {
|
|
if (socket) {
|
|
if (socket) {
|