修改版本
This commit is contained in:
@@ -22,6 +22,7 @@
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
/** 语音通话状态 */
|
/** 语音通话状态 */
|
||||||
const isType = computed(() => props.type === '0')
|
const isType = computed(() => props.type === '0')
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
{
|
{
|
||||||
"name" : "密谈IM",
|
"name" : "密谈IM",
|
||||||
"appid" : "__UNI__BE00EFC",
|
"appid" : "__UNI__D40A151",
|
||||||
"description" : "",
|
"description" : "",
|
||||||
"versionName" : "1.1.2",
|
"versionName" : "1.1.3",
|
||||||
"versionCode" : 111,
|
"versionCode" : 112,
|
||||||
"transformPx" : false,
|
"transformPx" : false,
|
||||||
/* 5+App特有相关 */
|
/* 5+App特有相关 */
|
||||||
"app-plus" : {
|
"app-plus" : {
|
||||||
@@ -112,13 +112,27 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nativePlugins" : {
|
"nativePlugins" : {
|
||||||
|
"RongCloud-Beauty" : {
|
||||||
|
"__plugin_info__" : {
|
||||||
|
"name" : "RCUniBeauty",
|
||||||
|
"description" : "融云基础版美颜插件,服务于 RCUniRtc 或 RCUniCall",
|
||||||
|
"platforms" : "Android,iOS",
|
||||||
|
"url" : "https://ext.dcloud.net.cn/plugin?id=7982",
|
||||||
|
"android_package_name" : "",
|
||||||
|
"ios_bundle_id" : "",
|
||||||
|
"isCloud" : true,
|
||||||
|
"bought" : 1,
|
||||||
|
"pid" : "7982",
|
||||||
|
"parameters" : {}
|
||||||
|
}
|
||||||
|
},
|
||||||
"RongCloud-Call" : {
|
"RongCloud-Call" : {
|
||||||
"__plugin_info__" : {
|
"__plugin_info__" : {
|
||||||
"name" : "RCUniCall",
|
"name" : "RCUniCall",
|
||||||
"description" : "融云实时音视频 SDK uni 原生插件",
|
"description" : "融云实时音视频 SDK uni 原生插件",
|
||||||
"platforms" : "Android,iOS",
|
"platforms" : "Android,iOS",
|
||||||
"url" : "https://ext.dcloud.net.cn/plugin?id=6372",
|
"url" : "https://ext.dcloud.net.cn/plugin?id=6372",
|
||||||
"android_package_name" : "",
|
"android_package_name" : "uni.app.UNI9EFDC69WWCC",
|
||||||
"ios_bundle_id" : "",
|
"ios_bundle_id" : "",
|
||||||
"isCloud" : true,
|
"isCloud" : true,
|
||||||
"bought" : 1,
|
"bought" : 1,
|
||||||
@@ -132,27 +146,13 @@
|
|||||||
"description" : "融云即时通讯 SDK uni 原生插件V2",
|
"description" : "融云即时通讯 SDK uni 原生插件V2",
|
||||||
"platforms" : "Android,iOS",
|
"platforms" : "Android,iOS",
|
||||||
"url" : "https://ext.dcloud.net.cn/plugin?id=9227",
|
"url" : "https://ext.dcloud.net.cn/plugin?id=9227",
|
||||||
"android_package_name" : "",
|
"android_package_name" : "uni.app.UNI9EFDC69WWCC",
|
||||||
"ios_bundle_id" : "",
|
"ios_bundle_id" : "",
|
||||||
"isCloud" : true,
|
"isCloud" : true,
|
||||||
"bought" : 1,
|
"bought" : 1,
|
||||||
"pid" : "9227",
|
"pid" : "9227",
|
||||||
"parameters" : {}
|
"parameters" : {}
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"RongCloud-Beauty" : {
|
|
||||||
"__plugin_info__" : {
|
|
||||||
"name" : "RCUniBeauty",
|
|
||||||
"description" : "融云基础版美颜插件,服务于 RCUniRtc 或 RCUniCall",
|
|
||||||
"platforms" : "Android,iOS",
|
|
||||||
"url" : "https://ext.dcloud.net.cn/plugin?id=7982",
|
|
||||||
"android_package_name" : "com.audio.im",
|
|
||||||
"ios_bundle_id" : "",
|
|
||||||
"isCloud" : true,
|
|
||||||
"bought" : 1,
|
|
||||||
"pid" : "7982",
|
|
||||||
"parameters" : {}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -75,11 +75,7 @@
|
|||||||
style="width: 72rpx; height: 72rpx;"
|
style="width: 72rpx; height: 72rpx;"
|
||||||
@click="navigateTo('/pages/shop-together/user', {
|
@click="navigateTo('/pages/shop-together/user', {
|
||||||
type: 1,
|
type: 1,
|
||||||
id: currentLive.liveID,
|
id: currentLive.liveID
|
||||||
text: currentLive.liveName,
|
|
||||||
cover: currentLive.coverUrl,
|
|
||||||
avatarUrl: currentLive.liveOwner.avatarUrl
|
|
||||||
title: currentLive.liveOwner.title
|
|
||||||
})"
|
})"
|
||||||
/>
|
/>
|
||||||
<Like />
|
<Like />
|
||||||
|
|||||||
@@ -91,6 +91,11 @@
|
|||||||
></image>
|
></image>
|
||||||
</template>
|
</template>
|
||||||
<template #right>
|
<template #right>
|
||||||
|
<!-- shareDialog = true -->
|
||||||
|
<!-- navigateTo('/pages/shop-together/user', {
|
||||||
|
type: 1,
|
||||||
|
id: currentLive.liveID
|
||||||
|
}) -->
|
||||||
<image
|
<image
|
||||||
src="/static/images/public/share-icon.png"
|
src="/static/images/public/share-icon.png"
|
||||||
mode="heightFix"
|
mode="heightFix"
|
||||||
|
|||||||
@@ -6,9 +6,11 @@
|
|||||||
} from '@tencentcloud/chat-uikit-engine-lite'
|
} from '@tencentcloud/chat-uikit-engine-lite'
|
||||||
import { reactive, ref } from 'vue'
|
import { reactive, ref } from 'vue'
|
||||||
import { onLoad, onBackPress } from '@dcloudio/uni-app'
|
import { onLoad, onBackPress } from '@dcloudio/uni-app'
|
||||||
|
import { useLiveListState } from '@/uni_modules/tuikit-atomic-x/state/LiveListState'
|
||||||
import { navigateBack } from '../../utils/router'
|
import { navigateBack } from '../../utils/router'
|
||||||
import { useUI } from '../../utils/use-ui'
|
import { useUI } from '../../utils/use-ui'
|
||||||
|
import { CHAT_MSG_CUSTOM_TYPE } from '../../TUIKit/constant'
|
||||||
|
import { isEnabledMessageReadReceiptGlobal } from '../../TUIKit/components/TUIChat/utils/utils'
|
||||||
|
|
||||||
const { showLoading, hideLoading, showToast, showDialog } = useUI()
|
const { showLoading, hideLoading, showToast, showDialog } = useUI()
|
||||||
|
|
||||||
@@ -31,6 +33,9 @@
|
|||||||
title: ''
|
title: ''
|
||||||
})
|
})
|
||||||
|
|
||||||
|
/** 直播数据 */
|
||||||
|
const liveData = ref({})
|
||||||
|
|
||||||
/** 多选状态 */
|
/** 多选状态 */
|
||||||
const isMultiple = ref(false)
|
const isMultiple = ref(false)
|
||||||
/** 群列表 */
|
/** 群列表 */
|
||||||
@@ -122,6 +127,29 @@
|
|||||||
to = item.id.split('C2C')[1]
|
to = item.id.split('C2C')[1]
|
||||||
isGroup = false
|
isGroup = false
|
||||||
}
|
}
|
||||||
|
const live = liveData.value
|
||||||
|
|
||||||
|
console.log(
|
||||||
|
'===',
|
||||||
|
propsData.type == 1
|
||||||
|
? {
|
||||||
|
id: propsData.id,
|
||||||
|
businessID: CHAT_MSG_CUSTOM_TYPE.LIVE,
|
||||||
|
title: live.liveName,
|
||||||
|
cover: live.cover,
|
||||||
|
userLiveData: {
|
||||||
|
avatarUrl: live.liveOwner.avatarURL,
|
||||||
|
title: live.liveOwner.userName || live.liveOwner.userID
|
||||||
|
}
|
||||||
|
}
|
||||||
|
: {
|
||||||
|
id: propsData.id,
|
||||||
|
businessID: CHAT_MSG_CUSTOM_TYPE.GOODS,
|
||||||
|
title: propsData.text,
|
||||||
|
cover: propsData.cover,
|
||||||
|
price: propsData.price
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
const payload = {
|
const payload = {
|
||||||
data: JSON.stringify(
|
data: JSON.stringify(
|
||||||
@@ -129,11 +157,11 @@
|
|||||||
? {
|
? {
|
||||||
id: propsData.id,
|
id: propsData.id,
|
||||||
businessID: CHAT_MSG_CUSTOM_TYPE.LIVE,
|
businessID: CHAT_MSG_CUSTOM_TYPE.LIVE,
|
||||||
title: propsData.text,
|
title: live.liveName,
|
||||||
cover: propsData.cover,
|
cover: live.cover,
|
||||||
userLiveData: {
|
userLiveData: {
|
||||||
avatarUrl: propsData.avatarUrl,
|
avatarUrl: live.liveOwner.avatarURL,
|
||||||
title: propsData.title
|
title: live.liveOwner.userName || live.liveOwner.userID
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
: {
|
: {
|
||||||
@@ -165,8 +193,8 @@
|
|||||||
await Promise.all(requests)
|
await Promise.all(requests)
|
||||||
hideLoading()
|
hideLoading()
|
||||||
await showToast('分享成功', 'success')
|
await showToast('分享成功', 'success')
|
||||||
isShow.value = false
|
|
||||||
navigateBack()
|
navigateBack()
|
||||||
|
isShow.value = false
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -192,13 +220,18 @@
|
|||||||
await sendCustomData(item)
|
await sendCustomData(item)
|
||||||
hideLoading()
|
hideLoading()
|
||||||
await showToast('分享成功', 'success')
|
await showToast('分享成功', 'success')
|
||||||
isShow.value = false
|
|
||||||
navigateBack()
|
navigateBack()
|
||||||
|
isShow.value = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
onLoad(e => {
|
onLoad(e => {
|
||||||
console.log('===', e)
|
propsData.id = e.id
|
||||||
|
propsData.type = e.type
|
||||||
|
if (e.type == 1) {
|
||||||
|
const { currentLive } = useLiveListState(e.id)
|
||||||
|
liveData.value = currentLive.value
|
||||||
|
}
|
||||||
TUIStore.watch(StoreName.GRP, {
|
TUIStore.watch(StoreName.GRP, {
|
||||||
groupList: onGroupListUpdated
|
groupList: onGroupListUpdated
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -190,9 +190,7 @@ export const useUserStore = defineStore('user', () => {
|
|||||||
// this.libPage = true;
|
// this.libPage = true;
|
||||||
// this.loginUserId = res.userId;
|
// this.loginUserId = res.userId;
|
||||||
uni.hideLoading();
|
uni.hideLoading();
|
||||||
uni.showToast({
|
console.log('登录成功')
|
||||||
title: res.userId
|
|
||||||
});
|
|
||||||
if (uni.getSystemInfoSync().platform === 'android') {
|
if (uni.getSystemInfoSync().platform === 'android') {
|
||||||
permision.requestAndroidPermission('android.permission.CAMERA');
|
permision.requestAndroidPermission('android.permission.CAMERA');
|
||||||
permision.requestAndroidPermission('android.permission.RECORD_AUDIO');
|
permision.requestAndroidPermission('android.permission.RECORD_AUDIO');
|
||||||
|
|||||||
Reference in New Issue
Block a user