|
@@ -773,16 +773,16 @@ export default {
|
|
} = await GetStartList(obj)
|
|
} = await GetStartList(obj)
|
|
if (data.code == 200) {
|
|
if (data.code == 200) {
|
|
let list = [];
|
|
let list = [];
|
|
- for(let i=0;i<data.data.data.length;i++){
|
|
|
|
|
|
+ for(let i=0;i<data.data.length;i++){
|
|
let text = uni.getStorageSync('cameraUrl');
|
|
let text = uni.getStorageSync('cameraUrl');
|
|
- let url = data.data.data[i].hls;
|
|
|
|
|
|
+ let url = data.data[i].hls;
|
|
url = url.split("rtp/");
|
|
url = url.split("rtp/");
|
|
let newUrl = text + 'rtp/' + url[1];
|
|
let newUrl = text + 'rtp/' + url[1];
|
|
let obj = {
|
|
let obj = {
|
|
name: "楼道监控" + (i + 1),
|
|
name: "楼道监控" + (i + 1),
|
|
- id:data.data.data[i].deviceID,
|
|
|
|
|
|
+ id:data.data[i].deviceID,
|
|
url: newUrl,
|
|
url: newUrl,
|
|
- videoContext:wx.createVideoContext(data.data.data[i].deviceID)
|
|
|
|
|
|
+ videoContext:wx.createVideoContext(data.data[i].deviceID)
|
|
}
|
|
}
|
|
list.push(obj)
|
|
list.push(obj)
|
|
}
|
|
}
|
|
@@ -1364,7 +1364,7 @@ export default {
|
|
console.log('疏散通知', data)
|
|
console.log('疏散通知', data)
|
|
let pages = getCurrentPages();
|
|
let pages = getCurrentPages();
|
|
let currPage = pages[pages.length - 1]
|
|
let currPage = pages[pages.length - 1]
|
|
-
|
|
|
|
|
|
+
|
|
console.log('pages',pages)
|
|
console.log('pages',pages)
|
|
// let currPage = pages[pages.length - 1] //当前页面
|
|
// let currPage = pages[pages.length - 1] //当前页面
|
|
// let prePage = pages[pages.length - 2] //上一个页面
|
|
// let prePage = pages[pages.length - 2] //上一个页面
|