..

apis/interfaces/im.js

@@ -323,6 +323,7 @@ export {
     dismissGroup,
     inviteGroupUser,
     removeGroupUser,
+    transferGroupOwner,
     setGroupAdmin,
     removeGroupAdmin,
     groupMakeSure, //  通过审核

pages/im/components/groupUserList.vue

@@ -105,6 +105,9 @@
                 this.actionShow = false
             },
             showAction(item) {
+                if (item.is_admin == 2) {
+                    return
+                }
                 this.currentUser = item
                 this.actionTitle = item.name
                 // 只有管理员以上才会弹窗

pages/im/components/sent/sentText.vue

@@ -72,11 +72,10 @@
         display: flex;
         flex-direction: row;
         justify-content: space-between;
-
         .input {
             background: #F3F6FB;
             height: 70rpx;
-            width: 500rpx;
+            width: 460rpx;
             border-radius: 10rpx;
             margin-right: 15rpx;
             padding: 0 20rpx;

pages/im/components/sent/sentVoice.vue

@@ -3,11 +3,17 @@
         <view class="voice" hover-class="chat-hover" @touchstart="startRecord" @touchend="stopRecord">
             <text class="button">按住说话</text>
         </view>
-        <!-- 录音中提示 -->
+        <!-- 录音中 -->
         <view class="modal" v-if="showRecordTip">
             <image class="icon" src="@/static/icon/record-icon.png" mode="widthFix"></image>
             <text class="text">录音中 {{recordTime}} s</text>
         </view>
+        <!-- 录音完成发送或取消 -->
+        <view class="lay" v-if="showConfirm">
+            <view class="item red" @click="()=> { this.mp3AudioSrc = null, this.showConfirm = false }">取消</view>
+            <view class="item" @click="startPlay">试听</view>
+            <view class="item greed" @click="this.senVoice">发送</view>
+        </view>
     </view>
 </template>
 
@@ -33,16 +39,32 @@
         data() {
             return {
                 showRecordTip: false,
+                showConfirm: false,
                 recordTime: 60,
                 interval: 0,
                 maxRecordTime: 60,
-                recorderManager: null
+                recorderManager: null,
+                mp3AudioSrc: null,
+                isBetaPlay: false
+            }
+        },
+        computed: {
+            sender() {
+                return this.$store.getters.sender
             }
         },
         created() {
             this.recorderManager = uni.getRecorderManager()
         },
         methods: {
+            onShowLay(){
+                // this.showRecordTip = true
+                uni.vibrateShort({
+                    complete: com => {
+                        console.log(com)
+                    }
+                })
+            },
             // 检查安卓录制权限
             async getAndroidPermission() {
                 return await permision.requestAndroidPermission('android.permission.RECORD_AUDIO')
@@ -79,20 +101,62 @@
             // 结束录音
             stopRecord(e) {
                 if (!this.showRecordTip) return
-                this.recorderManager.stop()
+                // 延迟500毫秒结束录音
-                clearInterval(this.interval)
+                setTimeout(()=> {
-                // 监听录音结束
+                    this.recorderManager.stop()
-                this.recorderManager.onStop(res => {
+                    clearInterval(this.interval)
-                    im.sentVoice(this.conversationType, this.targetId, res.tempFilePath, (this.maxRecordTime -
+                    // 监听录音结束
-                        this.recordTime), this.sender, () => {
+                    this.recorderManager.onStop(res => {
-                        setTimeout(() => {
+                        console.log(res)
-                            this.$emit('success')
+                        this.mp3AudioSrc = res.tempFilePath
-                        }, 500)
+                        this.showConfirm = true
+                        this.showRecordTip = false
                     })
+                },500)
+            },
+            // 发送语音消息
+            senVoice(){
+                if(this.mp3AudioSrc === null) {
+                    uni.showToast({
+                        title: '发送失败, 暂无音频信息',
+                        icon : 'none'
+                    })
+                    return
+                }
+                im.sentVoice(this.conversationType, this.targetId, this.mp3AudioSrc, (this.maxRecordTime -
+                    this.recordTime), this.sender, () => {
                     this.recordTime = this.maxRecordTime
-                    this.showRecordTip = false
+                    this.mp3AudioSrc = null
+                    this.showConfirm = false
+                    setTimeout(() => {
+                        this.$emit('success')
+                    }, 500)
                 })
             },
+            // 试听语音
+            startPlay() {
+                let betaAudio = uni.createInnerAudioContext()
+                betaAudio.src = this.mp3AudioSrc;
+                // 在播放中
+                if(this.isBetaPlay){
+                    betaAudio.stop()
+                    betaAudio.onStop(() => {
+                        this.isBetaPlay = false;
+                        betaAudio.destroy()
+                    })
+                    return
+                }
+                // 监听音频播放中
+                betaAudio.play()
+                betaAudio.onPlay(() => {
+                    this.isBetaPlay = true;
+                })
+                // 监听音频结束
+                betaAudio.onEnded(() => {
+                    this.isBetaPlay = false;
+                    betaAudio.destroy()
+                })
+            }
         }
     }
 </script>
@@ -115,6 +179,37 @@
                 color: #333;
             }
         }
+        .lay{
+            position: absolute;
+            left: 0;
+            bottom: 0;
+            z-index: 9;
+            background: rgba($color: #000000, $alpha: .5);
+            height: 100vh;
+            width: 100vw;
+            padding: 20vh 30rpx;
+            box-sizing: border-box;
+            display: flex;
+            justify-content: space-around;
+            align-items: flex-end;
+            flex-direction: row;
+            .item{
+                height: 140rpx;
+                width: 140rpx;
+                text-align: center;
+                line-height: 140rpx;
+                border-radius: 50%;
+                background-color: white;
+                &.red{
+                    background: #e6576b;
+                    color: white;
+                }
+                &.greed{
+                    background: #34CE98;
+                    color: white;
+                }
+            }
+        }
 
         .modal {
             display: flex;

utils/im/listeners.js

@@ -55,8 +55,7 @@ const notifyMsgTypes = [
     IMLib.ObjectName.Location,
     IMLib.ObjectName.Voice,
     IMLib.ObjectName.HQVoice,
-    IMLib.ObjectName.Sight,
+    IMLib.ObjectName.Sight
-    IMLib.ObjectName.GroupNotification
 ]
 
 const imLibListeners = () => {
@@ -68,7 +67,7 @@ const imLibListeners = () => {
     // 添加消息监听函数
     IMLib.addReceiveMessageListener((res) => {
         const message = res.data.message
-        console.error('[收到消息]', message)
+        console.error('[收到消息]',IMLib.ObjectName.GroupNotification, message)
         checkContactExists(message)
         if (utils.inArray(message.objectName, notifyMsgTypes)) {
             onReceiveMessage(message)
@@ -84,6 +83,7 @@ const imLibListeners = () => {
             uni.$emit('onNewContactFriends', message)
             uni.$emit('onNewContactPendings', message)
         } else if (message.objectName === IMLib.ObjectName.GroupNotification) {
+            console.log('踢出用户',message);
             // 解散群
             if (message.content.operation === 'Dismiss') {
                 IMLib.cleanHistoryMessages(message.conversationType, message.targetId, message.sentTime,
@@ -94,6 +94,7 @@ const imLibListeners = () => {
                 uni.$emit('onGroupDismiss')
                 uni.$emit('onGroupDismiss_' + message.targetId)
             } else if (message.content.operation === 'REMOVE') {
+                console.log('踢出', message.content);
                 // 要判断是否当前用户，然后把当前用户踢出到主页去， 删除聊天记录，会话列表
                 if (message.content.extra == store.getters.sender.userId) {
                     IMLib.cleanHistoryMessages(message.conversationType, message.targetId, message.sentTime,