wvp-pro.git - Gitblit

			@@ -65,6 +65,11 @@
			to: config.dev.assetsSubDirectory,
			ignore: ['.*']
			}
			]),
			new CopyWebpackPlugin([
			{ from: 'node_modules/@liveqing/liveplayer/dist/component/crossdomain.xml'},
			{ from: 'node_modules/@liveqing/liveplayer/dist/component/liveplayer.swf'},
			{ from: 'node_modules/@liveqing/liveplayer/dist/component/liveplayer-lib.min.js', to: config.build.assetsSubDirectory + '/js/'},
			])
			]
			})

			@@ -115,6 +115,11 @@
			to: config.build.assetsSubDirectory,
			ignore: ['.*']
			}
			]),
			new CopyWebpackPlugin([
			{ from: 'node_modules/@liveqing/liveplayer/dist/component/crossdomain.xml'},
			{ from: 'node_modules/@liveqing/liveplayer/dist/component/liveplayer.swf'},
			{ from: 'node_modules/@liveqing/liveplayer/dist/component/liveplayer-lib.min.js', to: config.build.assetsSubDirectory + '/js/'},
			])
			]
			})

			@@ -11,6 +11,7 @@
			<body>
			<script type="text/javascript" src="./static/js/jessibuca/jessibuca.js"></script>
			<script type="text/javascript" src="./static/js/EasyWasmPlayer.js"></script>
			<script type="text/javascript" src="./static/js/liveplayer-lib.min.js"></script>
			<script type="text/javascript" src="./static/js/ZLMRTCClient.js"></script>
			<script type="text/javascript" src="./static/js/mapConfig.js"></script>
			<div id="app"></div>

Diff too large

			@@ -10,6 +10,7 @@
			"build": "node build/build.js"
			},
			"dependencies": {
			"@liveqing/liveplayer": "^2.7.0",
			"axios": "^0.24.0",
			"core-js": "^2.6.5",
			"echarts": "^4.9.0",

			@@ -2,9 +2,11 @@
			<div id="devicePlayer" v-loading="isLoging">

			<el-dialog title="视频播放" top="0" :close-on-click-modal="false" :visible.sync="showVideoDialog" @close="close()">
			<!-- <LivePlayer v-if="showVideoDialog" ref="videoPlayer" :videoUrl="videoUrl" :error="videoError" :message="videoError" :hasaudio="hasaudio" fluent autoplay live></LivePlayer> -->
			<div style="width: 100%; height: 100%">
			<el-tabs type="card" :stretch="true" v-model="activePlayer" @tab-click="changePlayer" v-if="Object.keys(this.player).length > 1">
			<el-tab-pane label="LivePlayer" name="livePlayer">
			<LivePlayer v-if="showVideoDialog" ref="livePlayer" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" :hasaudio="hasAudio" fluent autoplay live></LivePlayer>
			</el-tab-pane>
			<el-tab-pane label="Jessibuca" name="jessibuca">
			<jessibucaPlayer v-if="activePlayer === 'jessibuca'" ref="jessibuca" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px" :hasAudio="hasAudio" fluent autoplay live ></jessibucaPlayer>
			</el-tab-pane>
			@@ -286,7 +288,7 @@

			<script>
			import rtcPlayer from '../dialog/rtcPlayer.vue'
			// import LivePlayer from '@liveqing/liveplayer'
			import LivePlayer from '@liveqing/liveplayer'
			// import player from '../dialog/easyPlayer.vue'
			import jessibucaPlayer from '../common/jessibuca.vue'
			import recordDownload from '../dialog/recordDownload.vue'
			@@ -294,7 +296,7 @@
			name: 'devicePlayer',
			props: {},
			components: {
			jessibucaPlayer, rtcPlayer, recordDownload,
			LivePlayer, jessibucaPlayer, rtcPlayer, recordDownload,
			},
			computed: {
			getPlayerShared: function () {
			@@ -315,10 +317,11 @@
			return {
			video: 'http://lndxyj.iqilu.com/public/upload/2019/10/14/8c001ea0c09cdc59a57829dabc8010fa.mp4',
			videoUrl: '',
			activePlayer: "jessibuca",
			activePlayer: "livePlayer",
			// 如何你只是用一种播放器，直接注释掉不用的部分即可
			player: {
			jessibuca : ["ws_flv", "wss_flv"],
			livePlayer : ["ws_flv", "wss_flv"],
			webRTC: ["rtc", "rtc"],
			},
			videoHistory: {

	web_src/build/webpack.dev.conf.js	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web_src/build/webpack.prod.conf.js	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web_src/index.html	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web_src/package-lock.json	14441 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web_src/package.json	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web_src/src/components/dialog/devicePlayer.vue	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史