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 | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 102 insertions(+), 15 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 7ab888f..0ff9533 100644
--- a/WebService/src/main/resources/components/applicationKeyPackage/add-applicationKeyView/addApplicationKey.js
+++ b/WebService/src/main/resources/components/applicationKeyPackage/add-applicationKeyView/addApplicationKey.js
@@ -24,15 +24,22 @@
roomId: '',
locationTypeCd: '',
locationObjId: '',
- roomName: ''
+ roomName: '',
+ typeFlag:'',
+ photo: '',
+ mediaStreamTrack: null
}
},
_initMethod: function () {
vc.component._initAddApplicationKeyDateInfo();
+ //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")) {
@@ -43,7 +50,7 @@
vc.component.addApplicationKeyInfo.unitId = _param.unitId;
}
- if(_param.hasOwnProperty("roomId")){
+ if (_param.hasOwnProperty("roomId")) {
vc.component.addApplicationKeyInfo.roomId = _param.roomId;
}
});
@@ -53,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,
@@ -67,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,
@@ -125,12 +132,8 @@
limit: "required",
param: "",
errInfo: "鎬у埆涓嶈兘涓虹┖"
- },
- {
- limit: "num",
- param: "",
- errInfo: "鎬у埆鏍煎紡閿欒"
- },
+ }
+
],
'addApplicationKeyInfo.age': [
{
@@ -199,13 +202,23 @@
});
},
saveApplicationKeyInfo: function () {
+ vc.component.addApplicationKeyInfo.communityId = vc.getCurrentCommunity().communityId;
+ if (vc.component.addApplicationKeyInfo.locationTypeCd != '2000' && vc.component.addApplicationKeyInfo.locationTypeCd != '3000') { //澶ч棬鏃剁洿鎺ュ啓 灏忓尯ID
+ vc.component.addApplicationKeyInfo.locationObjId = vc.component.addApplicationKeyInfo.communityId;
+ } else if (vc.component.addApplicationKeyInfo.locationTypeCd == '2000') {
+ vc.component.addApplicationKeyInfo.locationObjId = vc.component.addApplicationKeyInfo.unitId;
+ } else if (vc.component.addApplicationKeyInfo.locationTypeCd == '3000') {
+ vc.component.addApplicationKeyInfo.locationObjId = vc.component.addApplicationKeyInfo.roomId;
+ } else {
+ vc.toast("璁惧浣嶇疆鍊奸敊璇�");
+ return;
+ }
if (!vc.component.addApplicationKeyValidate()) {
- vc.message(vc.validate.errInfo);
+ vc.toast(vc.validate.errInfo);
return;
}
- vc.component.addApplicationKeyInfo.communityId = vc.getCurrentCommunity().communityId;
//涓嶆彁浜ゆ暟鎹皢鏁版嵁 鍥炶皟缁欎睛鍚鐞�
if (vc.notNull($props.callBackListener)) {
vc.emit($props.callBackListener, $props.callBackFunction, vc.component.addApplicationKeyInfo);
@@ -258,10 +271,84 @@
roomId: '',
locationTypeCd: '',
locationObjId: '',
- roomName: ''
-
+ roomName: '',
+ 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 () {
+ return navigator.getUserMedia = navigator.getUserMedia ||
+ navigator.webkitGetUserMedia ||
+ navigator.mozGetUserMedia ||
+ navigator.msGetUserMedia || null;
+ },
+ _initAddApplicationKeyMedia: function () {
+ if (vc.component._addUserMedia()) {
+ vc.component.addApplicationKeyInfo.videoPlaying = false;
+ var constraints = {
+ video: true,
+ audio: false
+ };
+ 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) {
+ video.srcObject = stream;
+ }
+ video.play();
+ vc.component.addApplicationKeyInfo.videoPlaying = true;
+ }, function (error) {
+ console.log("ERROR");
+ console.log(error);
+ });
+ } else {
+ console.log("鍒濆鍖栬棰戝け璐�");
+ }
+ },
+ _takePhoto: function () {
+ if (vc.component.addApplicationKeyInfo.videoPlaying) {
+ 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);
+ var data = canvas.toDataURL('image/webp');
+ vc.component.addApplicationKeyInfo.photo = data;
+ //document.getElementById('photo').setAttribute('src', data);
+ }
+ },
+ _uploadPhoto: function (event) {
+ $("#uploadApplicationKeyPhoto").trigger("click")
+ },
+ _choosePhoto: function (event) {
+ var photoFiles = event.target.files;
+ if (photoFiles && photoFiles.length > 0) {
+ // 鑾峰彇鐩墠涓婁紶鐨勬枃浠�
+ var file = photoFiles[0];// 鏂囦欢澶у皬鏍￠獙鐨勫姩浣�
+ if (file.size > 1024 * 1024 * 1) {
+ vc.toast("鍥剧墖澶у皬涓嶈兘瓒呰繃 2MB!")
+ return false;
+ }
+ var reader = new FileReader(); //鏂板缓FileReader瀵硅薄
+ reader.readAsDataURL(file); //璇诲彇涓篵ase64
+ reader.onloadend = function (e) {
+ vc.component.addApplicationKeyInfo.photo = reader.result;
+ }
+ }
+ },
}
});
--
Gitblit v1.8.0