-
+
+
+
+
+
![]()
+
+
+
+
+
![]()
+
+
+
+
+
![]()
+
+
+
+
+
+
![]()
+
+
@@ -23,6 +44,9 @@
import axios from "axios";
import Swiper from 'swiper'; // 注意引入的是Swiper
import 'swiper/css/swiper.min.css' // 注意这里的引入
+import {Notify, Dialog} from 'vant';
+
+import {getStatisFileUrl} from '../utils/publicFun'
/* eslint-disable */
export default {
@@ -39,6 +63,27 @@ export default {
videoRoomSteamList: [],
oldVideoStreamList: [],
swiperInstance: null,
+ publishSdk: null,
+ publistUrl: "",
+ constraints: {
+ audio: true,
+ video: {
+ // deviceId: {
+ // exact: "136e115ef37b7ec8361207a61d42cd39818381aa0e99728e35eb9746bedce6b4"
+ // },
+ width: {ideal: 320, max: 576}
+ }
+ },
+ cameraDevices: [],
+ cameraIndex: 0,
+ isCloseCamera: false,
+ isCloseVoice: false,
+ voiceImg: "",
+ cameraImg: "",
+ switchCameraImg: "",
+ callDwonImg: "",
+ showConfirmDialog:0,
+ inviteName:0,
};
},
mounted() {
@@ -46,30 +91,126 @@ export default {
this.isPlayer = this.$route.query.isPlayer;
this.uid = this.$route.query.uid;
this.roomId = this.$route.query.room;
+ this.inviteName = this.$route.query.inviteName||'';
this.topVideo = this.uid;
+ this.showConfirmDialog = this.$route.query.showConfirmDialog;
- if (this.isPublish == 1) {
- this.beginPublish()
+
+ this.voiceImg = getStatisFileUrl("/media/voice_open.png")
+ this.cameraImg = getStatisFileUrl("/media/camera_open.png")
+ this.switchCameraImg = getStatisFileUrl("/media/switch.png")
+ this.callDwonImg = getStatisFileUrl("/media/call_down.png")
+
+ if(this.showConfirmDialog==1){
+ Dialog.confirm({
+ title: '是否接受？',
+ message: `${this.inviteName}邀请你加入视频聊天`,
+ })
+ .then(() => {
+ this.init();
+ // on confirm
+ })
+ .catch(() => {
+ location.href = "uniwebview://action?function=refuseVideoInvite";
+ // on cancel
+ });
+ }else {
+ this.init();
}
- if (this.isPlayer == 1) {
- this.roomTimer = setInterval(() => {
- this.getRoomVideoList();
- }, 2000)
- }
- this.swiperInstance = new Swiper('.swiper-container', {
- slidesPerView: 4,
- spaceBetween: 30,
- observer: true,
- on: {},
- })
},
+
beforeDestroy() {
clearInterval(this.roomTimer);
this.roomTimer = null;
this.leaveRoom();
},
methods: {
+ init(){
+ if (this.isPublish == 1) {
+ this.beginPublish()
+ }
+ if (this.isPlayer == 1) {
+ this.roomTimer = setInterval(() => {
+ this.getRoomVideoList();
+ }, 2000)
+ }
+ this.swiperInstance = new Swiper('.swiper-container', {
+ slidesPerView: 4,
+ spaceBetween: 30,
+ observer: true,
+ on: {},
+ })
+ },
+ closeVoice() {
+ this.constraints.audio = false;
+ //如果声音是开启状态
+ if (!this.isCloseVoice) {
+ // 关闭声音
+ this.isCloseVoice=true
+ this.voiceImg = getStatisFileUrl("/media/voice_close.png")
+ }else {
+ // 打开声音
+ this.isCloseVoice=false;
+ this.constraints.audio = true
+ this.voiceImg = getStatisFileUrl("/media/voice_open.png")
+ }
+ console.log(this.isCloseVoice)
+ console.log(this.voiceImg)
+ this.beginPublish()
+ },
+ closeCamera() {
+ this.constraints.video = false;
+ //如果视频是开启状态
+ if (!this.isCloseCamera) {
+ this.constraints.video=false
+ this.isCloseCamera=true
+ this.cameraImg = getStatisFileUrl("/media/camera_close.png")
+ }else {
+ let deviceId = {
+ exact: ""
+ }
+ deviceId.exact = this.cameraDevices[this.cameraIndex].deviceId
+ this.constraints.video = {}
+ this.constraints.video.deviceId = deviceId
+ this.isCloseCamera=false
+ this.cameraImg = getStatisFileUrl("/media/camera_open.png")
+ }
+ this.beginPublish()
+ },
+ switchCamera() {
+ let self = this;
+ self.cameraIndex = self.cameraIndex + 1 == self.cameraDevices.length ? 0 : self.cameraIndex + 1
+ let deviceId = {
+ exact: ""
+ }
+ deviceId.exact = self.cameraDevices[self.cameraIndex].deviceId
+ self.constraints.video.deviceId = deviceId
+
+ this.beginPublish()
+
+ },
+ gotDevices(deviceInfos) {
+ for (let i = 0; i !== deviceInfos.length; ++i) {
+ const deviceInfo = deviceInfos[i];
+ const option = document.createElement('option');
+ option.value = deviceInfo.deviceId;
+ if (deviceInfo.kind === 'audioinput') {
+ // console.log(option)
+ // console.log(deviceInfo)
+ } else if (deviceInfo.kind === 'audiooutput') {
+ // console.log(option)
+ // console.log(deviceInfo)
+ } else if (deviceInfo.kind === 'videoinput') {
+ this.cameraDevices.push(deviceInfo)
+ } else {
+ console.log('Some other kind of source/device: ', deviceInfo);
+ }
+ }
+ },
+ handleError(error) {
+ console.log('navigator.getUserMedia error: ', error);
+ },
beginPublish() {
let _this = this;
//http://localhost:8080/hd-glasses-app/#/call_room?isPublish=1&isPlayer=1&uid=123&room=call_room
@@ -77,21 +218,24 @@ export default {
// var query = parse_query_string();
const publistUrl = process.env.VUE_APP_SRS_URL + this.roomId + "/" + this.uid;
-
+ _this.publistUrl = publistUrl;
// srs_init_rtc("#txt_url", publistUrl);
- //初始化sdk
- let sdk = null;
- if (sdk) {
- sdk.close();
+ navigator.mediaDevices.enumerateDevices().then(this.gotDevices).catch(this.handleError);
+
+
+ if (_this.publishSdk) {
+ _this.publishSdk.close();
}
- sdk = new SrsRtcPublisherAsync();
- //绑定本地视频流
+ _this.publishSdk = null;
+
+ _this.publishSdk = new SrsRtcPublisherAsync();
+ // 绑定本地视频流
// const localVideo = this.$refs.localVideo;
// localVideo.srcObject = null;
// localVideo.srcObject = sdk.stream;
- sdk.publish(publistUrl).then((session) => {
+ _this.publishSdk.publish(publistUrl, _this.constraints).then((session) => {
_this.joinRoom()
}).catch(function (reason) {
console.error(reason)
@@ -106,7 +250,7 @@ export default {
alert(`getUserMedia ${reason.name} ${reason.message}`);
}
}
- sdk.close();
+ _this.publishSdk.close();
console.error(reason);
});
@@ -262,6 +406,14 @@ export default {
this.$refs.videoStreamtopVideo.srcObject = video.srcObject;
}
+ },
+ videoDownAction(){
+ location.href = "uniwebview://action?function=restartCamera";
+ if(this.showConfirmDialog==1){
+ location.href = "uniwebview://action?function=restartCamera";
+ }else {
+
+ }
}
}
}
@@ -269,6 +421,12 @@ export default {
diff --git a/hd-glasses-app/src/pages/hd_show_equipment_move_history.vue b/hd-glasses-app/src/pages/hd_show_equipment_move_history.vue
new file mode 100644
index 0000000..d18d031
--- /dev/null
+++ b/hd-glasses-app/src/pages/hd_show_equipment_move_history.vue
@@ -0,0 +1,1176 @@
+
+
+
+
+
+
+
+
+
+
+
报警点位
+
在线
+
离线
+
接收报警
+
+
+
+
+
{{ alarmDetailsData.title }}
+
报警类型:{{ alarmDetailsData.alarmCategory_dictText }}
+
+
报警时间:{{ alarmDetailsData.createTime }}
+
警情内容:{{ alarmDetailsData.msgContent }}
+
发布人:{{ alarmDetailsData.sender }}
+
关联设备:内容
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/hd-glasses-app/src/pages/hd_show_patrolTmp_history.vue b/hd-glasses-app/src/pages/hd_show_patrolTmp_history.vue
new file mode 100644
index 0000000..3eb31dc
--- /dev/null
+++ b/hd-glasses-app/src/pages/hd_show_patrolTmp_history.vue
@@ -0,0 +1,1224 @@
+
+
+
+
+
+
+
+
+
+
+
报警点位
+
在线
+
离线
+
接收报警
+
+
+
+
+
{{ alarmDetailsData.title }}
+
报警类型:{{ alarmDetailsData.alarmCategory_dictText }}
+
+
报警时间:{{ alarmDetailsData.createTime }}
+
警情内容:{{ alarmDetailsData.msgContent }}
+
发布人:{{ alarmDetailsData.sender }}
+
关联设备:内容
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/hd-glasses-app/src/pages/hd_show_patrol_history.vue b/hd-glasses-app/src/pages/hd_show_patrol_history.vue
index 8a6ed4f..49683bc 100644
--- a/hd-glasses-app/src/pages/hd_show_patrol_history.vue
+++ b/hd-glasses-app/src/pages/hd_show_patrol_history.vue
@@ -2,17 +2,19 @@
+
-
-
报警点位
-
在线
-
离线
-
接收报警
+
+
+
+
@@ -31,6 +33,8 @@
+
+
diff --git a/im-uniapp/package.json b/im-uniapp/package.json
index b7ac7f9..0990ea8 100644
--- a/im-uniapp/package.json
+++ b/im-uniapp/package.json
@@ -12,7 +12,9 @@
"author": "php_echo@163.com",
"license": "ISC",
"dependencies": {
+ "base64-js": "^1.5.1",
"dayjs": "^1.11.10",
+ "js-base64": "^3.7.5",
"localforage": "^1.10.0",
"luch-request": "^3.1.1"
}
diff --git a/im-uniapp/wx/chatWindow/index.vue b/im-uniapp/wx/chatWindow/index.vue
index 1d80f4a..00e60e1 100644
--- a/im-uniapp/wx/chatWindow/index.vue
+++ b/im-uniapp/wx/chatWindow/index.vue
@@ -447,28 +447,45 @@
content: 'TRTC_VIDEO_START'
};
- this.sendMsg(formdata,formdata.msgType)
+ // this.sendMsg(formdata,formdata.msgType)
+ const userId=localStorage.getItem("userId")
+ const roomId=userId
const roomInfo={
- roomId:"call_room",//后面改成发起人的手机号或者id
- roomName:"某某发起人的视频聊天",
- creatorId:"creatorId",
- creatorName:"发起人的昵称",
+ roomId:userId,//后面改成发起人的手机号或者id
+ roomName:`${userId}发起的视频聊天`,
+ creatorId:userId,
+ creatorName:userId,
+ publishId:userId,
+ publishName:userId,
isOver:0,
- webrtcUrl:config.getSRSUrl()+"/call_room/uid13",
+ webrtcUrl:config.getSRSUrl()+`/${roomId}/${userId}`,
type:"webrtc",
- offline:0
+ offline:0,
+ invitedUserList:[this.talkTo.userId]
}
this.$store
.dispatch('createRoom', roomInfo)
.then(res => {
- location.href=config.getVideoRoomUrl(roomInfo.roomId,roomInfo.creatorId,1,1)
+ customHttp.customHttp.post("/api/im/app/wsMsg",{
+ msgType:"10000",
+ msgId:JSON.stringify(roomInfo),
+ cmd:"",
+ msgTxt:""
+ },{
+ dataType: 'json',
+ custom: {target: "znzq"} ,
+ }).then((res1)=>{
+ location.href=config.getVideoRoomUrl(roomInfo.roomId,roomInfo.creatorId,1,1)
+ })
})
-
- this.$http.request({
+ if(1>0){
+ return false;
+ }
+ this.$http.request({
url: '/chat/sendMsg',
method: 'POST',
data: JSON.stringify(formdata),
diff --git a/im-uniapp/wx/login/index.vue b/im-uniapp/wx/login/index.vue
index 12f2865..22f624e 100644
--- a/im-uniapp/wx/login/index.vue
+++ b/im-uniapp/wx/login/index.vue
@@ -45,6 +45,8 @@