xbx #284

Merged
theluyuan merged 6 commits from xbx into master 2021-01-28 09:24:48 +00:00
24 changed files with 132 additions and 35 deletions
Showing only changes of commit cf97b59a77 - Show all commits

1
dist/css/chunk-6842bb28.f0939db8.css vendored Normal file
View File

@ -0,0 +1 @@
.mine .body[data-v-881b2f3e],.mine[data-v-881b2f3e]{display:flex;flex-direction:column;height:100vh}.mine .body[data-v-881b2f3e]{width:100%;min-height:calc(100% - .57rem);background-color:#f5f5f5}

View File

@ -1 +0,0 @@
.mine[data-v-e6e249bc]{display:flex;flex-direction:column}.mine .body[data-v-e6e249bc]{width:100%;min-height:calc(100% - .57rem);background-color:#f5f5f5}

4
dist/index.html vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

2
dist/js/chunk-6842bb28.934af575.js vendored Normal file
View File

@ -0,0 +1,2 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-6842bb28"],{"52bc":function(e,t,c){},6413:function(e,t,c){"use strict";c.r(t);var o=c("7a23"),n=Object(o["withScopeId"])("data-v-881b2f3e");Object(o["pushScopeId"])("data-v-881b2f3e");var a={class:"mine"},r={class:"body",id:"rbody"};Object(o["popScopeId"])();var b=n((function(e,t,c,n,b,p){var d=Object(o["resolveComponent"])("NavTop"),s=Object(o["resolveComponent"])("router-view");return Object(o["openBlock"])(),Object(o["createBlock"])("div",a,[Object(o["createVNode"])(d,{type:1,style:{"flex-shrink":"0"}}),Object(o["createVNode"])("div",r,[Object(o["createVNode"])(s)])])})),p=c("c022"),d=Object(o["defineComponent"])({components:{NavTop:p["a"]},setup:function(){return{}}});c("a39f");d.render=b,d.__scopeId="data-v-881b2f3e";t["default"]=d},a39f:function(e,t,c){"use strict";c("52bc")}}]);
//# sourceMappingURL=chunk-6842bb28.934af575.js.map

View File

@ -0,0 +1 @@
{"version":3,"sources":["webpack:///./src/layout/Live.vue","webpack:///./src/layout/Live.vue?cdce","webpack:///./src/layout/Live.vue?b857","webpack:///./src/layout/Live.vue?d2b0"],"names":["class","id","type","style","components","NavTop","setup","render","__scopeId"],"mappings":"iQACSA,MAAM,Q,GAEFA,MAAM,OAAOC,GAAG,S,sLAFzB,yBAKM,MALN,EAKM,CAJF,yBAAiD,GAAxCC,KAAM,EAAGC,MAAA,sBAClB,yBAEM,MAFN,EAEM,CADF,yBAAc,U,YCAX,+BAAgB,CAC3BC,WAAW,CACPC,SAAA,MAEJC,MAJ2B,WAavB,MAAO,M,UCZf,EAAOC,OAAS,EAChB,EAAOC,UAAY,kBAEJ,gB,kCCRf","file":"js/chunk-6842bb28.934af575.js","sourcesContent":["<template>\n <div class=\"mine\">\n <NavTop :type=\"1\" style=\"flex-shrink:0\"></NavTop>\n <div class=\"body\" id=\"rbody\">\n <router-view/>\n </div>\n </div>\n</template>\n<style lang=\"scss\" scoped>\n.mine{\n display: flex;\n flex-direction: column;\n height: 100vh;\n .body{\n display: flex;\n flex-direction: column;\n width: 100%;\n min-height: calc(100% - 57px);\n background-color: #F5F5F5;\n height: 100vh;\n // padding: 23px;\n }\n}\n</style>\n<script lang=\"ts\">\nimport { defineComponent, onMounted, ref } from 'vue';\nimport NavTop from \"@/components/NavTop.vue\"\n\nexport default defineComponent({\n components:{\n NavTop\n },\n setup(){\n console.log(1)\n // const height = ref(0);\n // onMounted(() => {\n // height.value = document.documentElement.clientHeight;\n // })\n // window.onresize=function(){ \n // height.value = document.documentElement.clientHeight;\n // }\n return {\n // height\n }\n }\n})\n</script>","\nimport { defineComponent, onMounted, ref } from 'vue';\nimport NavTop from \"@/components/NavTop.vue\"\n\nexport default defineComponent({\n components:{\n NavTop\n },\n setup(){\n console.log(1)\n // const height = ref(0);\n // onMounted(() => {\n // height.value = document.documentElement.clientHeight;\n // })\n // window.onresize=function(){ \n // height.value = document.documentElement.clientHeight;\n // }\n return {\n // height\n }\n }\n})\n","import { render } from \"./Live.vue?vue&type=template&id=881b2f3e&scoped=true&bindings={}\"\nimport script from \"./Live.vue?vue&type=script&lang=ts\"\nexport * from \"./Live.vue?vue&type=script&lang=ts\"\n\nimport \"./Live.vue?vue&type=style&index=0&id=881b2f3e&lang=scss&scoped=true\"\nscript.render = render\nscript.__scopeId = \"data-v-881b2f3e\"\n\nexport default script","export * from \"-!../../node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../node_modules/vue-loader-v16/dist/stylePostLoader.js!../../node_modules/postcss-loader/src/index.js??ref--8-oneOf-1-2!../../node_modules/sass-loader/dist/cjs.js??ref--8-oneOf-1-3!../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../node_modules/vue-loader-v16/dist/index.js??ref--0-1!./Live.vue?vue&type=style&index=0&id=881b2f3e&lang=scss&scoped=true\""],"sourceRoot":""}

View File

@ -1,2 +0,0 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-ebdb96a0"],{"27ad":function(e,t,c){"use strict";c("dd4c")},6413:function(e,t,c){"use strict";c.r(t);var n=c("7a23"),o=Object(n["withScopeId"])("data-v-e6e249bc");Object(n["pushScopeId"])("data-v-e6e249bc");var d={class:"body",id:"rbody"};Object(n["popScopeId"])();var a=o((function(e,t,c,o,a,i){var r=Object(n["resolveComponent"])("NavTop"),u=Object(n["resolveComponent"])("router-view");return Object(n["openBlock"])(),Object(n["createBlock"])("div",{class:"mine",style:{height:e.height+"px"}},[Object(n["createVNode"])(r,{type:1,style:{"flex-shrink":"0"}}),Object(n["createVNode"])("div",d,[Object(n["createVNode"])(u)])],4)})),i=c("c022"),r=Object(n["defineComponent"])({components:{NavTop:i["a"]},setup:function(){var e=Object(n["ref"])(0);return Object(n["onMounted"])((function(){e.value=document.documentElement.clientHeight})),window.onresize=function(){e.value=document.documentElement.clientHeight},{height:e}}});c("27ad");r.render=a,r.__scopeId="data-v-e6e249bc";t["default"]=r},dd4c:function(e,t,c){}}]);
//# sourceMappingURL=chunk-ebdb96a0.cbefff6f.js.map

View File

@ -1 +0,0 @@
{"version":3,"sources":["webpack:///./src/layout/Live.vue?d282","webpack:///./src/layout/Live.vue","webpack:///./src/layout/Live.vue?cdce","webpack:///./src/layout/Live.vue?b857"],"names":["class","id","style","height","type","components","NavTop","setup","value","document","documentElement","clientHeight","window","onresize","render","__scopeId"],"mappings":"kHAAA,W,0JCGaA,MAAM,OAAOC,GAAG,S,sLAFzB,yBAKM,OALDD,MAAM,OAAQE,MAAK,QAAU,EAAAC,OAAM,O,CACpC,yBAAiD,GAAxCC,KAAM,EAAGF,MAAA,sBAClB,yBAEM,MAFN,EAEM,CADF,yBAAc,M,kBCAX,+BAAgB,CAC3BG,WAAW,CACPC,SAAA,MAEJC,MAJ2B,WAMvB,IAAMJ,EAAS,iBAAI,GAOnB,OANA,wBAAU,WACNA,EAAOK,MAAQC,SAASC,gBAAgBC,gBAE5CC,OAAOC,SAAS,WACZV,EAAOK,MAAQC,SAASC,gBAAgBC,cAErC,CACHR,a,UCbZ,EAAOW,OAAS,EAChB,EAAOC,UAAY,kBAEJ,gB","file":"js/chunk-ebdb96a0.cbefff6f.js","sourcesContent":["export * from \"-!../../node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../node_modules/vue-loader-v16/dist/stylePostLoader.js!../../node_modules/postcss-loader/src/index.js??ref--8-oneOf-1-2!../../node_modules/sass-loader/dist/cjs.js??ref--8-oneOf-1-3!../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../node_modules/vue-loader-v16/dist/index.js??ref--0-1!./Live.vue?vue&type=style&index=0&id=e6e249bc&lang=scss&scoped=true\"","<template>\n <div class=\"mine\" :style=\"{height:height + 'px'}\">\n <NavTop :type=\"1\" style=\"flex-shrink:0\"></NavTop>\n <div class=\"body\" id=\"rbody\">\n <router-view/>\n </div>\n </div>\n</template>\n<style lang=\"scss\" scoped>\n.mine{\n display: flex;\n flex-direction: column;\n .body{\n // display: flex;\n width: 100%;\n min-height: calc(100% - 57px);\n background-color: #F5F5F5;\n // padding: 23px;\n }\n}\n</style>\n<script lang=\"ts\">\nimport { defineComponent, onMounted, ref } from 'vue';\nimport NavTop from \"@/components/NavTop.vue\"\n\nexport default defineComponent({\n components:{\n NavTop\n },\n setup(){\n console.log(1)\n const height = ref(0);\n onMounted(() => {\n height.value = document.documentElement.clientHeight;\n })\n window.onresize=function(){ \n height.value = document.documentElement.clientHeight;\n }\n return {\n height\n }\n }\n})\n</script>","\nimport { defineComponent, onMounted, ref } from 'vue';\nimport NavTop from \"@/components/NavTop.vue\"\n\nexport default defineComponent({\n components:{\n NavTop\n },\n setup(){\n console.log(1)\n const height = ref(0);\n onMounted(() => {\n height.value = document.documentElement.clientHeight;\n })\n window.onresize=function(){ \n height.value = document.documentElement.clientHeight;\n }\n return {\n height\n }\n }\n})\n","import { render } from \"./Live.vue?vue&type=template&id=e6e249bc&scoped=true&bindings={}\"\nimport script from \"./Live.vue?vue&type=script&lang=ts\"\nexport * from \"./Live.vue?vue&type=script&lang=ts\"\n\nimport \"./Live.vue?vue&type=style&index=0&id=e6e249bc&lang=scss&scoped=true\"\nscript.render = render\nscript.__scopeId = \"data-v-e6e249bc\"\n\nexport default script"],"sourceRoot":""}

9
dist/js/common.js vendored
View File

@ -13,11 +13,11 @@ let micId = '';
function login() { function login() {
presetting.login(false, options => { presetting.login(0, options => {
rtc = new RtcClient(options); rtc = new RtcClient(options);
join(); join();
}); });
presetting.login(true, options => { presetting.login(1, options => {
shareUserId = options.userId; shareUserId = options.userId;
share = new ShareClient(options); share = new ShareClient(options);
}); });
@ -330,6 +330,11 @@ function addMemberView(id) {
if($("#" + id)[0]){ if($("#" + id)[0]){
return ; return ;
} }
let sid = id;
sid = sid.split("_")[0]
if(sid == "ceshi"){
return ;
}
let memberElm = $('#member-me').clone(); let memberElm = $('#member-me').clone();
memberElm.attr('id', id); memberElm.attr('id', id);
// memberElm.attr('class', id); // memberElm.attr('class', id);

4
dist/js/commonen.js vendored
View File

@ -13,11 +13,11 @@ let micId = '';
function login() { function login() {
presetting.login(false, options => { presetting.login(0, options => {
rtc = new RtcClient(options); rtc = new RtcClient(options);
join(); join();
}); });
presetting.login(true, options => { presetting.login(1, options => {
shareUserId = options.userId; shareUserId = options.userId;
share = new ShareClient(options); share = new ShareClient(options);
}); });

View File

@ -16,6 +16,15 @@
* *
* Referencehttps://cloud.tencent.com/document/product/647/17275#Server * Referencehttps://cloud.tencent.com/document/product/647/17275#Server
*/ */
function jiazai(){
document.getElementById("make").style.display = "block"
}
function tingzhi(){
document.getElementById("make").style.display = "none"
}
jiazainum = 0;
function genTestUserSig(userID) { function genTestUserSig(userID) {
/** /**
* 腾讯云 SDKAppId需要替换为您自己账号下的 SDKAppId * 腾讯云 SDKAppId需要替换为您自己账号下的 SDKAppId
@ -61,11 +70,15 @@ function genTestUserSig(userID) {
// userSig:userSig // userSig:userSig
// }; // };
return new Promise((res)=>{ return new Promise((res)=>{
jiazai()
jiazainum++;
$.ajax({ $.ajax({
url: window.url + 'userSig?userid=' + userID, url: window.url + 'userSig?userid=' + userID,
headers: { "Authorization": "Bearer " + localStorage.getItem("token")}, headers: { "Authorization": "Bearer " + localStorage.getItem("token")},
success(data){ success(data){
res({data: data.data, id: 1400435767}) res({data: data.data, id: 1400435767})
tingzhi()
} }
}) })
}) })

View File

@ -662,7 +662,7 @@ async function startNetworkTesting() {
.appendTo('#screen-share'); .appendTo('#screen-share');
// 上下行网络质量 // 上下行网络质量
presetting.login(false, async options => { presetting.login(2, async options => {
client = TRTC.createClient({ mode: 'rtc', ...options }); client = TRTC.createClient({ mode: 'rtc', ...options });
client.on('network-quality', event => { client.on('network-quality', event => {
networkQualityNum++; networkQualityNum++;

View File

@ -26,8 +26,10 @@ class Presetting {
login(share, callback) { login(share, callback) {
let userId = window.mid; let userId = window.mid;
if (share) { if (share == 1) {
userId = 'share_' + userId; userId = 'share_' + userId;
}else if(share == 2){
userId = 'ceshi_' + userId;
} }
console.log(userId) console.log(userId)

16
dist/zhibo.html vendored
View File

@ -11,7 +11,19 @@
<!-- 引入样式 --> <!-- 引入样式 -->
<link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"> <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
<!-- 引入组件库 --> <!-- 引入组件库 -->
<style>
#make{
background-color: #000;
opacity: 0.5;
width: 100%;
height: 100vh;
position: fixed;
top: 0;
left: 0;
z-index: 1001;
display: none;
}
</style>
<script> <script>
(function (designWidth, maxWidth) { (function (designWidth, maxWidth) {
var doc = document, var doc = document,
@ -602,6 +614,8 @@
</script> </script>
<div id="make"></div>
</body> </body>
</html> </html>

15
dist/zhiboen.html vendored
View File

@ -11,7 +11,19 @@
<!-- 引入样式 --> <!-- 引入样式 -->
<link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"> <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
<!-- 引入组件库 --> <!-- 引入组件库 -->
<style>
#make{
background-color: #000;
opacity: 0.5;
width: 100%;
height: 100vh;
position: fixed;
top: 0;
left: 0;
z-index: 1001;
display: none;
}
</style>
<script> <script>
(function (designWidth, maxWidth) { (function (designWidth, maxWidth) {
var doc = document, var doc = document,
@ -602,6 +614,7 @@
</script> </script>
<div id="make"></div>
</body> </body>
</html> </html>

View File

@ -13,11 +13,11 @@ let micId = '';
function login() { function login() {
presetting.login(false, options => { presetting.login(0, options => {
rtc = new RtcClient(options); rtc = new RtcClient(options);
join(); join();
}); });
presetting.login(true, options => { presetting.login(1, options => {
shareUserId = options.userId; shareUserId = options.userId;
share = new ShareClient(options); share = new ShareClient(options);
}); });
@ -330,6 +330,11 @@ function addMemberView(id) {
if($("#" + id)[0]){ if($("#" + id)[0]){
return ; return ;
} }
let sid = id;
sid = sid.split("_")[0]
if(sid == "ceshi"){
return ;
}
let memberElm = $('#member-me').clone(); let memberElm = $('#member-me').clone();
memberElm.attr('id', id); memberElm.attr('id', id);
// memberElm.attr('class', id); // memberElm.attr('class', id);

View File

@ -13,11 +13,11 @@ let micId = '';
function login() { function login() {
presetting.login(false, options => { presetting.login(0, options => {
rtc = new RtcClient(options); rtc = new RtcClient(options);
join(); join();
}); });
presetting.login(true, options => { presetting.login(1, options => {
shareUserId = options.userId; shareUserId = options.userId;
share = new ShareClient(options); share = new ShareClient(options);
}); });

View File

@ -16,6 +16,15 @@
* *
* Referencehttps://cloud.tencent.com/document/product/647/17275#Server * Referencehttps://cloud.tencent.com/document/product/647/17275#Server
*/ */
function jiazai(){
document.getElementById("make").style.display = "block"
}
function tingzhi(){
document.getElementById("make").style.display = "none"
}
jiazainum = 0;
function genTestUserSig(userID) { function genTestUserSig(userID) {
/** /**
* 腾讯云 SDKAppId需要替换为您自己账号下的 SDKAppId * 腾讯云 SDKAppId需要替换为您自己账号下的 SDKAppId
@ -61,11 +70,15 @@ function genTestUserSig(userID) {
// userSig:userSig // userSig:userSig
// }; // };
return new Promise((res)=>{ return new Promise((res)=>{
jiazai()
jiazainum++;
$.ajax({ $.ajax({
url: window.url + 'userSig?userid=' + userID, url: window.url + 'userSig?userid=' + userID,
headers: { "Authorization": "Bearer " + localStorage.getItem("token")}, headers: { "Authorization": "Bearer " + localStorage.getItem("token")},
success(data){ success(data){
res({data: data.data, id: 1400435767}) res({data: data.data, id: 1400435767})
tingzhi()
} }
}) })
}) })

View File

@ -662,7 +662,7 @@ async function startNetworkTesting() {
.appendTo('#screen-share'); .appendTo('#screen-share');
// 上下行网络质量 // 上下行网络质量
presetting.login(false, async options => { presetting.login(2, async options => {
client = TRTC.createClient({ mode: 'rtc', ...options }); client = TRTC.createClient({ mode: 'rtc', ...options });
client.on('network-quality', event => { client.on('network-quality', event => {
networkQualityNum++; networkQualityNum++;

View File

@ -26,8 +26,10 @@ class Presetting {
login(share, callback) { login(share, callback) {
let userId = window.mid; let userId = window.mid;
if (share) { if (share == 1) {
userId = 'share_' + userId; userId = 'share_' + userId;
}else if(share == 2){
userId = 'ceshi_' + userId;
} }
console.log(userId) console.log(userId)

View File

@ -11,7 +11,19 @@
<!-- 引入样式 --> <!-- 引入样式 -->
<link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"> <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
<!-- 引入组件库 --> <!-- 引入组件库 -->
<style>
#make{
background-color: #000;
opacity: 0.5;
width: 100%;
height: 100vh;
position: fixed;
top: 0;
left: 0;
z-index: 1001;
display: none;
}
</style>
<script> <script>
(function (designWidth, maxWidth) { (function (designWidth, maxWidth) {
var doc = document, var doc = document,
@ -602,6 +614,8 @@
</script> </script>
<div id="make"></div>
</body> </body>
</html> </html>

View File

@ -11,7 +11,19 @@
<!-- 引入样式 --> <!-- 引入样式 -->
<link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"> <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
<!-- 引入组件库 --> <!-- 引入组件库 -->
<style>
#make{
background-color: #000;
opacity: 0.5;
width: 100%;
height: 100vh;
position: fixed;
top: 0;
left: 0;
z-index: 1001;
display: none;
}
</style>
<script> <script>
(function (designWidth, maxWidth) { (function (designWidth, maxWidth) {
var doc = document, var doc = document,
@ -602,6 +614,7 @@
</script> </script>
<div id="make"></div>
</body> </body>
</html> </html>

View File

@ -1,5 +1,5 @@
<template> <template>
<div class="mine" :style="{height:height + 'px'}"> <div class="mine">
<NavTop :type="1" style="flex-shrink:0"></NavTop> <NavTop :type="1" style="flex-shrink:0"></NavTop>
<div class="body" id="rbody"> <div class="body" id="rbody">
<router-view/> <router-view/>
@ -10,11 +10,14 @@
.mine{ .mine{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 100vh;
.body{ .body{
// display: flex; display: flex;
flex-direction: column;
width: 100%; width: 100%;
min-height: calc(100% - 57px); min-height: calc(100% - 57px);
background-color: #F5F5F5; background-color: #F5F5F5;
height: 100vh;
// padding: 23px; // padding: 23px;
} }
} }
@ -29,15 +32,15 @@ export default defineComponent({
}, },
setup(){ setup(){
console.log(1) console.log(1)
const height = ref(0); // const height = ref(0);
onMounted(() => { // onMounted(() => {
height.value = document.documentElement.clientHeight; // height.value = document.documentElement.clientHeight;
}) // })
window.onresize=function(){ // window.onresize=function(){
height.value = document.documentElement.clientHeight; // height.value = document.documentElement.clientHeight;
} // }
return { return {
height // height
} }
} }
}) })