Merge remote-tracking branch 'origin/master'

src/store/contacts/index.ts

@@ -54,9 +54,7 @@ const useContactsStore = defineStore('contacts', {
         }
     },
 
-    persist: {
-        storage: sessionStorage // 存储的类型，默认localStorage
-    }
+    persist: false
 })
 
 export default useContactsStore

src/views/remote/contacts/multiCallModel.vue

@@ -21,10 +21,11 @@ import contactsListChoose from './contactsListChoose.vue'
 import { cloneDeep } from 'lodash'
 import { videoGroup } from '@/constants/common/user'
 import useUserStore from '@/store/user'
-import {useAnyR} from "AnyR/index";
+import { useAnyR } from 'AnyR/index'
+import { CallState } from 'AnyR/constants/chatChannelRelated'
 
 const userStore = useUserStore()
-const anyR = useAnyR();
+const anyR = useAnyR()
 //选中的联系人数组id
 const chooseUserIds = ref([])
 const showModel = ref(false)
@@ -44,7 +45,7 @@ const getUserListGroup = computed(() => {
                 result[groupName] = []
             }
             //在线人员
-            if (getOnlineContacts.value.find((_item) => _item.id == item.id) && userStore.user_info.id !== item.id) {
+            if (getOnlineContacts.value.find((_item) => _item.id == item.id) && userStore.user_info.id !== item.id && item.callState == CallState.idle && item.hasCamera == 1 && item.hasMike == 1) {
                 result[groupName].push(item)
             }
             return result
@@ -52,9 +53,9 @@ const getUserListGroup = computed(() => {
 })
 //多人呼叫
 const multiCall = () => {
-    console.log(chooseUserIds.value);
-    anyR?.agora.sendCallRequest(chooseUserIds.value.join(','));
-    showModel.value = false;
+    console.log(chooseUserIds.value)
+    anyR?.agora.sendCallRequest(chooseUserIds.value.join(','))
+    showModel.value = false
 }
 defineExpose({
     open

src/views/remote/videoCall/videoTools.vue

@@ -7,6 +7,12 @@
                     <global-icon icon="mic" :size="12" color="rgb(var(--success-6))"></global-icon>
                 </div>
             </div>
+            <!-- <div class="absolute top-0 left-0 right-0 bottom-0 flex-center flex-col">
+                <div class="text-base text-theme-text1">呼叫中...</div>
+                <a-button shape="circle" status="danger" type="primary" @click="hangupCall">
+                    <global-icon :size="20" color="var(--color-bg-white)" icon="phone-hangup"></global-icon>
+                </a-button>
+            </div> -->
         </div>
         <div class="flex justify-center w-full">
             <div v-if="!isUserHost" class="w-[120px] h-[72px] item" @click="hangupCall">
@@ -53,7 +59,7 @@ import { isUserHost } from 'AnyR/states/chatChannelStates'
 import { ref } from 'vue'
 import { isCurrentUserMuted } from 'AnyR/states/chatChannelStates'
 import { screenShareMetaData } from 'AnyR/states/chatChannelStates'
-import {onMounted, onUpdated} from "vue";
+import { onMounted, onUpdated } from 'vue'
 
 const ps = defineProps<{
     id: any