修复蓝牙连接锁未释放的问题
This commit is contained in:
@ -282,7 +282,7 @@ export default {
|
||||
value: "46",
|
||||
label: "手动报警",
|
||||
checked: false,
|
||||
type: ['210', '102', '6170','018A']
|
||||
type: ['210', '102', '6170', '018A']
|
||||
},
|
||||
{
|
||||
value: "47",
|
||||
@ -314,7 +314,7 @@ export default {
|
||||
value: "51",
|
||||
label: "警示灯",
|
||||
checked: false,
|
||||
type: ['100', '100J','018A']
|
||||
type: ['100', '100J', '018A']
|
||||
},
|
||||
|
||||
{
|
||||
@ -600,7 +600,7 @@ export default {
|
||||
});
|
||||
|
||||
},
|
||||
MapNavi(lon, lat, name, mapType) {//打开地图路线规划页面
|
||||
MapNavi(lon, lat, name, mapType) { //打开地图路线规划页面
|
||||
return new Promise((resolve, reject) => {
|
||||
if (!lon || !lat) {
|
||||
reject("经纬度不能为空");
|
||||
@ -609,19 +609,45 @@ export default {
|
||||
|
||||
let url = "";
|
||||
if (!mapType || mapType == 'amap') {
|
||||
let amapScheme = uni.getSystemInfoSync().platform === 'ios' ? 'iosamap://' : 'androidamap://';
|
||||
url = `${amapScheme}route/plan?sourceApplication=myapp&dlat=${lat}&dlon=${lon}&dname=${name}&dev=0&t=0`;
|
||||
let amapScheme = uni.getSystemInfoSync().platform === 'ios' ? 'iosamap://' : 'androidamap://';
|
||||
url =
|
||||
`${amapScheme}route/plan?sourceApplication=myapp&dlat=${lat}&dlon=${lon}&dname=${name}&dev=0&t=0`;
|
||||
} else {
|
||||
url =`baidumap://map/direction?destination=latlng:${lat},${lon}|name:${name}&coord_type=gcj02&src=myapp`
|
||||
url =
|
||||
`baidumap://map/direction?destination=latlng:${lat},${lon}|name:${name}&coord_type=gcj02&src=myapp`
|
||||
}
|
||||
|
||||
plus.runtime.openURL(url, (ex) => {
|
||||
console.error("ex=",ex);
|
||||
reject("无法打开地图软件"+url);
|
||||
console.error("ex=", ex);
|
||||
reject("无法打开地图软件" + url);
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
});
|
||||
},
|
||||
|
||||
saveDeviceLog(json) { //保存设备日志
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
let url = '/app/xinghan/device/saveDeviceLog';
|
||||
|
||||
request({
|
||||
url: url,
|
||||
method: 'POST',
|
||||
data:json
|
||||
}).then(res => {
|
||||
if (res && res.code == 200) {
|
||||
resolve(res);
|
||||
return;
|
||||
}
|
||||
|
||||
reject(res);
|
||||
}).catch(ex => {
|
||||
reject(ex);
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user