Przeglądaj źródła

运行监测 ,测试站点二,更改gji的url接口和视频流播放地址

ming 3 lat temu
rodzic
commit
3879ccb17f

+ 1 - 2
pages/videoDetail/videoDetail.vue

@@ -85,10 +85,9 @@
 			console.log(option.deviceCode)
 			this.companyCode = option.companyCode
 			this.deviceType = option.deviceType
-			// this.videoUrl = 'http://cctvalih5ca.v.myalicdn.com/live/cctv1_2/index.m3u8'
 			// this.videoUrl = 'http://videocdn.didano.com/school765class0channelId2761namedingdangm/playlist.m3u8'
 			// this.videoUrl = 'https://iot.usky.cn/hls/' + option.deviceCode + '.m3u8';
-			this.videoUrl = 'http://47.103.74.123/hls/' + option.deviceCode + '.m3u8';
+			this.videoUrl = this.companyCode==2?'http://124.71.175.91:81/hls/' + option.deviceCode + '.m3u8':'http://47.103.74.123/hls/' + option.deviceCode + '.m3u8';
 			console.log(this.videoUrl)
 			this.getDeviceDetail({
 				"companyCode": option.companyCode,

+ 4 - 3
pages/videoList/videoList.vue

@@ -91,7 +91,7 @@
 
 			chk_video() {
 				uni.request({
-					url: 'https://fire.usky.cn:8443/YtIoT/cgi-bin/demo2.cgi',
+					url:this.companyCode==2?'http://124.71.175.91:80/cgi-bin/demo2.cgi': 'https://fire.usky.cn:8443/YtIoT/cgi-bin/demo2.cgi',
 					data: 'queryJson:' + JSON.stringify({
 						CMD: 1
 					}),
@@ -107,7 +107,8 @@
 								if (this.openId == this.onLineVideoList[n].DEVICE) {
 									this.reCount++;
 									if (this.onLineVideoList[n].ONAIR) {
-										if ((++this.count) > 2) {
+										console.log(this.count)
+										if ((++this.count) > 0) {
 											// var mask = document.getElementById('videomask');
 											// if (mask != undefined) {
 											// 	removeDIV('videomask');
@@ -182,7 +183,7 @@
 				this.loadingStatus = true
 				// alert('一些loading操作')
 				uni.request({
-					url: 'https://fire.usky.cn:8443/YtIoT/cgi-bin/demo2.cgi',
+					url:this.companyCode==2?'http://124.71.175.91:80/cgi-bin/demo2.cgi': 'https://fire.usky.cn:8443/YtIoT/cgi-bin/demo2.cgi',
 					data: 'queryJson:' + JSON.stringify({
 						CMD: 3,
 						BODY: {