From 69e2baf5518079bfc16cfadc2fb29842fb3de85d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 14 一月 2020 21:02:48 +0800
Subject: [PATCH] 加入userName
---
WebService/src/main/resources/components/applicationKeyPackage/add-applicationKeyView/addApplicationKey.js | 53 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/WebService/src/main/resources/components/applicationKeyPackage/add-applicationKeyView/addApplicationKey.js b/WebService/src/main/resources/components/applicationKeyPackage/add-applicationKeyView/addApplicationKey.js
index 5b0ab6e..0ff9533 100644
--- a/WebService/src/main/resources/components/applicationKeyPackage/add-applicationKeyView/addApplicationKey.js
+++ b/WebService/src/main/resources/components/applicationKeyPackage/add-applicationKeyView/addApplicationKey.js
@@ -25,16 +25,21 @@
locationTypeCd: '',
locationObjId: '',
roomName: '',
- photo:'',
+ typeFlag:'',
+ photo: '',
+ mediaStreamTrack: null
}
},
_initMethod: function () {
vc.component._initAddApplicationKeyDateInfo();
- vc.component._initAddApplicationKeyMedia();
+ //vc.component._initAddApplicationKeyMedia();
},
_initEvent: function () {
vc.on('addApplicationKey', 'openAddApplicationKeyModal', function () {
$('#addApplicationKeyModel').modal('show');
+ });
+ vc.on('addApplicationKey', "_initAddApplicationKeyData", function () {
+ vc.component._initAddApplicationKeyMedia();
});
vc.on("addApplicationKey", "notify", function (_param) {
if (_param.hasOwnProperty("floorId")) {
@@ -45,7 +50,7 @@
vc.component.addApplicationKeyInfo.unitId = _param.unitId;
}
- if(_param.hasOwnProperty("roomId")){
+ if (_param.hasOwnProperty("roomId")) {
vc.component.addApplicationKeyInfo.roomId = _param.roomId;
}
});
@@ -55,7 +60,7 @@
vc.component.addApplicationKeyInfo.startTime = vc.dateFormat(new Date().getTime());
$('.addApplicationStartTime').datetimepicker({
language: 'zh-CN',
- format: 'yyyy-mm-dd HH:ii:ss',
+ format: 'yyyy-mm-dd hh:ii:ss',
initTime: true,
initialDate: new Date(),
autoClose: 1,
@@ -69,7 +74,7 @@
});
$('.addApplicationEndTime').datetimepicker({
language: 'zh-CN',
- format: 'yyyy-mm-dd HH:ii:ss',
+ format: 'yyyy-mm-dd hh:ii:ss',
initTime: true,
initialDate: new Date(),
autoClose: 1,
@@ -209,7 +214,7 @@
return;
}
if (!vc.component.addApplicationKeyValidate()) {
- vc.message(vc.validate.errInfo);
+ vc.toast(vc.validate.errInfo);
return;
}
@@ -267,31 +272,37 @@
locationTypeCd: '',
locationObjId: '',
roomName: '',
- photo:'',
- videoPlaying:false
-
+ photo: '',
+ videoPlaying: false,
+ mediaStreamTrack: null,
+ typeFlag:'',
};
},
_closeAddApplicationKeyView: function () {
vc.emit('applicationKeyManage', 'listApplicationKey', {});
+ //鍏抽棴鎷嶇収鎽勫儚澶�
+ if (vc.component.addApplicationKeyInfo.mediaStreamTrack != null) {
+ vc.component.addApplicationKeyInfo.mediaStreamTrack.stop();
+ }
},
- _addUserMedia:function() {
+ _addUserMedia: function () {
return navigator.getUserMedia = navigator.getUserMedia ||
navigator.webkitGetUserMedia ||
navigator.mozGetUserMedia ||
navigator.msGetUserMedia || null;
},
- _initAddApplicationKeyMedia:function () {
- if(vc.component._addUserMedia()){
+ _initAddApplicationKeyMedia: function () {
+ if (vc.component._addUserMedia()) {
vc.component.addApplicationKeyInfo.videoPlaying = false;
var constraints = {
video: true,
audio: false
};
- var video = document.getElementById('photo');
+ var video = document.getElementById('AddApplicationKeyPhoto');
var media = navigator.getUserMedia(constraints, function (stream) {
var url = window.URL || window.webkitURL;
//video.src = url ? url.createObjectURL(stream) : stream;
+ vc.component.addApplicationKeyInfo.mediaStreamTrack = typeof stream.stop === 'function' ? stream : stream.getTracks()[0];
try {
video.src = url ? url.createObjectURL(stream) : stream;
} catch (error) {
@@ -303,14 +314,14 @@
console.log("ERROR");
console.log(error);
});
- }else{
+ } else {
console.log("鍒濆鍖栬棰戝け璐�");
}
},
- _takePhoto:function () {
+ _takePhoto: function () {
if (vc.component.addApplicationKeyInfo.videoPlaying) {
- var canvas = document.getElementById('canvas');
- var video = document.getElementById('photo');
+ var canvas = document.getElementById('AddApplicationKeyCanvas');
+ var video = document.getElementById('AddApplicationKeyPhoto');
canvas.width = video.videoWidth;
canvas.height = video.videoHeight;
canvas.getContext('2d').drawImage(video, 0, 0);
@@ -319,21 +330,21 @@
//document.getElementById('photo').setAttribute('src', data);
}
},
- _uploadPhoto:function(event){
+ _uploadPhoto: function (event) {
$("#uploadApplicationKeyPhoto").trigger("click")
},
- _choosePhoto:function(event){
+ _choosePhoto: function (event) {
var photoFiles = event.target.files;
if (photoFiles && photoFiles.length > 0) {
// 鑾峰彇鐩墠涓婁紶鐨勬枃浠�
var file = photoFiles[0];// 鏂囦欢澶у皬鏍￠獙鐨勫姩浣�
- if(file.size > 1024 * 1024 * 1) {
+ if (file.size > 1024 * 1024 * 1) {
vc.toast("鍥剧墖澶у皬涓嶈兘瓒呰繃 2MB!")
return false;
}
var reader = new FileReader(); //鏂板缓FileReader瀵硅薄
reader.readAsDataURL(file); //璇诲彇涓篵ase64
- reader.onloadend = function(e) {
+ reader.onloadend = function (e) {
vc.component.addApplicationKeyInfo.photo = reader.result;
}
}
--
Gitblit v1.8.0