From 2e9957c187b7735453fe8225bd095e64b072334e Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.31.211>
Date: 星期一, 17 十二月 2018 19:19:56 +0800
Subject: [PATCH] 添加内容
---
gx_tieta/WebRoot/mobil/map.html | 2
gx_tieta/WebRoot/mobil/app/js/common.js | 93 ++++++++++++++++++
gx_tieta/WebRoot/mobil/iframe/seenhomeinfo.html | 135 +++++++++++++++++++++++++-
gx_tieta/WebRoot/ckplayer/ckplayer.js | 4
gx_tieta/WebRoot/progress-control.jsp | 3
gx_tieta/WebRoot/mobil/app/css/common.css | 3
gx_tieta/WebRoot/iframe/batt-info-add.html | 50 +++++++++
7 files changed, 277 insertions(+), 13 deletions(-)
diff --git a/gx_tieta/WebRoot/ckplayer/ckplayer.js b/gx_tieta/WebRoot/ckplayer/ckplayer.js
index d2bc842..0a5a96a 100644
--- a/gx_tieta/WebRoot/ckplayer/ckplayer.js
+++ b/gx_tieta/WebRoot/ckplayer/ckplayer.js
@@ -175,7 +175,7 @@
crossdomain: '',//瀹夊叏绛栫暐鏂囦欢鍦板潃
unescape: false,//榛樿flashplayer閲岄渶瑕佽В鐮�
mobileCkControls: false,//绉诲姩绔痟5鏄剧ず鎺у埗鏍�
- mobileAutoFull: true,//绉诲姩绔槸鍚﹂粯璁ゅ叏灞忔挱鏀�
+ mobileAutoFull: false,//绉诲姩绔槸鍚﹂粯璁ゅ叏灞忔挱鏀�
playbackrate: 1,//榛樿鍊嶉��
h5container: '',//h5鐜涓娇鐢ㄨ嚜瀹氫箟瀹瑰櫒
debug: false,//鏄惁寮�鍚皟璇曟ā寮�
@@ -5982,7 +5982,7 @@
v = '',
o = {
allowScriptAccess: 'always',
- allowFullScreen: true,
+ allowFullScreen: false,
quality: 'high',
bgcolor: '#000'
};
diff --git a/gx_tieta/WebRoot/iframe/batt-info-add.html b/gx_tieta/WebRoot/iframe/batt-info-add.html
index 8f73e6c..1c5bb17 100644
--- a/gx_tieta/WebRoot/iframe/batt-info-add.html
+++ b/gx_tieta/WebRoot/iframe/batt-info-add.html
@@ -347,6 +347,8 @@
{{# }); }}
</div>
</script>
+ <script type="text/javascript" src="../js/jquery-1.8.3.js"></script>
+ <script type="text/javascript" src="../js/base.js"></script>
<script type="text/javascript" src="../src/layui.js"></script>
<script type="text/javascript">
layui.use(['form', 'laytpl', 'jquery', 'element', 'laydate'], function() {
@@ -471,15 +473,57 @@
var home = _data.StationName3; // 鏈烘埧鍚嶇О
var bts = _data.StationName4; // 璁惧鍚嶇О
_data.StationName = province+'-'+city+'-'+home+'-'+bts;
- //console.log(_data);
+ // console.log(_data);
var temp = analysisData(editInfo.addGroupNum, _data);
//console.log(temp);
- // 娣诲姞鐢垫睜淇℃伅
- addBatt(temp);
+ checkDevId(_data.FBSDeviceId, function(devid){
+ // 娣诲姞鐢垫睜淇℃伅
+ addBatt(temp);
+ }, function(pre, max) {
+ layer.msg('璁惧ID:'+pre+'琚崰鐢�,鎺ㄨ崘浣跨敤'+max);
+ // 鏇存柊璁惧id鍜岃澶噄p
+ $('#devid').val(max);
+ $('#fbsip').val(getDevIp(max));
+ });
});
return false;
});
+ // 鐩戞祴褰撳墠鎻愪氦鐨勮澶嘔D鏄惁涓烘渶澶�
+ function checkDevId(devid, success, error) {
+ var load = layer.load(1);
+ // 鏌ヨ鍚庡彴
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url: 'BattInfAction!searchmaxdev_id'
+ ,data:null
+ ,dataType: 'json'
+ ,success:function(res) {
+ var rs = JSON.parse(res.result);
+ if(rs.data.length != 0) {
+ if(rs.data == devid) {
+ if(isFunction(success)) {
+ success(rs.data);
+ }
+ }else {
+ if(isFunction(error)) {
+ error(devid, rs.data);
+ }
+ }
+
+ }else {
+ layer.msg('璁＄畻璁惧id澶辫触锛�')
+ }
+ }
+ ,complete: function() {
+ layer.close(load);
+ }
+
+ });
+ }
+
+
// 鍏抽棴闈㈡澘
$('#closePage').click(function() {
parent.$('#iframeClose').click();
diff --git a/gx_tieta/WebRoot/mobil/app/css/common.css b/gx_tieta/WebRoot/mobil/app/css/common.css
index efa2efb..3a157c7 100644
--- a/gx_tieta/WebRoot/mobil/app/css/common.css
+++ b/gx_tieta/WebRoot/mobil/app/css/common.css
@@ -57,6 +57,9 @@
}
/* height */
+.h {
+ height: 100%;
+}
.h40 {
height: 40px;
}
diff --git a/gx_tieta/WebRoot/mobil/app/js/common.js b/gx_tieta/WebRoot/mobil/app/js/common.js
index ffcafaf..fa12317 100644
--- a/gx_tieta/WebRoot/mobil/app/js/common.js
+++ b/gx_tieta/WebRoot/mobil/app/js/common.js
@@ -83,6 +83,99 @@
}
};
+
+//渚濊禆ckplayer.js
+var CkVideo = function(container, video) {
+ this.urls = [];
+ this.container = $(container);
+ this.opts = {
+ container: video, //瀹瑰櫒鐨処D鎴朿lassName
+ variable: 'player', //鎾斁鍑芥暟鍚嶇О
+ loop: false, //鎾斁缁撴潫鏄惁寰幆鎾斁
+ autoplay: false,//鏄惁鑷姩鎾斁
+ //poster: 'material/poster.jpg', //灏侀潰鍥剧墖
+ preview: {},
+ drag: 'start', //鎷栧姩鐨勫睘鎬�
+ video: [
+ ['', 'video/mp4']
+ ]
+ };
+
+ this._slide();
+ this._change();
+};
+CkVideo.prototype = {
+ init: function(data, sid) {
+ this.urls = [];
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var tmp = {};
+ tmp.fileName = _data.fileName;
+ tmp.fileUrl = '../../../stationsrc/'+sid+'/video/'+_data.fileName;
+ this.urls.push(tmp);
+ }
+
+ // 璁剧疆鎾斁鍒楄〃
+ this._list();
+ }
+ ,player: function(url) {
+ this.opts.video = [[url, 'video/mp4']];
+ new ckplayer(this.opts);
+ }
+ ,_list: function() {
+ var container = this.container.find('.ck-video-list-container ul');
+ container.text("");
+ // 閬嶅巻urls
+ for(var i=0; i<this.urls.length; i++) {
+ var _url = this.urls[i];
+ var _li = $('<li></li>');
+ var _a = $('<a href="javascript:;"></a>');
+ if(i == 0) {
+ _a.addClass('active-this');
+ }
+ var _icon = $('<i class="fa fa-video-camera"></i>');
+ var _span = $('<span>'+_url.fileName+'</span>');
+
+ _a.append(_icon);
+ _a.append(_span);
+ _a.data('url', _url);
+ _li.append(_a);
+ container.append(_li);
+ }
+
+ var rsUrl = this.getAcUrl();
+ this.player(rsUrl);
+
+ }
+ ,_slide: function() {
+ var _list = this.container.find('.ck-video-list');
+ var _slide = this.container.find('.ck-video-slide');
+ var _this = this;
+ _slide.off('click.ck.slide').on('click.ck.slide', function() {
+ _list.toggleClass('slide-hide');
+ });
+ }
+ ,_change: function() {
+ var container = this.container.find('.ck-video-list-container ul');
+ var _this = this;
+ container.off('click.ck.change').on('click.ck.change', 'li a', function() {
+ container.find('li a').removeClass('active-this');
+ $(this).addClass('active-this');
+ var url = $(this).data('url').fileUrl;
+ _this.player(url);
+ });
+ }
+ ,getAcUrl: function() {
+ var container = this.container.find('.ck-video-list-container ul');
+ var acUrl = container.find('.active-this');
+ var url = '';
+ if(acUrl.length != 0) {
+ url = acUrl.data('url').fileUrl;
+ }
+ return url;
+ }
+};
+
//鏍煎紡鍖栨椂闂�
Date.prototype.format =function(format)
{
diff --git a/gx_tieta/WebRoot/mobil/iframe/seenhomeinfo.html b/gx_tieta/WebRoot/mobil/iframe/seenhomeinfo.html
index 09093a4..a17ad3c 100644
--- a/gx_tieta/WebRoot/mobil/iframe/seenhomeinfo.html
+++ b/gx_tieta/WebRoot/mobil/iframe/seenhomeinfo.html
@@ -9,6 +9,7 @@
<link rel="stylesheet" href="../src/css/layui.css">
<link rel="stylesheet" href="../app/css/common.css">
<link rel="stylesheet" href="../app/css/map.css">
+ <link rel="stylesheet" href="../app/css/module.css">
<link rel="stylesheet" href="../font-awesome-4.7.0/css/font-awesome.css">
<style>
body.homeinfo-tab .layui-tab {
@@ -23,9 +24,16 @@
body.homeinfo-tab .layui-tab-content .layui-tab-item.layui-show {
height: 100%;
}
+ #imgCarousel .carousel-item div {
+ text-align: center;
+ }
+ #imgCarousel img {
+ width: 100%;
+ height: auto;
+ }
</style>
</head>
-<body class="full-height homeinfo-tab">
+<body class="full-height homeinfo-tab" style="overflow:hidden;">
<div class="rel-full">
<div class="page-header bg-gay3">
<div class="layui-row h40">
@@ -43,14 +51,30 @@
<div class="layui-tab layui-tab-card" lay-filter="homeInfoTab" id="homeInfoTab" style="height: 100%;"></div>
</div>
</div>
- <div class="abs" id="video">
+ <div class="abs h" id="video">
<div class="rel-full">
- 瑙嗛淇℃伅
+ <div class="ck-video-container h" id="ckVideo">
+ <div class="ck-video" id="myVideo"></div>
+ <div class="ck-video-list slide-hide">
+ <div class="ck-video-list-rel">
+ <div class="ck-video-list-container">
+ <ul>
+ <li><a href="javascript:;" class="active-this"><i class="fa fa-video-camera"></i><span>瑙嗛1.mp4</span></a></li>
+ <li><a href="javascript:;"><i class="fa fa-video-camera"></i><span>瑙嗛2.mp4</span></a></li>
+ </ul>
+ </div>
+ <div class="ck-video-bg"></div>
+ <div class="ck-video-slide"><i class="fa fa-angle-right"></i></div>
+ </div>
+ </div>
+ </div>
</div>
</div>
<div class="abs" id="imgs">
<div class="rel-full">
- 鍥剧墖淇℃伅
+ <div class="layui-carousel" id="imgCarousel" lay-filter="imgCarousel">
+ <div carousel-item="" class="carousel-item" id="carouselItems"></div>
+ </div>
</div>
</div>
</div>
@@ -328,16 +352,19 @@
</script>
<script src="../js/jquery-1.8.3.js"></script>
<script src="../../src/layui.js"></script>
+ <script src="../../ckplayer/ckplayer.js"></script>
<script src="../app/js/common.js"></script>
<script src="../../pages/js/GPS.js"></script>
<script type="text/javascript">
// layui妯″潡
- layui.use(['layer', 'laytpl', 'form', 'upload', 'element'], function() {
+ layui.use(['layer', 'laytpl', 'form', 'upload', 'element', 'carousel'], function() {
var layer = layui.layer; // 鑾峰彇layer妯″潡
var laytpl = layui.laytpl; // 鑾峰彇laytpl妯″潡
var form = layui.form; // 鑾峰彇form妯″潡
var upload = layui.upload; // 鑾峰彇upload妯″潡
var element = layui.element; // 鑾峰彇element妯″潡
+ var carousel = layui.carousel; // 鑾峰彇carousel妯″潡
+ var ckVideo = new CkVideo('#ckVideo', '#myVideo'); // 瀹炰緥鍖朇kVideo
var footerMenu = new FooterMenu($('#pageFooter')); // 瀹炰緥鍖栧簳閮ㄥ鑸爮
var homeInfo = parent.$('#homeInfoIframe').data('homeInfo'); // 鏈烘埧淇℃伅
var homeInfoTpl = $('#homeTab').html(); // 鏈烘埧淇℃伅妯℃澘
@@ -367,7 +394,7 @@
if(rs.code == 1) {
var data = rs.data;
var rsData = formatHomeInfo(data);
- console.log(rsData);
+ // console.log(rsData);
laytpl(homeInfoTpl).render(rsData, function(html) {
$('#homeInfoTab').html(html);
element.render('tab', 'homeInfoTab');
@@ -520,6 +547,102 @@
// 杩斿洖缁撴灉闆�
return rs;
}
+
+ // 鑾峰彇瑙嗛鍒楄〃
+ getVideoList(homeInfo.homeId);
+ function getVideoList(sid) {
+ var tmp = {
+ StationId: sid,
+ VideoOrImage: 'video'
+ };
+ var videoContainer = $('#videos .video-list-content');
+ // 璇锋眰瑙嗛鎾斁鍒楄〃
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'MyFileAction!searchStationSource',
+ data: 'json='+JSON.stringify(tmp),
+ dataType: 'json',
+ success: function(result) {
+ var rs = JSON.parse(result.result);
+ //console.log(rs);
+ if(rs.code==1) {
+ var data = rs.data;
+ ckVideo.init(data, sid);
+ }else {
+ ckVideo.init([], sid);
+ }
+
+ }
+ });
+ }
+
+
+ // 鏈烘埧鐜鍥剧墖闆嗘ā鍧�
+ var imgCarouselopts = {
+ elem: '#imgCarousel',
+ arrow: 'always',
+ width: '100%',
+ height: '100%',
+ autoplay: false
+ };
+
+ //甯歌杞挱
+ var homeEnvImgs = carousel.render(imgCarouselopts);
+ // 鏌ヨ杞挱鍥捐祫婧�
+ var imgsContainer = $('#carouselItems');
+ searchCarouselImgs(homeInfo.homeId, homeEnvImgs, imgCarouselopts, imgsContainer);
+ function searchCarouselImgs(sid, carousel, options, imgsContainer) {
+ var tmp = {
+ StationId: sid,
+ VideoOrImage: 'image'
+ };
+ // 璇锋眰瑙嗛鎾斁鍒楄〃
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'MyFileAction!searchStationSource',
+ data: 'json='+JSON.stringify(tmp),
+ dataType: 'json',
+ success: function(result) {
+ var rs = JSON.parse(result.result);
+ //console.log(rs);
+ var rsList = [];
+ if(rs.code==1) {
+ var data = rs.data;
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var tmp = {};
+ tmp.fileName = _data.fileName;
+ tmp.fileUrl = '../../../stationsrc/'+sid+'/image/'+_data.fileName;
+ rsList.push(tmp);
+ }
+ }else {
+ var tmp = {};
+ tmp.fileName = 'none.jpg';
+ tmp.fileUrl = '../../images/none.jpg';
+ rsList.push(tmp);
+ }
+ updateCarouselImgs(homeEnvImgs, imgCarouselopts, imgsContainer, rsList);
+ }
+ });
+ }
+
+ // 鏇存柊鍥剧墖杞挱鍥�
+ function updateCarouselImgs(carousel, options, container, imgs) {
+ // 娓呯┖瀹瑰櫒
+ container.text('');
+ // 閬嶅巻imgs
+ for(var i=0; i<imgs.length; i++) {
+ var _imgs = imgs[i];
+ var item = $('<div><img src="'+_imgs.fileUrl+'"></div>');
+ container.append(item);
+ }
+
+ carousel.reload(options);
+ }
+
+
});
</script>
</body>
diff --git a/gx_tieta/WebRoot/mobil/map.html b/gx_tieta/WebRoot/mobil/map.html
index 239790d..26203c4 100644
--- a/gx_tieta/WebRoot/mobil/map.html
+++ b/gx_tieta/WebRoot/mobil/map.html
@@ -331,7 +331,6 @@
// 鏄剧ず鍦板浘鍥炬爣
var allStation = [];
- searchStation();
function searchStation(){
var temp = createSearchParam();
var json = JSON.stringify(temp);
@@ -647,6 +646,7 @@
var _point = new BMap.Point(data.map_longitude,data.map_latitude);
map.centerAndZoom(_point, data.map_level); // 鐢ㄥ煄甯傚悕璁剧疆鍦板浘涓績鐐�
}
+ searchStation();
}
});
}
diff --git a/gx_tieta/WebRoot/progress-control.jsp b/gx_tieta/WebRoot/progress-control.jsp
index 6fe2ac3..6e62bd8 100644
--- a/gx_tieta/WebRoot/progress-control.jsp
+++ b/gx_tieta/WebRoot/progress-control.jsp
@@ -394,7 +394,8 @@
// 鍒ゆ柇閲嶅惎鐨勭被鍨�
function checkRestartType(temp) {
//var _restart = '<img src="image/restart.gif" title="閲嶅惎绾跨▼" class="restart"/>';
- var _restart = '<img src="image/restart.gif" title="<s:text name='Restart'/><s:text name='Thread'/>" class="restart"/>';
+ var text = "<s:text name='Restart'/><s:text name='Thread'/>";
+ var _restart = '<img src="image/restart.gif" title="'+text+'" class="restart"/>';
if(temp.ServerFlag == 2) {
_restart = '';
--
Gitblit v1.9.1