~zhitong.yu/bs/version.git

			@@ -144,7 +144,7 @@
			</style>
			</head>

			<body class="alt-menu sidebar-noneoverflow" style="position: relative;">
			<body class="alt-menu sidebar-noneoverflow" style="position: relative;text-align:center;">

			<!-- BEGIN LOADER -->
			<!-- <div id="load_screen">
			@@ -244,14 +244,15 @@
			<iframe src="http://192.168.1.100:10000/play.html?serial=34020000001320000003&code=34020000001310000002&aspect=fullscreen" width="640" height="360" allowfullscreen allow="autoplay; fullscreen"></iframe>
			</div>
			</div> -->
			<!-- <div class="content-absolute">
			<div class="content-absolute"
			style="position: absolute;z-index: 99999;left: 31%;bottom: 10px;margin:0 auto;">
			<div class="content2">
			<div id="vxg_media_player1" class="vxgplayer" width="700" height="400"
			url="rtsp://admin:hxzk20151102@192.168.1.64:554/Streaming/Channels/101"
			autostart controls avsync nmf-src="/hxzkoa/hxzk/pnacl/Release/media_player.nmf"
			<div id="vxg_media_player1" class="vxgplayer" style="display:none;"
			url="rtsp://admin:hxzk20151102@192.168.1.64:554/Streaming/Channels/101" autostart
			controls avsync nmf-src="/hxzkoa/hxzk/pnacl/Release/media_player.nmf"
			nmf-path="media_player.nmf"></div>
			</div>
			</div> -->
			</div>
			<!-- END CONTENT PART -->

			<!-- END MAIN CONTAINER -->
			@@ -309,6 +310,7 @@
			document.getElementById("map2").style.display = "none";
			document.getElementById("map3").style.display = "none";
			} else if (data.length == 1) {
			tubiaochicun = 0.015;
			document.getElementById("map0").style.width = "100%";
			document.getElementById("mapname0").innerHTML = data[0].mapname;
			document.getElementById("maphead0").style.height = "800px";
			@@ -695,6 +697,10 @@

			<!-- 调用室内定位地图功能 -->
			<script>
			var tubiaochicun = 0.03;
			var lio = 0;
			// var zuobiaochicun = 30;
			// var dianliangchicun = 15;
			function diaoyonghuatu(result) {

			var truemap_list = getTruemap_all();
			@@ -885,7 +891,7 @@
			_this.imgScaleList[key] = 1;
			_this.img = images[key];
			} else if (key == 'icon') {
			_this.imgScaleList[key] = 0.03;
			_this.imgScaleList[key] = tubiaochicun;
			} else {
			_this.imgScaleList[key] = images[key].naturalWidth / images['map'].naturalWidth;
			};
			@@ -1026,7 +1032,7 @@
			var tmp_count = new Number(0);
			for (var n in _this.playMark) {//_this.playMark为当前实时在线点位置，为[array[.x, .y]]
			node_list = [Number(_this.playMark[n][4]), Number(_this.playMark[n][5])];
			if (inFenceOrNot(_this.realFenceList[f][2], node_list)) {//inFenceOrNot(fence_list, node_list) return true/false
			if (inFenceOrNot(_this.realFenceList[f][2], node_list) && _this.playMark[n][3] == "1") {//inFenceOrNot(fence_list, node_list) return true/false
			tmp_count += 1;
			//break;
			}
			@@ -1065,8 +1071,8 @@
			rr.allowFullscreen = "true";
			var object = tanchuang.appendChild(rr);
			shipinka = false; */

			document.getElementById("vxg_media_player1").style.display = "";
			$('.content-absolute').css('display', 'inline');
			window.vxgplayer('vxg_media_player1').stop();
			window.vxgplayer('vxg_media_player1').src("rtsp://admin:hxzk20151102@192.168.1.64:554/Streaming/Channels/101");
			window.vxgplayer('vxg_media_player1').play();
			@@ -1159,9 +1165,10 @@
			can.fillStyle = 'red';
			//var f = 8*( _this.imgScaleList['map']);
			can.font = "11px Arial";


			tagzuobiao = _this.playMark[i][4] + ',' + _this.playMark[i][5];
			can.fillText(tagzuobiao, x_cor_now - 20, y_cor_now + 10);
			lio = tagzuobiao.length / 2 * 6
			can.fillText(tagzuobiao, x_cor_now - lio, y_cor_now + 10);
			};
			if (_this.viewName == '1') { //是否显示人员名称
			can.fillStyle = 'white';
			@@ -1201,7 +1208,7 @@
			if (_this.viewPower == '1') { //是否显示电量
			can.font = '10px sans-serif';
			can.fillStyle = 'red';
			can.fillText("电量:" + _this.playMark[i][2], x_cor_now - 20, y_cor_now + 20);
			can.fillText("电量:" + _this.playMark[i][2], x_cor_now - 16, y_cor_now + 20);
			};
			};
			}
			@@ -1502,7 +1509,10 @@
			if ((event.type == "dblclick") && (full_screen == false)) {
			_this.expand = true;
			full_screen = true;


			tubiaochicun = 0.015;
			// zuobiaochicun = 35;
			// dianliangchicun = 17;
			var targ = event.target;
			var tid = targ.id;
			var id = tid.substr(tid.length - 1, 1)
			@@ -1537,6 +1547,9 @@
			_this.expand = false;
			full_screen = false;

			tubiaochicun = 0.03;
			// zuobiaochicun = 30;
			// dianliangchicun = 15;
			var targ = event.target;
			var tid = targ.id;
			var id = tid.substr(tid.length - 1, 1)
			@@ -1637,7 +1650,7 @@
			}
			_this.scaleFlag -= 1;
			}
			_this.imgScaleList['icon'] = 0.03;
			_this.imgScaleList['icon'] = tubiaochicun;
			_this.drawImg();
			},
			};
			@@ -1716,6 +1729,18 @@
			shipinka = true;
			document.getElementById("tanchuang").innerHTML = "";
			}

			$(document).bind('click', function (e) {
			var e = e \|\| window.event; //浏览器兼容性
			var elem = e.target \|\| e.srcElement;
			while (elem) { //循环判断至跟节点，防止点击的是div子元素
			if (elem.id && elem.id == 'test') {
			return;
			}
			elem = elem.parentNode;
			}
			$('.content-absolute').css('display', 'none'); //点击的不是div或其子元素
			});
			</script>
			<!-- 结束调用室内定位地图功能 -->
			<!-- > END PAGE FUNCTION SCRIPTS -->